Changeset 6181

Timestamp:

Jun 13, 2008, 9:08:16 PM (15 years ago)

Author:

charles

Message:

#972: "Transmission fails to compile with Sun Studio due to funky C code" backported to 1.2x

Location:

branches/1.2x

Files:

• gtk/main.c (modified) (2 diffs)
• libtransmission/natpmp.c (modified) (2 diffs)
• libtransmission/torrent.c (modified) (1 diff)
• third-party/libnatpmp/README (modified) (1 diff)
• third-party/libnatpmp/natpmp.c (modified) (2 diffs)
• third-party/libnatpmp/natpmp.h (modified) (2 diffs)

branches/1.2x/gtk/main.c

@@ -619 +619 @@
 }
 
+#if 0
 /* since there are no buttons in the dialog, gtk tries to
  * select one of the labels, which looks ugly... so force
@@ -630 +631 @@
         gtk_container_foreach( GTK_CONTAINER(w), deselectLabels, NULL );
 }
+#endif
 
 static void

branches/1.2x/libtransmission/natpmp.c

@@ -127 +127 @@
         logVal( "readnatpmpresponseorretry", val );
         if( val >= 0 ) {
-            tr_ninf( getKey(), _( "Found public address \"%s\"" ), inet_ntoa( response.publicaddress.addr ) );
+            tr_ninf( getKey(), _( "Found public address \"%s\"" ), inet_ntoa( response.pnu.publicaddress.addr ) );
             nat->state = TR_NATPMP_IDLE;
         } else if( val != NATPMP_TRYAGAIN ) {
@@ -189 +189 @@
             nat->isMapped = 1;
             nat->renewTime = time( NULL ) + LIFETIME_SECS;
-            nat->port = resp.newportmapping.privateport;
+            nat->port = resp.pnu.newportmapping.privateport;
             tr_ninf( getKey(), _( "Port %d forwarded successfully" ), nat->port );
         } else if( val != NATPMP_TRYAGAIN ) {

branches/1.2x/libtransmission/torrent.c

@@ -843 +843 @@
 void tr_torrentAvailability( const tr_torrent * tor, int8_t * tab, int size )
 {
-    return tr_peerMgrTorrentAvailability( tor->handle->peerMgr,
-                                          tor->info.hash,
-                                          tab, size );
+    tr_peerMgrTorrentAvailability( tor->handle->peerMgr,
+                                   tor->info.hash,
+                                   tab, size );
 }
 

branches/1.2x/third-party/libnatpmp/README

@@ -1 +1 @@
 libnatpmp is written by Thomas Bernard.
 Its homepage is http://miniupnp.tuxfamily.org/libnatpmp.html
-This code is from the libnatpmp-20080428 snapshot
+This code is from the libnatpmp-20080529 snapshot
 

branches/1.2x/third-party/libnatpmp/natpmp.c

@@ -1 @@
-/* $Id: natpmp.c,v 1.6 2008/04/28 02:58:34 nanard Exp $ */
+/* $Id: natpmp.c,v 1.7 2008/05/29 08:06:01 nanard Exp $ */
 /* libnatpmp
  * Copyright (c) 2007-2008, Thomas BERNARD <miniupnp@free.fr>
@@ -204 +204 @@
                         if(buf[1] == 128)
                                 //response->publicaddress.addr = *((uint32_t *)(buf + 8));
-                                response->publicaddress.addr.s_addr = *((uint32_t *)(buf + 8));
+                                response->pnu.publicaddress.addr.s_addr = *((uint32_t *)(buf + 8));
                         else {
-                                response->newportmapping.privateport = ntohs(*((uint16_t *)(buf + 8)));
-                                response->newportmapping.mappedpublicport = ntohs(*((uint16_t *)(buf + 10)));
-                                response->newportmapping.lifetime = ntohl(*((uint32_t *)(buf + 12)));
+                                response->pnu.newportmapping.privateport = ntohs(*((uint16_t *)(buf + 8)));
+                                response->pnu.newportmapping.mappedpublicport = ntohs(*((uint16_t *)(buf + 10)));
+                                response->pnu.newportmapping.lifetime = ntohl(*((uint32_t *)(buf + 12)));
                         }
                         n = 0;

branches/1.2x/third-party/libnatpmp/natpmp.h

@@ -1 @@
-/* $Id: natpmp.h,v 1.8 2008/04/28 02:58:34 nanard Exp $ */
+/* $Id: natpmp.h,v 1.9 2008/05/29 08:06:01 nanard Exp $ */
 /* libnatpmp
  * Copyright (c) 2007-2008, Thomas BERNARD <miniupnp@free.fr>
@@ -53 +53 @@
                         uint32_t lifetime;
                 } newportmapping;
-        };
+        } pnu;
 } natpmpresp_t;