Changeset 1463 for trunk/libtransmission/natpmp.c

Timestamp:

Feb 6, 2007, 5:37:48 AM (16 years ago)

Author:

joshe

Message:

Remove natpmp and upnp locks and rely on the shared lock.

File:

• trunk/libtransmission/natpmp.c (modified) (12 diffs)

trunk/libtransmission/natpmp.c

@@ -83 +83 @@
     int                newport;
     int                mappedport;
-    tr_lock_t          lock;
     uint64_t           renew;
     tr_natpmp_req_t *  req;
@@ -150 +149 @@
     }
 
-    tr_lockInit( &pmp->lock );
-
     return pmp;
 }
@@ -158 +155 @@
 tr_natpmpStart( tr_natpmp_t * pmp )
 {
-    tr_lockLock( &pmp->lock );
-
     if( !pmp->active )
     {
@@ -169 +164 @@
         }
     }
-
-    tr_lockUnlock( &pmp->lock );
 }
 
@@ -176 +169 @@
 tr_natpmpStop( tr_natpmp_t * pmp )
 {
-    tr_lockLock( &pmp->lock );
-
     if( pmp->active )
     {
@@ -213 +204 @@
         }
     }
-
-    tr_lockUnlock( &pmp->lock );
 }
 
@@ -221 +210 @@
 {
     int ret;
-
-    tr_lockLock( &pmp->lock );
-
     
     if( !pmp->active )
@@ -260 +246 @@
     }
 
-    tr_lockUnlock( &pmp->lock );
-
     return ret;
 }
@@ -268 +252 @@
 tr_natpmpForwardPort( tr_natpmp_t * pmp, int port )
 {
-    tr_lockLock( &pmp->lock );
     tr_inf( "nat-pmp set port %i", port );
     pmp->newport = port;
-    tr_lockUnlock( &pmp->lock );
 }
 
@@ -281 +263 @@
     tr_natpmpPulse( pmp, NULL );
 
-    tr_lockLock( &pmp->lock );
     killreq( &pmp->req );
-    tr_lockClose( &pmp->lock );
     free( pmp );
 }
@@ -290 +270 @@
 tr_natpmpPulse( tr_natpmp_t * pmp, int * publicPort )
 {
-    tr_lockLock( &pmp->lock );
-
     if( 0 <= pmp->mcastfd )
     {
@@ -461 +439 @@
         *publicPort = -1;
     }
-
-    tr_lockUnlock( &pmp->lock );
 }