Changeset 2358


Ignore:
Timestamp:
Jul 15, 2007, 5:36:56 PM (15 years ago)
Author:
charles
Message:

fix the bugs outlined by cluthi81 in ticket #255.

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/cli/transmissioncli.c

    r2356 r2358  
    5656"  -n  --nat-traversal  Attempt NAT traversal using NAT-PMP or UPnP IGD\n"
    5757"  -p, --port <int>     Port we should listen on (default = %d)\n"
     58#if 0
    5859"  -s, --scrape         Print counts of seeders/leechers and exit\n"
     60#endif
    5961"  -u, --upload <int>   Maximum upload rate (-1 = no limit, default = 20)\n"
    6062"  -v, --verbose <int>  Verbose level (0 to 2, default = 0)\n";
     
    6264static int           showHelp      = 0;
    6365static int           showInfo      = 0;
     66#if 0
    6467static int           showScrape    = 0;
     68#endif
    6569static int           isPrivate     = 0;
    6670static int           verboseLevel  = 0;
     
    203207    }
    204208
     209#if 0
    205210    if( showScrape )
    206211    {
     
    219224        goto cleanup;
    220225    }
     226#endif
    221227
    222228    signal( SIGINT, sigHandler );
     
    355361                showInfo = 1;
    356362                break;
     363#if 0
    357364            case 's':
    358365                showScrape = 1;
    359366                break;
     367#endif
    360368            case 'r':
    361369                isPrivate = 1;
  • trunk/libtransmission/metainfo.c

    r2328 r2358  
    349349    if( 0 == jj )
    350350    {
     351        free( list );
    351352        return TR_EINVALID;
    352353    }
  • trunk/libtransmission/peeraz.h

    r2339 r2358  
    394394    /* find the supported message list */
    395395    sub = tr_bencDictFind( &val, "messages" );
    396     if( NULL == sub && TYPE_LIST != sub->type )
     396    if( !sub || sub->type != TYPE_LIST )
    397397    {
    398398        tr_bencFree( &val );
  • trunk/libtransmission/torrent.c

    r2356 r2358  
    435435***/
    436436
     437#if 0
    437438int tr_torrentScrape( tr_torrent_t * tor, int * s, int * l, int * d )
    438439{
    439440    return tr_trackerScrape( tor, s, l, d );
    440441}
     442#endif
    441443
    442444void tr_torrentSetFolder( tr_torrent_t * tor, const char * path )
  • trunk/libtransmission/tracker.c

    r2343 r2358  
    10081008
    10091009
     1010#if 0
    10101011/* Blocking version */
    10111012int tr_trackerScrape( tr_torrent_t * tor, int * s, int * l, int * d )
     
    10211022    if( NULL == tc->tcCur->tl_inf->scrape || tc->tcCur->tl_badscrape )
    10221023    {
     1024        tr_trackerClose( tc );
    10231025        return 1;
    10241026    }
     
    10571059    return ret;
    10581060}
     1061#endif
    10591062
    10601063static void killHttp( tr_http_t ** http )
  • trunk/libtransmission/tracker.h

    r2330 r2358  
    7373
    7474
     75#if 0
    7576/***********************************************************************
    7677 * tr_trackerScrape
     
    8081 **********************************************************************/
    8182int tr_trackerScrape( tr_torrent_t * tor, int * s, int * l, int * d );
     83#endif
    8284
    8385#endif
  • trunk/libtransmission/transmission.h

    r2356 r2358  
    358358void tr_torrentDisablePex( tr_torrent_t *, int disable );
    359359
    360 /***********************************************************************
    361  * tr_torrentScrape
    362  ***********************************************************************
    363  * Return torrent metainfo.
    364  **********************************************************************/
    365360const tr_info_t * tr_torrentInfo( const tr_torrent_t * );
    366361
     362#if 0
    367363/***********************************************************************
    368364 * tr_torrentScrape
     
    375371 **********************************************************************/
    376372int tr_torrentScrape( tr_torrent_t *, int * s, int * l, int * d );
     373#endif
    377374
    378375void   tr_torrentSetFolder( tr_torrent_t *, const char * );
  • trunk/libtransmission/upnp.c

    r2343 r2358  
    10031003            dev->soapretry = 0;
    10041004            *body = tr_httpParse( headers, hlen, NULL );
    1005             *len = ( NULL == body ? 0 : hlen - ( *body - headers ) );
     1005            *len = ( NULL == *body ? 0 : hlen - ( *body - headers ) );
    10061006            return code;
    10071007        case TR_NET_ERROR:
Note: See TracChangeset for help on using the changeset viewer.