[Cluster-devel] cluster/dlm-kernel/src lowcomms.c

[lhh@sourceware.org <lhh@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	lhh at sourceware.org	2007-11-07 15:24:20

Modified files:
	dlm-kernel/src : lowcomms.c 

Log message:
	Revert broken patch & apply correct patch from 338511

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm-kernel/src/lowcomms.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.22.2.18&r2=1.22.2.19

--- cluster/dlm-kernel/src/Attic/lowcomms.c	2007/10/30 17:41:13	1.22.2.18
+++ cluster/dlm-kernel/src/Attic/lowcomms.c	2007/11/07 15:24:19	1.22.2.19
@@ -586,17 +586,20 @@
 	sock->sk->sk_user_data = con;
 	con->rx_action = receive_from_sock;
 
-	make_sockaddr(&saddr, dlm_config.tcp_port, &addr_len);
-
-	add_sock(sock, con);
-
 	/* Bind to local address before send */
 	memcpy(&my_addr, &local_addr, sizeof(my_addr));
-	result = sock->ops->bind(sock, &my_addr, (int)(sizeof(my_addr)));
+	make_sockaddr(&my_addr, 0, &addr_len);
+	result = sock->ops->bind(sock, (struct sockaddr *) &my_addr,
+				 (int) sizeof(my_addr));
 	if (result < 0) {
-		printk("dlm: could not bind to local address for connect: %d\n", result);
+		printk("dlm: could not bind for connect: %d\n", result);
 	}
 
+	/* Set up for connect */
+	make_sockaddr(&saddr, dlm_config.tcp_port, &addr_len);
+
+	add_sock(sock, con);
+
 	log_debug2("connecting to %d", con->nodeid);
 	result =
 	    sock->ops->connect(sock, (struct sockaddr *) &saddr, addr_len,