Changeset 11653


Ignore:
Timestamp:
Jan 9, 2011, 9:48:33 PM (11 years ago)
Author:
jch
Message:

Implement tr_dhtInit and Uninit, use it in session.c.

Location:
trunk/libtransmission
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/libtransmission/session.c

    r11629 r11653  
    4444#include "stats.h"
    4545#include "torrent.h"
    46 #include "tr-dht.h"
     46#include "tr-udp.h"
    4747#include "tr-lpd.h"
    4848#include "trevent.h"
     
    665665    tr_sessionSet( session, &settings );
    666666
    667     if( session->isDHTEnabled )
    668         tr_dhtInit( session, &session->public_ipv4->addr );
     667    tr_udpInit( session, &session->public_ipv4->addr );
    669668
    670669    if( session->isLPDEnabled )
     
    16871686        tr_lpdUninit( session );
    16881687
    1689     if( session->isDHTEnabled )
    1690         tr_dhtUninit( session );
     1688    tr_udpUninit( session );
    16911689
    16921690    event_free( session->saveTimer );
     
    19031901    assert( tr_isSession( session ) );
    19041902
    1905     if( session->isDHTEnabled )
    1906         tr_dhtUninit( session );
    1907 
     1903    tr_udpUninit( session );
    19081904    session->isDHTEnabled = !session->isDHTEnabled;
    1909 
    1910     if( session->isDHTEnabled )
    1911         tr_dhtInit( session, &session->public_ipv4->addr );
     1905    tr_udpInit( session, &session->public_ipv4->addr );
    19121906}
    19131907
  • trunk/libtransmission/tr-udp.c

    r11651 r11653  
     1/*
     2Copyright (c) 2010 by Juliusz Chroboczek
     3
     4Permission is hereby granted, free of charge, to any person obtaining a copy
     5of this software and associated documentation files (the "Software"), to deal
     6in the Software without restriction, including without limitation the rights
     7to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
     8copies of the Software, and to permit persons to whom the Software is
     9furnished to do so, subject to the following conditions:
     10
     11The above copyright notice and this permission notice shall be included in
     12all copies or substantial portions of the Software.
     13
     14THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
     15IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
     16FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
     17AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
     18LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     19OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
     20THE SOFTWARE.
     21
     22*/
     23
     24#include "transmission.h"
     25#include "net.h"
     26#include "session.h"
     27#include "tr-dht.h"
    128#include "tr-udp.h"
    229
    3 static void dummy (void) {}
     30
     31void
     32tr_udpInit(tr_session *ss, const tr_address * addr)
     33{
     34    if( ss->isDHTEnabled )
     35        tr_dhtInit(ss, addr);
     36}
     37
     38void
     39tr_udpUninit(tr_session *ss)
     40{
     41    return tr_dhtUninit(ss);
     42}
  • trunk/libtransmission/tr-udp.h

    r11651 r11653  
     1/*
     2Copyright (c) 2010 by Juliusz Chroboczek
     3
     4Permission is hereby granted, free of charge, to any person obtaining a copy
     5of this software and associated documentation files (the "Software"), to deal
     6in the Software without restriction, including without limitation the rights
     7to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
     8copies of the Software, and to permit persons to whom the Software is
     9furnished to do so, subject to the following conditions:
     10
     11The above copyright notice and this permission notice shall be included in
     12all copies or substantial portions of the Software.
     13
     14THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
     15IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
     16FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
     17AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
     18LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     19OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
     20THE SOFTWARE.
     21
     22*/
     23
     24#ifndef __TRANSMISSION__
     25 #error only libtransmission should #include this header.
     26#endif
     27
     28void tr_udpInit( tr_session *, const tr_address *);
     29void tr_udpUninit( tr_session * );
     30
Note: See TracChangeset for help on using the changeset viewer.