Rev 358: send on the right socket! in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 358
revision-id: tridge at samba.org-20070527054743-ldficagg4243oz4g
parent: tridge at samba.org-20070527052629-21sso5vacuoyij16
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Sun 2007-05-27 15:47:43 +1000
message:
  send on the right socket!
modified:
  takeover/ctdb_takeover.c       ctdb_takeover.c-20070525071636-a5n1ihghjtppy08r-2
  takeover/system.c              system.c-20070525071636-a5n1ihghjtppy08r-3
=== modified file 'takeover/ctdb_takeover.c'
--- a/takeover/ctdb_takeover.c	2007-05-27 05:26:29 +0000
+++ b/takeover/ctdb_takeover.c	2007-05-27 05:47:43 +0000
@@ -68,9 +68,9 @@
 
 	for (tcp=arp->tcp_list;tcp;tcp=tcp->next) {
 		DEBUG(0,("sending tcp tickle ack for %u->%s:%u\n",
-			 (unsigned)tcp->daddr.sin_port, 
+			 (unsigned)ntohs(tcp->daddr.sin_port), 
 			 inet_ntoa(tcp->saddr.sin_addr),
-			 (unsigned)tcp->saddr.sin_port));			 
+			 (unsigned)ntohs(tcp->saddr.sin_port)));
 		ret = ctdb_sys_send_ack(&tcp->daddr, &tcp->saddr);
 		if (ret != 0) {
 			DEBUG(0,(__location__ " Failed to send tcp tickle ack for %s\n",

=== modified file 'takeover/system.c'
--- a/takeover/system.c	2007-05-27 05:26:29 +0000
+++ b/takeover/system.c	2007-05-27 05:47:43 +0000
@@ -197,7 +197,7 @@
 	pkt.tcp.ack      = 1;
 	pkt.tcp.check    = 0;
 
-	ret = sendto(3, &pkt, sizeof(pkt), 0, dest, sizeof(*dest));
+	ret = sendto(s, &pkt, sizeof(pkt), 0, dest, sizeof(*dest));
 	if (ret != 0) {
 		DEBUG(0,(__location__ " failed sendto (%s)\n", strerror(errno)));
 	}