Changeset 1425 for trunk/libtransmission/net.c

Timestamp:

Jan 21, 2007, 7:42:11 PM (15 years ago)

Author:

titer

Message:

More simplifications

File:

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

trunk/libtransmission/net.c

@@ -223 +223 @@
 
 /***********************************************************************
- * TCP sockets
+ * TCP/UDP sockets
  **********************************************************************/
 
@@ -248 +248 @@
 }
 
-static int createSocket( int type )
+static int createSocket( int type, int priority )
 {
     int s;
-
-    s = socket( AF_INET, type, 0 );
-    if( s < 0 )
-    {
-        tr_err( "Could not create socket (%s)", strerror( errno ) );
-        return -1;
-    }
-
+    if( ( s = tr_fdSocketCreate( type, priority ) ) < 0 )
+    {
+        return -1;
+    }
     return makeSocketNonBlocking( s );
 }
 
-int tr_netOpen( struct in_addr addr, in_port_t port, int type )
+int tr_netOpen( struct in_addr addr, in_port_t port, int type, int priority )
 {
     int s;
     struct sockaddr_in sock;
 
-    s = createSocket( type );
-    if( s < 0 )
+    if( ( s = createSocket( type, priority ) ) < 0 )
     {
         return -1;
@@ -329 +324 @@
 #endif
 
-    s = createSocket( type );
-    if( s < 0 )
+    if( ( s = createSocket( type, 1 ) ) < 0 )
     {
         return -1;
@@ -364 +358 @@
 }
 
-int tr_netAccept( int s, struct in_addr * addr, in_port_t * port )
-{
-    int t;
-    unsigned len;
-    struct sockaddr_in sock;
-
-    len = sizeof( sock );
-    t   = accept( s, (struct sockaddr *) &sock, &len );
-
-    if( t < 0 )
-    {
-        return -1;
-    }
-    
-    *addr = sock.sin_addr;
-    *port = sock.sin_port;
-
-    return makeSocketNonBlocking( t );
+int tr_netAccept( int b, struct in_addr * addr, in_port_t * port )
+{
+    int s;
+    if( ( s = tr_fdSocketAccept( b, addr, port ) ) < 0 )
+    {
+        return -1;
+    }
+    return makeSocketNonBlocking( s );
 }
 
@@ -432 +416 @@
 void tr_netClose( int s )
 {
-#ifdef BEOS_NETSERVER
-    closesocket( s );
-#else
-    close( s );
-#endif
+    tr_fdSocketClose( s );
 }