Attachment 11802 Details for Bug 11705 – Patches for v4-4 branch

[patch] Patches for v4-4 branch

v4-4.patches (text/plain), 11.03 KB, created by Amitay Isaacs on 2016-02-02 11:38:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Amitay Isaacs

Created: 2016-02-02 11:38:21 UTC

Size: 11.03 KB

patch

obsolete

>From 7859dd49effdc65ce3321b18c9788c6a48da0cf4 Mon Sep 17 00:00:00 2001
>From: Amitay Isaacs <amitay@gmail.com>
>Date: Fri, 29 Jan 2016 00:05:26 +1100
>Subject: [PATCH 1/2] ctdb-common: Protocol argument must be in host order for
> socket() call
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11705
>
>Signed-off-by: Amitay Isaacs <amitay@gmail.com>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>(cherry picked from commit 9f8395cb7d49b63a82f75bf504f5f83920102b29)
>---
> ctdb/common/system_aix.c      | 4 ++--
> ctdb/common/system_common.c   | 2 +-
> ctdb/common/system_freebsd.c  | 2 +-
> ctdb/common/system_gnu.c      | 2 +-
> ctdb/common/system_kfreebsd.c | 2 +-
> ctdb/common/system_linux.c    | 8 ++++----
> 6 files changed, 10 insertions(+), 10 deletions(-)
>
>diff --git a/ctdb/common/system_aix.c b/ctdb/common/system_aix.c
>index d323e5c..2d35a22 100644
>--- a/ctdb/common/system_aix.c
>+++ b/ctdb/common/system_aix.c
>@@ -50,7 +50,7 @@ int ctdb_sys_open_sending_socket(void)
> 	int s, ret;
> 	uint32_t one = 1;
> 
>-	s = socket(AF_INET, SOCK_RAW, htons(IPPROTO_RAW));
>+	s = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
> 	if (s == -1) {
> 		DEBUG(DEBUG_CRIT,(" failed to open raw socket (%s)\n",
> 			 strerror(errno)));
>@@ -127,7 +127,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
> 
> 
> 
>-	s = socket(AF_INET, SOCK_RAW, htons(IPPROTO_RAW));
>+	s = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
> 	if (s == -1) {
> 		DEBUG(DEBUG_CRIT,(" failed to open raw socket (%s)\n",
> 			 strerror(errno)));
>diff --git a/ctdb/common/system_common.c b/ctdb/common/system_common.c
>index e11bcb2..a80189c 100644
>--- a/ctdb/common/system_common.c
>+++ b/ctdb/common/system_common.c
>@@ -90,7 +90,7 @@ char *ctdb_sys_find_ifname(ctdb_sock_addr *addr)
> 	struct ifconf ifc;
> 	char *ptr;
> 
>-	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)));
>diff --git a/ctdb/common/system_freebsd.c b/ctdb/common/system_freebsd.c
>index e88e9e2..401c396 100644
>--- a/ctdb/common/system_freebsd.c
>+++ b/ctdb/common/system_freebsd.c
>@@ -164,7 +164,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
> 		ip4pkt.tcp.th_sum   = 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)));
>diff --git a/ctdb/common/system_gnu.c b/ctdb/common/system_gnu.c
>index 1246205..b99607d 100644
>--- a/ctdb/common/system_gnu.c
>+++ b/ctdb/common/system_gnu.c
>@@ -162,7 +162,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)));
>diff --git a/ctdb/common/system_kfreebsd.c b/ctdb/common/system_kfreebsd.c
>index b030317..5d4bb5d 100644
>--- a/ctdb/common/system_kfreebsd.c
>+++ b/ctdb/common/system_kfreebsd.c
>@@ -162,7 +162,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)));
>diff --git a/ctdb/common/system_linux.c b/ctdb/common/system_linux.c
>index 55c22c5..20fa021 100644
>--- a/ctdb/common/system_linux.c
>+++ b/ctdb/common/system_linux.c
>@@ -100,7 +100,7 @@ int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface)
> 
> 	switch (addr->ip.sin_family) {
> 	case AF_INET:
>-		s = socket(PF_PACKET, SOCK_RAW, htons(ETHERTYPE_ARP));
>+		s = socket(PF_PACKET, SOCK_RAW, ETHERTYPE_ARP);
> 		if (s == -1){
> 			DEBUG(DEBUG_CRIT,(__location__ " failed to open raw socket\n"));
> 			return -1;
>@@ -194,7 +194,7 @@ int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface)
> 		close(s);
> 		break;
> 	case AF_INET6:
>-		s = socket(PF_PACKET, SOCK_RAW, htons(ETHERTYPE_ARP));
>+		s = socket(PF_PACKET, SOCK_RAW, ETHERTYPE_ARP);
> 		if (s == -1){
> 			DEBUG(DEBUG_CRIT,(__location__ " failed to open raw socket\n"));
> 			return -1;
>@@ -370,7 +370,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)));
>@@ -460,7 +460,7 @@ int ctdb_sys_open_capture_socket(const char *iface, void **private_data)
> 	int s;
> 
> 	/* Open a socket to capture all traffic */
>-	s = socket(AF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
>+	s = socket(AF_PACKET, SOCK_RAW, ETH_P_ALL);
> 	if (s == -1) {
> 		DEBUG(DEBUG_CRIT,(__location__ " failed to open raw socket\n"));
> 		return -1;
>-- 
>2.5.0
>
>
>From 80326e6d09ef6ca49fc28c40e6f9f9b7ee9c71fd Mon Sep 17 00:00:00 2001
>From: Amitay Isaacs <amitay@gmail.com>
>Date: Fri, 29 Jan 2016 00:06:18 +1100
>Subject: [PATCH 2/2] ctdb-common: Use documented names for protocol family in
> socket()
>
>Instead of using PF_*, use AF_*.
>
>https://bugzilla.samba.org/show_bug.cgi?id=11705
>
>Signed-off-by: Amitay Isaacs <amitay@gmail.com>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>(cherry picked from commit 9f94620a308a3b17c1886c2c4807b34b8d5edacb)
>---
> ctdb/common/system_freebsd.c   | 2 +-
> ctdb/common/system_gnu.c       | 2 +-
> ctdb/common/system_kfreebsd.c  | 2 +-
> ctdb/common/system_linux.c     | 8 ++++----
> ctdb/tools/ctdb.c              | 4 ++--
> ctdb/utils/smnotify/smnotify.c | 6 +++---
> 6 files changed, 12 insertions(+), 12 deletions(-)
>
>diff --git a/ctdb/common/system_freebsd.c b/ctdb/common/system_freebsd.c
>index 401c396..37e4bae 100644
>--- a/ctdb/common/system_freebsd.c
>+++ b/ctdb/common/system_freebsd.c
>@@ -214,7 +214,7 @@ int ctdb_sys_send_tcp(const ctdb_sock_addr *dest,
> 		ip6pkt.tcp.th_win   = htons(1234);
> 		ip6pkt.tcp.th_sum   = 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;
>diff --git a/ctdb/common/system_gnu.c b/ctdb/common/system_gnu.c
>index b99607d..e5b8e05 100644
>--- a/ctdb/common/system_gnu.c
>+++ b/ctdb/common/system_gnu.c
>@@ -209,7 +209,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;
>diff --git a/ctdb/common/system_kfreebsd.c b/ctdb/common/system_kfreebsd.c
>index 5d4bb5d..4be678d 100644
>--- a/ctdb/common/system_kfreebsd.c
>+++ b/ctdb/common/system_kfreebsd.c
>@@ -209,7 +209,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;
>diff --git a/ctdb/common/system_linux.c b/ctdb/common/system_linux.c
>index 20fa021..d523617 100644
>--- a/ctdb/common/system_linux.c
>+++ b/ctdb/common/system_linux.c
>@@ -100,7 +100,7 @@ int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface)
> 
> 	switch (addr->ip.sin_family) {
> 	case AF_INET:
>-		s = socket(PF_PACKET, SOCK_RAW, ETHERTYPE_ARP);
>+		s = socket(AF_PACKET, SOCK_RAW, ETHERTYPE_ARP);
> 		if (s == -1){
> 			DEBUG(DEBUG_CRIT,(__location__ " failed to open raw socket\n"));
> 			return -1;
>@@ -194,7 +194,7 @@ int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface)
> 		close(s);
> 		break;
> 	case AF_INET6:
>-		s = socket(PF_PACKET, SOCK_RAW, ETHERTYPE_ARP);
>+		s = socket(AF_PACKET, SOCK_RAW, ETHERTYPE_ARP);
> 		if (s == -1){
> 			DEBUG(DEBUG_CRIT,(__location__ " failed to open raw socket\n"));
> 			return -1;
>@@ -419,7 +419,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;
>@@ -581,7 +581,7 @@ bool ctdb_sys_check_iface_exists(const char *iface)
> 	int s;
> 	struct ifreq ifr;
> 
>-	s = socket(PF_PACKET, SOCK_RAW, 0);
>+	s = socket(AF_PACKET, SOCK_RAW, 0);
> 	if (s == -1){
> 		/* We don't know if the interface exists, so assume yes */
> 		DEBUG(DEBUG_CRIT,(__location__ " failed to open raw socket\n"));
>diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
>index 61ab896..9061642 100644
>--- a/ctdb/tools/ctdb.c
>+++ b/ctdb/tools/ctdb.c
>@@ -4365,7 +4365,7 @@ static int control_chktcpport(struct ctdb_context *ctdb, int argc, const char **
> 
> 	port = atoi(argv[0]);
> 
>-	s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
>+	s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
> 	if (s == -1) {
> 		printf("Failed to open local socket\n");
> 		return errno;
>@@ -4377,7 +4377,7 @@ static int control_chktcpport(struct ctdb_context *ctdb, int argc, const char **
> 	}
> 
> 	bzero(&sin, sizeof(sin));
>-	sin.sin_family = PF_INET;
>+	sin.sin_family = AF_INET;
> 	sin.sin_port   = htons(port);
> 	ret = bind(s, (struct sockaddr *)&sin, sizeof(sin));
> 	close(s);
>diff --git a/ctdb/utils/smnotify/smnotify.c b/ctdb/utils/smnotify/smnotify.c
>index fa584ff..0cd61c7 100644
>--- a/ctdb/utils/smnotify/smnotify.c
>+++ b/ctdb/utils/smnotify/smnotify.c
>@@ -43,14 +43,14 @@ static int create_socket(const char *addr, int port)
> 	int s;
>         struct sockaddr_in sock_in;
> 
>-	s = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
>+	s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
> 	if (s == -1) {
> 		printf("Failed to open local socket\n");
> 		exit(10);
> 	}
> 
> 	bzero(&sock_in, sizeof(sock_in));
>-	sock_in.sin_family = PF_INET;
>+	sock_in.sin_family = AF_INET;
> 	sock_in.sin_port   = htons(port);
> 	inet_aton(addr, &sock_in.sin_addr);
> 	if (bind(s, (struct sockaddr *)&sock_in, sizeof(sock_in)) == -1) {
>@@ -124,7 +124,7 @@ int main(int argc, const char *argv[])
> 
> 	/* Setup a sockaddr_in for the client we want to notify */
> 	bzero(&sock_cl, sizeof(sock_cl));
>-	sock_cl.sin_family = PF_INET;
>+	sock_cl.sin_family = AF_INET;
> 	sock_cl.sin_port   = htons(clientport);
> 	inet_aton(client, &sock_cl.sin_addr);
> 
>-- 
>2.5.0
>

Flags:

vl: review+

Actions: View

Attachments on bug 11705: 11802 | 11803