Attachment 314709 Details for Bug 459720 – A patch for fence_xvmd to add option to select correct network interface explicitly

[patch] A patch for fence_xvmd to add option to select correct network interface explicitly

cman-2.0.84-2.el5.fence_xvmd.interface-option.patch (text/plain), 4.59 KB, created by Satoru SATOH on 2008-08-21 15:29:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Satoru SATOH

Created: 2008-08-21 15:29:01 UTC

Size: 4.59 KB

patch

obsolete

>--- cman-2.0.84-2.el5/fence/agents/xvm/options.h.interface	2008-08-21 18:08:33.000000000 +0900
>+++ cman-2.0.84-2.el5/fence/agents/xvm/options.h	2008-08-21 18:37:00.000000000 +0900
>@@ -40,6 +40,7 @@
> 	fence_hash_t hash;
> 	fence_auth_type_t auth;
> 	int port;
>+	unsigned int ifindex;
> 	int family;
> 	int timeout;
> 	int retr_time;
>--- cman-2.0.84-2.el5/fence/agents/xvm/fence_xvmd.c.interface	2008-08-21 18:08:33.000000000 +0900
>+++ cman-2.0.84-2.el5/fence/agents/xvm/fence_xvmd.c	2008-08-21 18:14:34.000000000 +0900
>@@ -739,7 +739,7 @@
> 	int mc_sock;
> 	char key[MAX_KEY_LEN];
> 	int key_len = 0, x;
>-	char *my_options = "dfi:a:p:C:c:k:u?hLXV";
>+	char *my_options = "dfi:a:p:I:C:c:k:u?hLXV";
> 	cman_handle_t ch = NULL;
> 	void *h = NULL;
> 
>@@ -831,9 +831,9 @@
> 			printf("Checkpoint initialized\n");
> 	}
> 	if (args.family == PF_INET)
>-		mc_sock = ipv4_recv_sk(args.addr, args.port);
>+		mc_sock = ipv4_recv_sk(args.addr, args.port, args.ifindex);
> 	else
>-		mc_sock = ipv6_recv_sk(args.addr, args.port);
>+		mc_sock = ipv6_recv_sk(args.addr, args.port, args.ifindex);
> 	if (mc_sock < 0) {
> 		printf("Could not set up multicast listen socket\n");
> 		return 1;
>--- cman-2.0.84-2.el5/fence/agents/xvm/options.c.interface	2008-08-21 18:08:33.000000000 +0900
>+++ cman-2.0.84-2.el5/fence/agents/xvm/options.c	2008-08-21 18:37:22.000000000 +0900
>@@ -107,6 +107,13 @@
> 
> 
> static inline void
>+assign_interface(fence_xvm_args_t *args, struct arg_info *arg, char *value)
>+{
>+	args->ifindex = if_nametoindex(value);
>+}
>+
>+
>+static inline void
> assign_retrans(fence_xvm_args_t *args, struct arg_info *arg, char *value)
> {
> 	args->retr_time = atoi(value);
>@@ -290,6 +297,10 @@
> 	  "IP port (default=1229)",
> 	  assign_port },
> 
>+	{ 'I', "-I <interface>", "multicast_address",
>+	  "Network interface name to listen on",
>+	  assign_interface },
>+
> 	{ 'r', "-r <retrans>", "retrans", 
> 	  "Multicast retransmit time (in 1/10sec; default=20)",
> 	  assign_retrans },
>@@ -394,6 +405,7 @@
> 	args->hash = DEFAULT_HASH;
> 	args->auth = DEFAULT_AUTH;
> 	args->port = 1229;
>+	args->ifindex = 0;
> 	args->family = PF_INET;
> 	args->timeout = 30;
> 	args->retr_time = 20;
>@@ -422,6 +434,7 @@
> 	_pr_int(args->hash);
> 	_pr_int(args->auth);
> 	_pr_int(args->port);
>+	_pr_int(args->ifindex);
> 	_pr_int(args->family);
> 	_pr_int(args->timeout);
> 	_pr_int(args->retr_time);
>--- cman-2.0.84-2.el5/fence/agents/xvm/mcast.h.interface	2008-08-21 18:08:33.000000000 +0900
>+++ cman-2.0.84-2.el5/fence/agents/xvm/mcast.h	2008-08-21 18:29:23.000000000 +0900
>@@ -22,10 +22,10 @@
> #define IPV4_MCAST_DEFAULT "225.0.0.12"
> #define IPV6_MCAST_DEFAULT "ff05::3:1"
> 
>-int ipv4_recv_sk(char *addr, int port);
>+int ipv4_recv_sk(char *addr, int port, unsigned int ifindex);
> int ipv4_send_sk(char *src_addr, char *addr, int port,
> 		 struct sockaddr *src, socklen_t slen);
>-int ipv6_recv_sk(char *addr, int port);
>+int ipv6_recv_sk(char *addr, int port, unsigned int ifindex);
> int ipv6_send_sk(char *src_addr, char *addr, int port,
> 		 struct sockaddr *src, socklen_t slen);
> 
>--- cman-2.0.84-2.el5/fence/agents/xvm/mcast.c.interface	2008-08-21 18:08:33.000000000 +0900
>+++ cman-2.0.84-2.el5/fence/agents/xvm/mcast.c	2008-08-21 18:28:52.000000000 +0900
>@@ -47,10 +47,10 @@
>   Sets up a multicast receive socket
>  */
> int
>-ipv4_recv_sk(char *addr, int port)
>+ipv4_recv_sk(char *addr, int port, unsigned int ifindex)
> {
> 	int sock;
>-	struct ip_mreq mreq;
>+	struct ip_mreqn mreq;
> 	struct sockaddr_in sin;
> 
> 	/* Store multicast address */
>@@ -90,7 +90,7 @@
> 	 * Join multicast group
> 	 */
> 	/* mreq.imr_multiaddr.s_addr is set above */
>-	mreq.imr_interface.s_addr = htonl(INADDR_ANY);
>+	mreq.imr_ifindex = ifindex;
> 	dbg_printf(4, "Joining multicast group\n");
> 	if (setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP,
> 		       &mreq, sizeof(mreq)) == -1) {
>@@ -200,7 +200,7 @@
>   Sets up a multicast receive (ipv6) socket
>  */
> int
>-ipv6_recv_sk(char *addr, int port)
>+ipv6_recv_sk(char *addr, int port, unsigned int ifindex)
> {
> 	int sock, val;
> 	struct ipv6_mreq mreq;
>@@ -219,6 +219,7 @@
> 	memcpy(&mreq.ipv6mr_multiaddr, &sin.sin6_addr,
> 	       sizeof(struct in6_addr));
> 
>+	mreq.ipv6mr_interface = ifindex;
> 
> 	/********************************
> 	 * SET UP MULTICAST RECV SOCKET *
>--- cman-2.0.84-2.el5/fence/man/fence_xvmd.8.interface	2008-08-21 18:09:13.000000000 +0900
>+++ cman-2.0.84-2.el5/fence/man/fence_xvmd.8	2008-08-21 18:39:08.000000000 +0900
>@@ -46,6 +46,9 @@
> \fB-p\fP \fIport\fP
> Port to use (default=1229)
> .TP
>+\fB-I\fP \fIinterface\fP
>+Network interface to listen on, e.g. eth0.
>+.TP
> \fB-C\fP \fIauth\fP
> Authentication type (none, sha1, sha256, sha512; default=sha256).  This
> controls the authentication mechanism used to authenticate clients.  The

Actions: View | Diff

Attachments on bug 459720: 314709