Changeset 7413 for trunk/libtransmission/net.c

Timestamp:

Dec 16, 2008, 9:06:47 PM (12 years ago)

Author:

charles

Message:

(trunk libT) more runtime safety checks

File:

• trunk/libtransmission/net.c (modified) (15 diffs)

trunk/libtransmission/net.c

@@ -69 +69 @@
 }
 
+tr_bool
+tr_isAddress( const tr_address * a )
+{
+    return a && ( a->type==AF_INET || a->type==AF_INET6 );
+}
 
 const char * 
 tr_ntop( const tr_address * src, char * dst, int size ) 
-{ 
+{
+    assert( tr_isAddress( src ) );
+
     if( src->type == TR_AF_INET ) 
         return inet_ntop( AF_INET, &src->addr, dst, size ); 
@@ -114 +121 @@
 tr_normalizeV4Mapped( tr_address * const addr )
 {
+    assert( tr_isAddress( addr ) );
+
     if( addr->type == TR_AF_INET6 && IN6_IS_ADDR_V4MAPPED( &addr->addr.addr6 ) )
     {
@@ -133 +142 @@
     int addrlen;
 
-    assert( a );
-    assert( b );
-    assert( a->type == TR_AF_INET || a->type == TR_AF_INET6 );
-    assert( b->type == TR_AF_INET || b->type == TR_AF_INET6 );
+    assert( tr_isAddress( a ) );
+    assert( tr_isAddress( b ) );
 
     /* IPv6 addresses are always "greater than" IPv4 */ 
@@ -164 +171 @@
 {
     tr_socketList * tmp;
+
     assert( head );
+    assert( tr_isAddress( addr ) );
+
     for( tmp = head; tmp->next; tmp = tmp->next );
     tmp->next = tr_socketListNew( addr );
@@ -174 +184 @@
 {
     tr_socketList * tmp;
+
+    assert( tr_isAddress( addr ) );
+
     tmp = tr_new( tr_socketList, 1 );
     tmp->socket = -1;
@@ -185 +198 @@
 {
     assert( head );
+
     if( head->next )
         tr_socketListFree( head->next );
@@ -195 +209 @@
 {
     tr_socketList * tmp;
+
     assert( head );
     assert( el );
+
     for( tmp = head; tmp->next && tmp->next != el; tmp = tmp->next );
     tmp->next = el->next;
@@ -208 +224 @@
 {
     tr_socketList * tmp;
+
     assert( head );
     assert( start );
+
     for( tmp = head; tmp->next && tmp->next != start; tmp = tmp->next );
     tr_socketListFree( start );
@@ -215 +233 @@
 }
 
+#if 0
 int
 tr_socketListGetSocket( const tr_socketList * const el )
 {
     assert( el );
+
     return el->socket;
 }
@@ -228 +248 @@
     return &el->addr;
 }
+#endif
 
 void
@@ -246 +267 @@
 
 int
-tr_netSetTOS( int s,
-              int tos )
+tr_netSetTOS( int s, int tos )
 {
 #ifdef IP_TOS
@@ -302 +322 @@
     struct sockaddr_in  sock4;
     struct sockaddr_in6 sock6;
+
+    assert( tr_isAddress( addr ) );
+
     if( addr->type == TR_AF_INET )
     {
@@ -333 +356 @@
     socklen_t               addrlen;
 
+    assert( tr_isAddress( addr ) );
+
     if( ( s = createSocket( ( addr->type == TR_AF_INET ? AF_INET : AF_INET6 ),
                             type ) ) < 0 )
@@ -369 +394 @@
     const int               type = SOCK_STREAM;
     int                     addrlen;
+
+    assert( tr_isAddress( addr ) );
 
 #if defined( SO_REUSEADDR ) || defined( SO_REUSEPORT )
@@ -408 +435 @@
               tr_port     * port )
 {
-    int fd = makeSocketNonBlocking( tr_fdSocketAccept( b, addr, port ) );
+    int fd;
+
+    assert( tr_isAddress( addr ) );
+
+    fd = makeSocketNonBlocking( tr_fdSocketAccept( b, addr, port ) );
     setSndBuf( session, fd );
     return fd;