[ds6-devel] nc6/src circ_buf.c,1.7,1.8 connection.c,1.5,1.6 connection.h,1.2,1.3 filter.c,1.9,1.10

[mauro@deepspace6.net]

Update of /cvs/nc6/src

Modified Files:
	circ_buf.c connection.c connection.h filter.c 
Log Message:
reworked some files to correct coding style

Index: circ_buf.c
===================================================================
RCS file: /cvs/nc6/src/circ_buf.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- circ_buf.c	24 Dec 2002 14:54:00 -0000	1.7
+++ circ_buf.c	24 Dec 2002 19:50:56 -0000	1.8
@@ -1,5 +1,4 @@
-/* vi:ts=4 sw=4
- *
+/*
  *  circ_buf.c - circular buffer module - implementation
  *  
  *  nc6 - an advanced netcat clone
Index: connection.c
===================================================================
RCS file: /cvs/nc6/src/connection.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- connection.c	24 Dec 2002 14:54:00 -0000	1.5
+++ connection.c	24 Dec 2002 19:50:56 -0000	1.6
@@ -1,5 +1,4 @@
-/* vi:ts=4 sw=4
- *
+/*
  *  connection.c - connection description structures and functions - implementation
  * 
  *  nc6 - an advanced netcat clone
@@ -33,7 +32,7 @@
 
 void connection_attributes_init(connection_attributes *attrs)
 {
-	assert(attrs);
+	assert(attrs != NULL);
 
 	attrs->proto = PROTO_UNSPECIFIED;
 	attrs->type = TCP_SOCKET;
@@ -52,7 +51,7 @@
 
 void connection_attributes_destroy(connection_attributes *attrs)
 {
-	assert(attrs);
+	assert(attrs != NULL);
 
 	io_stream_destroy(&(attrs->remote_stream));
 	io_stream_destroy(&(attrs->local_stream));
@@ -61,10 +60,10 @@
 
 
 void connection_attributes_to_addrinfo(struct addrinfo *ainfo,
-		const connection_attributes *attrs)
+                                       const connection_attributes *attrs)
 {
-	assert(ainfo);
-	assert(attrs);
+	assert(ainfo != NULL);
+	assert(attrs != NULL);
 
 	switch (attrs->proto) {
 		case PROTO_IPv6:
Index: connection.h
===================================================================
RCS file: /cvs/nc6/src/connection.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- connection.h	15 Dec 2002 17:27:08 -0000	1.2
+++ connection.h	24 Dec 2002 19:50:56 -0000	1.3
@@ -56,6 +56,6 @@
 void connection_attributes_destroy(connection_attributes *attrs);
 
 void connection_attributes_to_addrinfo(struct addrinfo *ainfo,
-		const connection_attributes *attrs);
+                                       const connection_attributes *attrs);
 
 #endif /* CONNECTION_H */
Index: filter.c
===================================================================
RCS file: /cvs/nc6/src/filter.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- filter.c	24 Dec 2002 14:54:00 -0000	1.9
+++ filter.c	24 Dec 2002 19:50:56 -0000	1.10
@@ -1,5 +1,4 @@
-/* vi:ts=4 sw=4
- *
+/* 
  *  filter.c - incoming traffic validator module - implementation
  * 
  *  nc6 - an advanced netcat clone
@@ -38,14 +37,13 @@
 
 #ifdef ENABLE_IPV6
 /* returns TRUE if a represents an ipv4-mapped address */
-inline
-static bool is_address_ipv4_mapped(const struct sockaddr *a)
+inline static bool is_address_ipv4_mapped(const struct sockaddr *a)
 {
 	bool ret = FALSE;
 	
 	assert(a != NULL);
 	
-	if (a->sa_family == AF_INET6 && 
+	if ((a->sa_family == AF_INET6) && 
 	    IN6_IS_ADDR_V4MAPPED(&(((const struct sockaddr_in6 *)a)->sin6_addr)))
 		ret = TRUE;
 			
@@ -73,10 +71,10 @@
 		ap = (struct sockaddr *)alloca(sizeof(struct sockaddr_in));
 		memset(ap, 0, sizeof(struct sockaddr_in));
 		memcpy(&(((struct sockaddr_in *)ap)->sin_addr.s_addr),
-			   &(((const struct sockaddr_in6 *)a)->sin6_addr.s6_addr[12]),
-			   sizeof(struct in_addr));
+		       &(((const struct sockaddr_in6 *)a)->sin6_addr.s6_addr[12]),
+		       sizeof(struct in_addr));
 		((struct sockaddr_in *)ap)->sin_port =
-				((const struct sockaddr_in6 *)a)->sin6_port;
+			((const struct sockaddr_in6 *)a)->sin6_port;
 		aa = ap;
 	}
 
@@ -85,10 +83,10 @@
 		bp = (struct sockaddr *)alloca(sizeof(struct sockaddr_in));
 		memset(bp, 0, sizeof(struct sockaddr_in));
 		memcpy(&(((struct sockaddr_in *)bp)->sin_addr.s_addr),
-			   &(((const struct sockaddr_in6 *)b)->sin6_addr.s6_addr[12]),
-			   sizeof(struct in_addr));
+		       &(((const struct sockaddr_in6 *)b)->sin6_addr.s6_addr[12]),
+		       sizeof(struct in_addr));
 		((struct sockaddr_in *)bp)->sin_port =
-				((const struct sockaddr_in6 *)b)->sin6_port;
+			((const struct sockaddr_in6 *)b)->sin6_port;
 		bb = bp;
 	}
 #endif
@@ -103,37 +101,34 @@
 
 #ifdef ENABLE_IPV6
 	if (aa->sa_family == AF_INET6) {
-		/* compare address part */
-		/* either address may be IN6ADDR_ANY, resulting in a good match */
-		if (memcmp(&((const struct sockaddr_in6 *)aa)->sin6_addr,
-		           &in6addr_any, sizeof(struct in6_addr)) != 0 &&
-		    memcmp(&((const struct sockaddr_in6 *)bb)->sin6_addr,
-		           &in6addr_any, sizeof(struct in6_addr)) != 0 &&
-			memcmp(&((const struct sockaddr_in6 *)aa)->sin6_addr, 
-			       &((const struct sockaddr_in6 *)bb)->sin6_addr, 
-			       sizeof(struct in6_addr)) != 0)
-		{
+		/* compare address part 
+		 * either address may be IN6ADDR_ANY, resulting in a good match */
+		if ((memcmp(&((const struct sockaddr_in6 *)aa)->sin6_addr,
+		            &in6addr_any, sizeof(struct in6_addr)) != 0) &&
+		    (memcmp(&((const struct sockaddr_in6 *)bb)->sin6_addr,
+		            &in6addr_any, sizeof(struct in6_addr)) != 0) &&
+		    (memcmp(&((const struct sockaddr_in6 *)aa)->sin6_addr, 
+		            &((const struct sockaddr_in6 *)bb)->sin6_addr, 
+			    sizeof(struct in6_addr)) != 0)) {
 			return FALSE;
 		}
 
-		/* compare port part */
-		/* either port may be 0(any), resulting in a good match */
+		/* compare port part 
+		 * either port may be 0(any), resulting in a good match */
 		return ((((const struct sockaddr_in6 *)aa)->sin6_port == 0) ||
 		        (((const struct sockaddr_in6 *)bb)->sin6_port == 0) ||
-				(((const struct sockaddr_in6 *)aa)->sin6_port ==
+		        (((const struct sockaddr_in6 *)aa)->sin6_port ==
 		         ((const struct sockaddr_in6 *)bb)->sin6_port))? TRUE : FALSE;
 	}
 #endif
 
 	if (aa->sa_family == AF_INET) { 
-		/* compare address part */
[...51 lines suppressed...]