X-Git-Url: http://git.samba.org/?p=samba.git;a=blobdiff_plain;f=ctdb%2Fcommon%2Fsystem_gnu.c;h=38ccd13988bcd599868a24869093138d9e586140;hp=12462050e866dde7c798ac424a50e1cf032f4650;hb=a0c5d2e2b542754ccb8d8c59396119005ce6c9fd;hpb=af13e56271d4352a28352a89b651d569afda2314

diff --git a/ctdb/common/system_gnu.c b/ctdb/common/system_gnu.c
index 12462050e86..38ccd13988b 100644
--- a/ctdb/common/system_gnu.c
+++ b/ctdb/common/system_gnu.c
@@ -29,6 +29,7 @@
 #include "system/wait.h"
 
 #include "lib/util/debug.h"
+#include "lib/util/blocking.h"
 
 #include "protocol/protocol.h"
 
@@ -135,6 +136,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
 		struct ip6_hdr ip6;
 		struct tcphdr tcp;
 	} ip6pkt;
+	int saved_errno;
 
 	switch (src->ip.sin_family) {
 	case AF_INET:
@@ -162,7 +164,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
 		ip4pkt.tcp.check    = tcp_checksum((uint16_t *)&ip4pkt.tcp, sizeof(ip4pkt.tcp), &ip4pkt.ip);
 
 		/* open a raw socket to send this segment from */
-		s = socket(AF_INET, SOCK_RAW, htons(IPPROTO_RAW));
+		s = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
 		if (s == -1) {
 			DEBUG(DEBUG_CRIT,(__location__ " failed to open raw socket (%s)\n",
 				 strerror(errno)));
@@ -177,13 +179,13 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
 			return -1;
 		}
 
-		set_nonblocking(s);
-		set_close_on_exec(s);
-
-		ret = sendto(s, &ip4pkt, sizeof(ip4pkt), 0, &dest->ip, sizeof(dest->ip));
+		ret = sendto(s, &ip4pkt, sizeof(ip4pkt), 0,
+			     &dest->ip, sizeof(dest->ip));
+		saved_errno = errno;
 		close(s);
 		if (ret != sizeof(ip4pkt)) {
-			DEBUG(DEBUG_CRIT,(__location__ " failed sendto (%s)\n", strerror(errno)));
+			DEBUG(DEBUG_ERR,
+			      ("Failed sendto (%s)\n", strerror(saved_errno)));
 			return -1;
 		}
 		break;
@@ -209,7 +211,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
 		ip6pkt.tcp.window   = htons(1234);
 		ip6pkt.tcp.check    = tcp_checksum6((uint16_t *)&ip6pkt.tcp, sizeof(ip6pkt.tcp), &ip6pkt.ip6);
 
-		s = socket(PF_INET6, SOCK_RAW, IPPROTO_RAW);
+		s = socket(AF_INET6, SOCK_RAW, IPPROTO_RAW);
 		if (s == -1) {
 			DEBUG(DEBUG_CRIT, (__location__ " Failed to open sending socket\n"));
 			return -1;
@@ -222,12 +224,15 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
 		tmpport = tmpdest->ip6.sin6_port;
 
 		tmpdest->ip6.sin6_port = 0;
-		ret = sendto(s, &ip6pkt, sizeof(ip6pkt), 0, &dest->ip6, sizeof(dest->ip6));
+		ret = sendto(s, &ip6pkt, sizeof(ip6pkt), 0,
+			     &dest->ip6, sizeof(dest->ip6));
+		saved_errno = errno;
 		tmpdest->ip6.sin6_port = tmpport;
 		close(s);
 
 		if (ret != sizeof(ip6pkt)) {
-			DEBUG(DEBUG_CRIT,(__location__ " failed sendto (%s)\n", strerror(errno)));
+			DEBUG(DEBUG_ERR,
+			      ("Failed sendto (%s)\n", strerror(saved_errno)));
 			return -1;
 		}
 		break;
@@ -270,9 +275,10 @@ int ctdb_sys_close_capture_socket(void *private_data)
 /*
   called when the raw socket becomes readable
  */
-int ctdb_sys_read_tcp_packet(int s, void *private_data, 
-			ctdb_sock_addr *src, ctdb_sock_addr *dst,
-			uint32_t *ack_seq, uint32_t *seq)
+int ctdb_sys_read_tcp_packet(int s, void *private_data,
+			     ctdb_sock_addr *src, ctdb_sock_addr *dst,
+			     uint32_t *ack_seq, uint32_t *seq,
+			     int *rst, uint16_t *window)
 {
 	int ret;
 #define RCVPKTSIZE 100
@@ -287,6 +293,9 @@ int ctdb_sys_read_tcp_packet(int s, void *private_data,
 		return -1;
 	}
 
+	ZERO_STRUCTP(src);
+	ZERO_STRUCTP(dst);
+
 	/* Ethernet */
 	eth = (struct ether_header *)pkt;
 
@@ -325,6 +334,12 @@ int ctdb_sys_read_tcp_packet(int s, void *private_data,
 		dst->ip.sin_port        = tcp->dest;
 		*ack_seq                = tcp->ack_seq;
 		*seq                    = tcp->seq;
+		if (window != NULL) {
+			*window = tcp->window;
+		}
+		if (rst != NULL) {
+			*rst = tcp->rst;
+		}
 
 		return 0;
 	} else if (ntohs(eth->ether_type) == ETHERTYPE_IP6) {
@@ -350,6 +365,12 @@ int ctdb_sys_read_tcp_packet(int s, void *private_data,
 
 		*ack_seq             = tcp->ack_seq;
 		*seq                 = tcp->seq;
+		if (window != NULL) {
+			*window = tcp->window;
+		}
+		if (rst != NULL) {
+			*rst = tcp->rst;
+		}
 
 		return 0;
 	}