Changeset 4115

Timestamp:

Dec 9, 2007, 10:46:36 PM (15 years ago)

Author:

charles

Message:

fix UPNP for 0.96

Location:

branches/0.9x/libtransmission

Files:

• natpmp.c (modified) (3 diffs)
• natpmp.h (modified) (1 diff)
• net.c (modified) (4 diffs)
• net.h (modified) (1 diff)
• upnp.c (modified) (1 diff)

branches/0.9x/libtransmission/natpmp.c

@@ -41 +41 @@
 #include "utils.h"
 
+#define PMP_MCAST_ADDR          "224.0.0.1"
 #define PMP_PORT                5351
 #define PMP_INITIAL_DELAY       250     /* ms, 1/4 second */
@@ -137 +138 @@
 
 tr_natpmp *
-tr_natpmpInit()
+tr_natpmpInit( void )
 {
     tr_natpmp * pmp;
@@ -674 +675 @@
 
 static int
-mcastsetup()
+mcastsetup( void )
 {
     int fd;

branches/0.9x/libtransmission/natpmp.h

@@ -37 +37 @@
 void        tr_natpmpClose( tr_natpmp * );
 
-#define PMP_MCAST_ADDR "224.0.0.1"
-
 #endif

branches/0.9x/libtransmission/net.c

@@ -158 +158 @@
     struct ip_mreq req;
 
-    fd = tr_netBindUDP( port );
+    fd = tr_netBindUDP( port, addr );
     if( 0 > fd )
     {
@@ -184 +184 @@
 
 static int
-tr_netBind( int port, int type )
+tr_netBind( int port, int type, const struct in_addr * addr )
 {
     int s;
@@ -212 +212 @@
     memset( &sock, 0, sizeof( sock ) );
     sock.sin_family      = AF_INET;
-
-    /* Leopard closes a SO_REUSEADDR + INADDR_ANY hole, so we can't
-     * use INADDR_ANY when binding for nat-pmp. For details, refer to
-     * http://www.uwsg.indiana.edu/hypermail/linux/kernel/9902.1/0828.html .
-     * This can probably be done cleaner, but since we're only using SOCK_DGRAM
-     * for nat-pmp, this quick fix should work. */
-    if ( SOCK_DGRAM == type )
-        sock.sin_addr.s_addr = inet_addr( PMP_MCAST_ADDR );
-    else
+    if( addr != NULL ) {
+        sock.sin_addr.s_addr = addr->s_addr;
+        tr_inf( "using the specified address\n" );
+    } else { 
         sock.sin_addr.s_addr = INADDR_ANY;
-
-    sock.sin_port        = htons( port );
+        tr_inf( "using INADDR_ANY\n" );
+    }
 
     if( bind( s, (struct sockaddr *) &sock,
@@ -239 +234 @@
 tr_netBindTCP( int port )
 {
-    return tr_netBind( port, SOCK_STREAM );
-}
-
-int
-tr_netBindUDP( int port )
-{
-    return tr_netBind( port, SOCK_DGRAM );
-}
-
+    return tr_netBind( port, SOCK_STREAM, NULL );
+}
+
+int
+tr_netBindUDP( int port, const struct in_addr * addr )
+{
+    return tr_netBind( port, SOCK_DGRAM, addr );
+}
 
 int

branches/0.9x/libtransmission/net.h

@@ -72 +72 @@
 int  tr_netMcastOpen( int port, const struct in_addr * addr );
 int  tr_netBindTCP  ( int port );
-int  tr_netBindUDP  ( int port );
+int  tr_netBindUDP  ( int port, const struct in_addr * addr );
 int  tr_netAccept   ( int s, struct in_addr *, tr_port_t * );
 void tr_netClose    ( int s );

branches/0.9x/libtransmission/upnp.c

@@ -374 +374 @@
     if( 0 > fd )
     {
-        fd = tr_netBindUDP( 0 );
+        struct in_addr addr;
+        addr.s_addr = inet_addr( SSDP_ADDR );
+        fd = tr_netBindUDP( 0, &addr );
         if( 0 > fd )
         {