[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] [PATCH github-rebase][fence-virt] Honor implicit "ip_family=auto" in fence_xvm w/IPv6 mult.addr.



Previously this wasn't the case:

$ ./fence_xvm -d -a ff05::3:1 -H asdfaf
-- args @ 0x7fffb9575340 --
  args->domain = asdfaf
  args->op = 2
  args->net.key_file = /etc/cluster/fence_xvm.key
  args->net.hash = 2
  args->net.addr = ff05::3:1
  args->net.auth = 2
  args->net.port = 1229
  args->net.ifindex = 0
  args->net.family = 2
  args->timeout = 30
  args->retr_time = 20
  args->flags = 0
  args->debug = 1
-- end args --
[...]

args->net.family is being assigned value of PF_INET (2) instead of
PF_INET6 (10) as it ought to be with implicit "auto" value as declared, e.g.,
in metadata:

<parameter name="ip_family">
	<getopt mixed="-i" />
	<content type="string" default="auto" />
	<shortdesc lang="en">IP Family ([auto], ipv4, ipv6)</shortdesc>
</parameter>

After the fix, we get the expected behavior when using IPv6 multicast
address:

$ ./fence_xvm -d -a ff05::3:1 -H asdfaf
-- args @ 0x7fffe4af7120 --
  args->domain = asdfaf
  args->op = 2
  args->net.key_file = /etc/cluster/fence_xvm.key
  args->net.hash = 2
  args->net.addr = ff05::3:1
  args->net.auth = 2
  args->net.port = 1229
  args->net.ifindex = 0
  args->net.family = 10
  args->timeout = 30
  args->retr_time = 20
  args->flags = 0
  args->debug = 1
-- end args --
[...]

Signed-off-by: Jan Pokorný <jpokorny redhat com>
---
 client/options.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/options.c b/client/options.c
index 40c6587..27f899d 100644
--- a/client/options.c
+++ b/client/options.c
@@ -582,7 +582,7 @@ args_init(fence_virt_args_t *args)
 	args->net.ipaddr = NULL;
 	args->net.port = DEFAULT_MCAST_PORT;
 	args->net.ifindex = 0;
-	args->net.family = PF_INET;
+	args->net.family = 0;  /* auto */
 	args->serial.device = NULL;
 	args->serial.speed = strdup(DEFAULT_SERIAL_SPEED);
 	args->serial.address = strdup(DEFAULT_CHANNEL_IP);
-- 
1.7.11.7


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]