Attachment 930516 Details for Bug 1108522 – totemconfig: totem_config_get_ip_version

[patch] totemconfig: totem_config_get_ip_version

tmp.NuLO92NxzZ (text/plain), 1.65 KB, created by Jan Friesse on 2014-08-25 14:36:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Friesse

Created: 2014-08-25 14:36:34 UTC

Size: 1.65 KB

patch

obsolete

>From 10c80f454e70b42fc394d3326af1eb81c4be0d75 Mon Sep 17 00:00:00 2001
>From: Jan Friesse <jfriesse@redhat.com>
>Date: Wed, 16 Jul 2014 21:24:52 +0200
>Subject: [PATCH] totemconfig: totem_config_get_ip_version
>
>Add totem_config_get_ip_version to get user configured ip version.
>Make totem_config_read use this newly introduced function.
>
>Signed-off-by: Jan Friesse <jfriesse@redhat.com>
>Reviewed-by: Fabio M. Di Nitto <fdinitto@redhat.com>
>---
> exec/totemconfig.c |   30 ++++++++++++++++++++----------
> 1 files changed, 20 insertions(+), 10 deletions(-)
>
>diff --git a/exec/totemconfig.c b/exec/totemconfig.c
>index bcb7a6d..7046349 100644
>--- a/exec/totemconfig.c
>+++ b/exec/totemconfig.c
>@@ -391,6 +391,25 @@ static int totem_get_crypto(struct totem_config *totem_config)
> 	return 0;
> }
> 
>+static int totem_config_get_ip_version(void)
>+{
>+	int res;
>+	char *str;
>+
>+	res = AF_INET;
>+	if (icmap_get_string("totem.ip_version", &str) == CS_OK) {
>+		if (strcmp(str, "ipv4") == 0) {
>+			res = AF_INET;
>+		}
>+		if (strcmp(str, "ipv6") == 0) {
>+			res = AF_INET6;
>+		}
>+		free(str);
>+	}
>+
>+	return (res);
>+}
>+
> static uint16_t generate_cluster_id (const char *cluster_name)
> {
> 	int i;
>@@ -710,16 +729,7 @@ extern int totem_config_read (
> 		cluster_name = NULL;
> 	}
> 
>-	totem_config->ip_version = AF_INET;
>-	if (icmap_get_string("totem.ip_version", &str) == CS_OK) {
>-		if (strcmp(str, "ipv4") == 0) {
>-			totem_config->ip_version = AF_INET;
>-		}
>-		if (strcmp(str, "ipv6") == 0) {
>-			totem_config->ip_version = AF_INET6;
>-		}
>-		free(str);
>-	}
>+	totem_config->ip_version = totem_config_get_ip_version();
> 
> 	if (icmap_get_string("totem.interface.0.bindnetaddr", &str) != CS_OK) {
> 		/*
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 1108522: 907995 | 907996 | 907997 | 907998 | 907999 | 908004 | 908111 | 930505 | 930506 | 930507 | 930509 | 930510 | 930511 | 930512 | 930513 | 930514 | 930515 | 930516 | 930517 | 930518 | 930519 | 930527 | 930528 | 930529 | 930530 | 930531 | 930535 | 930536 | 930537 | 930538 | 930539 | 930540 | 931024