[netfilter-cvslog] r3771 - branches/netfilter-ha/linux-2.6-actact/ct_sync

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-03-07 16:34:11 +0100 (Mon, 07 Mar 2005)
New Revision: 3771

Modified:
   branches/netfilter-ha/linux-2.6-actact/ct_sync/ct_sync_sock.c
   branches/netfilter-ha/linux-2.6-actact/ct_sync/ct_sync_sock.h
Log:
remove bogus parameter 'ipv6' from functions, this can be derived from sockaddr


Modified: branches/netfilter-ha/linux-2.6-actact/ct_sync/ct_sync_sock.c
===================================================================
--- branches/netfilter-ha/linux-2.6-actact/ct_sync/ct_sync_sock.c	2005-03-07 15:10:09 UTC (rev 3770)
+++ branches/netfilter-ha/linux-2.6-actact/ct_sync/ct_sync_sock.c	2005-03-07 15:34:11 UTC (rev 3771)
@@ -157,15 +157,19 @@
 }
 
 struct socket *
-cts_sock_server_init(char *devname, const struct sockaddr_in *addr, int ipv6)
+cts_sock_server_init(char *devname, const struct sockaddr_storage *addr)
 {
 	struct socket *sock;
 	int pf;
 
-	if (ipv6)
+	if (addr->ss_family == AF_INET6)
 		pf = PF_INET6;
-	else
+	else if (addr->ss_family == AF_INET)
 		pf = PF_INET;
+	else {
+		CT_SYNC_ERR("Unknown socket family\n");
+		return NULL
+	}
 
 	if (sock_create(pf, SOCK_DGRAM, IPPROTO_UDP, &sock) < 0) {
 		CT_SYNC_ERR("Socket creation failed.\n");
@@ -199,16 +203,19 @@
 }
 
 struct socket *
-cts_sock_client_init(char *devname, const struct sockaddr_storage *addr, 
-		     int ipv6)
+cts_sock_client_init(char *devname, const struct sockaddr_storage *addr)
 {
 	struct socket *sock;
 	int pf;
 
-	if (ipv6)
+	if (addr->ss_family == AF_INET6)
 		pf = PF_INET6;
-	else
-		pf = PF_INET
+	else if (addr->ss_family == AF_INET)
+		pf = PF_INET;
+	else {
+		CT_SYNC_ERR("Unknown socket family\n");
+		return NULL;
+	}
 
 	if (sock_create(pf, SOCK_DGRAM, IPPROTO_UDP, &sock) < 0) {
 		CT_SYNC_ERR("Error during creation of client socket.\n");

Modified: branches/netfilter-ha/linux-2.6-actact/ct_sync/ct_sync_sock.h
===================================================================
--- branches/netfilter-ha/linux-2.6-actact/ct_sync/ct_sync_sock.h	2005-03-07 15:10:09 UTC (rev 3770)
+++ branches/netfilter-ha/linux-2.6-actact/ct_sync/ct_sync_sock.h	2005-03-07 15:34:11 UTC (rev 3771)
@@ -10,9 +10,7 @@
 			 const size_t length);
 
 struct socket *cts_sock_client_init(char *devname,
-				    const struct sockaddr_storage *addr,
-				    int ipv6);
+				    const struct sockaddr_storage *addr);
 struct socket *cts_sock_server_init(char *devname, 
-				    const struct sockaddr_storage *addr,
-				    int ipv6);
+				    const struct sockaddr_storage *addr);
 #endif /* _CT_SYNC_SOCK_H */