[netfilter-cvslog] r3593 - branches/netfilter-ha/linux-2.6/ct_sync

[hidden at netfilter.org]

Author: hidden at netfilter.org
Date: 2005-01-13 00:04:35 +0100 (Thu, 13 Jan 2005)
New Revision: 3593

Modified:
   branches/netfilter-ha/linux-2.6/ct_sync/ct_sync_main.c
   branches/netfilter-ha/linux-2.6/ct_sync/ct_sync_proto.c
   branches/netfilter-ha/linux-2.6/ct_sync/ct_sync_sock.c
Log:
Revision: hidden at sch.bme.hu--2005-public/netfilter-ha--mainline--1.0--patch-15

Fix a couple of signedness problems.

* ct_sync/ct_sync_sock.c (cts_sock_send): return signed value
(cts_sock_sendmsg): return signed value
(cts_sock_recv): return signed value

* ct_sync/ct_sync_proto.c: fix callers of socket I/O functions to
  consider returned values as signed

* ct_sync/ct_sync_main.c (ct_sync_msg_process_update_ct): don't print
  error messages here


Modified: branches/netfilter-ha/linux-2.6/ct_sync/ct_sync_main.c
===================================================================
--- branches/netfilter-ha/linux-2.6/ct_sync/ct_sync_main.c	2005-01-12 11:37:11 UTC (rev 3592)
+++ branches/netfilter-ha/linux-2.6/ct_sync/ct_sync_main.c	2005-01-12 23:04:35 UTC (rev 3593)
@@ -46,7 +46,6 @@
 
 #include <asm/uaccess.h>
 #include <linux/unistd.h>
-static int errno; /* FIXME: linux/unistd.h needs this */
 
 #include <linux/netfilter_ipv4/ct_sync.h>
 #include <linux/netfilter_ipv4/ct_sync_proto.h>
@@ -578,11 +577,11 @@
 
 	if (unlikely(h && msghdr->flags & CTS_UPD_F_NEW)) {
 		CTS_STAT_INC(rx.upd_newbutexist);
-		CT_SYNC_ERR("received NEW conntrack, but we already know it: ");
+		CT_SYNC_DEBUG("received NEW conntrack, but we already know it: ");
 		DUMP_TUPLE(&sct->orig);
 	} else if (unlikely(!h && !(msghdr->flags & CTS_UPD_F_NEW))) {
 		CTS_STAT_INC(rx.upd_nothere);
-		CT_SYNC_ERR("received UPD conntrack, but we don't know it: ");
+		CT_SYNC_DEBUG("received UPD conntrack, but we don't know it: ");
 		DUMP_TUPLE(&sct->orig);
 	}
 
@@ -830,7 +829,7 @@
 				return -EINVAL;
 			}
 		} else {
-			CT_SYNC_INFO("we already are master; staying cool");
+			CT_SYNC_INFO("we already are master; staying cool\n");
 		}
 		break;
 

Modified: branches/netfilter-ha/linux-2.6/ct_sync/ct_sync_proto.c
===================================================================
--- branches/netfilter-ha/linux-2.6/ct_sync/ct_sync_proto.c	2005-01-12 11:37:11 UTC (rev 3592)
+++ branches/netfilter-ha/linux-2.6/ct_sync/ct_sync_proto.c	2005-01-12 23:04:35 UTC (rev 3593)
@@ -361,7 +361,7 @@
 int
 cts_proto_master_announce(struct cts_protoh *cph)
 {
-	size_t len;
+	ssize_t len;
 	struct {
 		struct ct_sync_pkthdr hdr;
 		struct ct_sync_master_announce ma;
@@ -434,7 +434,7 @@
 int
 cts_proto_initsync_follows(struct cts_protoh *cph)
 {
-	size_t len;
+	ssize_t len;
 	struct {
 		struct ct_sync_pkthdr hdr;
 	} pkt;
@@ -460,7 +460,7 @@
 static int
 cts_proto_send_initsync_request(struct cts_protoh *cph)
 {
-	size_t len;
+	ssize_t len;
 	struct {
 		struct ct_sync_pkthdr hdr;
 		struct ct_sync_slave_initsync is;
@@ -699,7 +699,7 @@
 cts_proto_send_dequeue(struct cts_protoh *cph)
 {
 	struct cts_buff *csb;
-	size_t len;
+	ssize_t len;
 
 	CT_SYNC_ENTER();
 
@@ -843,7 +843,7 @@
 		CTS_STAT_INC(tx.pkts_recover);
 
 		/* resend packet */
-		size_t len = cts_sock_send(cph->send.socket, (char *) &csb->pkt, 
+		ssize_t len = cts_sock_send(cph->send.socket, (char *) &csb->pkt, 
 					csb_len(csb));
 		if (unlikely(len < csb_len(csb))) {
 			CT_SYNC_ERR("error during retransmit: %d\n", len);
@@ -885,7 +885,7 @@
 cts_proto_request_recovery(struct cts_protoh *cph, u16 seq, int diff)
 {
 	struct ct_sync_pkthdr hdr;
-	size_t len;
+	ssize_t len;
 
 	CT_SYNC_ENTER();
 
@@ -980,7 +980,7 @@
 	struct csb_ring *csr = &cph->recv.ring;
 	struct cts_buff *csb;
 
-	size_t len;
+	ssize_t len;
 	int ret = CTS_PROTO_RCV_DISCARDED;
 
 	CT_SYNC_ENTER();
@@ -1002,7 +1002,7 @@
 	/* receive packet */
 	len = cts_sock_recv(cph->recv.socket, (char *)&csb->pkt, csb_size(csb));
 	if (unlikely(len < sizeof(struct ct_sync_pkthdr))) {
-		CT_SYNC_ERR("short packet, %u < %u\n", len,
+		CT_SYNC_ERR("short packet, %d < %u\n", len,
 				sizeof(struct ct_sync_pkthdr));
 		goto done_ignore;
 	}

Modified: branches/netfilter-ha/linux-2.6/ct_sync/ct_sync_sock.c
===================================================================
--- branches/netfilter-ha/linux-2.6/ct_sync/ct_sync_sock.c	2005-01-12 11:37:11 UTC (rev 3592)
+++ branches/netfilter-ha/linux-2.6/ct_sync/ct_sync_sock.c	2005-01-12 23:04:35 UTC (rev 3593)
@@ -203,10 +203,10 @@
 	return NULL;
 }
 
-size_t
+ssize_t
 cts_sock_sendmsg(struct socket *sock, struct msghdr *msg, const size_t length)
 {
-	size_t		len;
+	ssize_t		len;
 	mm_segment_t	oldfs;
 
 	CT_SYNC_ENTER();
@@ -223,13 +223,13 @@
 }
 
 
-size_t
+ssize_t
 cts_sock_send(struct socket *sock, const char *buffer, const size_t length)
 {
 	struct msghdr	msg;
 	mm_segment_t	oldfs;
 	struct iovec	iov;
-	size_t		len;
+	ssize_t		len;
 
 	CT_SYNC_ENTER();
 
@@ -252,12 +252,12 @@
 	return len;
 }
 
-size_t
+ssize_t
 cts_sock_recv(struct socket *sock, char *buffer, const size_t buflen)
 {
 	struct msghdr	msg;
 	struct iovec	iov;
-	size_t		len;
+	ssize_t		len;
 	mm_segment_t	oldfs;
 
 	CT_SYNC_ENTER();