Changeset 2576

Timestamp:

Jul 31, 2007, 4:55:47 PM (16 years ago)

Author:

charles

Message:

get the socket/net code working on win32 too

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• libtransmission/internal.h (modified) (1 diff)
• libtransmission/natpmp.c (modified) (2 diffs)
• libtransmission/net.c (modified) (5 diffs)
• libtransmission/net.h (modified) (3 diffs)
• libtransmission/platform.c (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)
• libtransmission/upnp.c (modified) (2 diffs)

trunk/configure.ac

@@ -117 +117 @@
      msw="yes"
      CXXFLAGS="$CXXFLAGS -mms-bitfields -mwin32 -mwindows"
-     CPPFLAGS="$CPPFLAGS -D__MINGW__ -DWIN32_LEAN_AND_MEAN"
+     CPPFLAGS="$CPPFLAGS -DWIN32 -DWIN32_LEAN_AND_MEAN"
      LIBS="$LIBS -lshell32 -lws2_32"
      transmissionlocaledir="locale"

trunk/libtransmission/internal.h

@@ -34 +34 @@
 #endif
 
-#ifdef SYS_BEOS
-#  define socklen_t uint32_t
-#endif
-
 #define TR_NAME "Transmission"
-
-#ifndef INADDR_NONE
-#define INADDR_NONE 0xffffffff
-#endif
 
 #ifdef __GNUC__

trunk/libtransmission/natpmp.c

@@ -596 +596 @@
     else if( TR_NET_CLOSE & res )
     {
-        if( ECONNRESET == errno || ECONNREFUSED == errno )
+        if( ECONNRESET == sockerrno || ECONNREFUSED == sockerrno )
         {
             tr_dbg( "nat-pmp not supported by device" );
@@ -652 +652 @@
 
     res = tr_netSend( req->fd, buf, sizeof( buf ) );
-    if( TR_NET_CLOSE & res && EHOSTUNREACH == errno )
+    if( TR_NET_CLOSE & res && EHOSTUNREACH == sockerrno )
     {
         res = TR_NET_BLOCK;

trunk/libtransmission/net.c

@@ -81 +81 @@
  * gethostbyname thread.
  **********************************************************************/
-void tr_netResolveThreadInit()
+void tr_netResolveThreadInit( void )
 {
     resolveDie   = 0;
@@ -97 +97 @@
  * die and clean itself up.
  **********************************************************************/
-void tr_netResolveThreadClose()
+void tr_netResolveThreadClose( void )
 {
     tr_lockLock( resolveLock );
@@ -290 +290 @@
     if( connect( s, (struct sockaddr *) &sock,
                  sizeof( struct sockaddr_in ) ) < 0 &&
-        errno != EINPROGRESS )
+        sockerrno != EINPROGRESS )
     {
         tr_err( "Could not connect socket (%s)", strerror( errno ) );
@@ -416 +416 @@
         return ret;
 
-    if( errno == ENOTCONN || errno == EAGAIN || errno == EWOULDBLOCK )
+    if( sockerrno == ENOTCONN || sockerrno == EAGAIN || sockerrno == EWOULDBLOCK )
         return TR_NET_BLOCK;
 
@@ -431 +431 @@
     if( ret < 0 )
     {
-        if( errno == EAGAIN || errno == EWOULDBLOCK )
+        if( sockerrno == EAGAIN || sockerrno == EWOULDBLOCK )
         {
             ret = TR_NET_BLOCK;

trunk/libtransmission/net.h

@@ -26 +26 @@
 #define _TR_NET_H_
 
-#if defined(BEOS_NETSERVER) || defined(__MINGW__)
-#include <stdint.h>
-typedef uint16_t tr_port_t;
+#ifdef WIN32
+    #include <stdint.h>
+    #include <winsock2.h>
+    typedef uint16_t tr_port_t;
 #else
-#include <arpa/inet.h>
-typedef in_port_t tr_port_t;
+    #include <sys/socket.h>
+    #include <netinet/in.h>
+    #include <arpa/inet.h>
+    typedef in_port_t tr_port_t;
+#endif
+
+#ifdef SYS_BEOS
+    #include <stdint.h>
+    typedef uint32_t socklen_t;
+#endif
+
+#ifdef WIN32
+    #define EAGAIN       WSAEAGAIN
+    #define ECONNREFUSED WSAECONNREFUSED
+    #define ECONNRESET   WSAECONNRESET
+    #define EHOSTUNREACH WSAEHOSTUNREACH
+    #define EINPROGRESS  WSAEINPROGRESS
+    #define ENOTCONN     WSAENOTCONN
+    #define EWOULDBLOCK  WSAEWOULDBLOCK
+    #define sockerrno WSAGetLastError( )
+#else
+    #include <errno.h>
+    #define sockerrno errno
+#endif
+
+#ifndef INADDR_NONE
+#define INADDR_NONE 0xffffffff
 #endif
 
@@ -43 +69 @@
 
 typedef struct tr_resolve_s tr_resolve_t;
-void           tr_netResolveThreadInit();
-void           tr_netResolveThreadClose();
+void           tr_netResolveThreadInit( void );
+void           tr_netResolveThreadClose( void );
 tr_resolve_t * tr_netResolveInit( const char * address );
 tr_tristate_t  tr_netResolvePulse( tr_resolve_t *, struct in_addr * );
@@ -53 +79 @@
  * TCP and UDP sockets
  **********************************************************************/
-int  tr_netOpenTCP ( const struct in_addr * addr, tr_port_t port, int priority );
-int  tr_netOpenUDP ( const struct in_addr * addr, tr_port_t port, int priority );
+int  tr_netOpenTCP  ( const struct in_addr * addr, tr_port_t port, int priority );
+int  tr_netOpenUDP  ( const struct in_addr * addr, tr_port_t port, int priority );
 int  tr_netMcastOpen( int port, const struct in_addr * addr );
-int  tr_netBindTCP ( int port );
-int  tr_netBindUDP ( int port );
-int  tr_netAccept  ( int s, struct in_addr *, tr_port_t * );
-void tr_netClose   ( int s );
+int  tr_netBindTCP  ( int port );
+int  tr_netBindUDP  ( int port );
+int  tr_netAccept   ( int s, struct in_addr *, tr_port_t * );
+void tr_netClose    ( int s );
 
 #define TR_NET_BLOCK 0x80000000

trunk/libtransmission/platform.c

@@ -846 +846 @@
         if( 0 > res )
         {
-            if( EAGAIN != errno )
+            if( EAGAIN != sockerrno )
             {
                 tr_err( "failed to read from routing socket (%s)",
-                        strerror( errno ) );
+                        strerror( sockerrno ) );
             }
             free( buf );

trunk/libtransmission/transmission.h

@@ -53 +53 @@
 #endif
 
-#if defined(__MINGW__)
+#if defined(WIN32)
 #define TR_PATH_DELIMITER '\\'
 #define TR_PATH_DELIMITER_STR "\\"

trunk/libtransmission/upnp.c

@@ -401 +401 @@
                     (struct sockaddr*) &sin, sizeof( sin ) ) )
     {
-        if( EAGAIN != errno )
+        if( EAGAIN != sockerrno )
         {
             tr_err( "Could not send SSDP discover message (%s)",
-                    strerror( errno ) );
+                    strerror( sockerrno ) );
         }
         killSock( &fd );
@@ -508 +508 @@
     else if( TR_NET_CLOSE & *len )
     {
-        tr_err( "Could not receive SSDP message (%s)", strerror( errno ) );
+        tr_err( "Could not receive SSDP message (%s)", strerror( sockerrno ) );
         return TR_NET_ERROR;
     }