Changeset 1631

Timestamp:

Apr 1, 2007, 7:35:28 AM (16 years ago)

Author:

joshe

Message:

Add message type for adding torrent with individual settings.
Add message types for disabling pex.

Location:

branches/daemon/daemon

Files:

• client.c (modified) (2 diffs)
• ipc.c (modified) (3 diffs)
• ipc.h (modified) (3 diffs)
• ipcproto.txt (modified) (8 diffs)
• remote.c (modified) (1 diff)
• server.c (modified) (9 diffs)
• torrents.c (modified) (24 diffs)
• torrents.h (modified) (2 diffs)

branches/daemon/daemon/client.c

@@ -331 +331 @@
     struct req * req;
 
-    req = addreq( IPC_MSG_ADDFILES, -1, NULL );
+    req = addreq( IPC_MSG_ADDMANYFILES, -1, NULL );
     if( NULL == req )
     {
@@ -696 +696 @@
                 buf = ipc_mkempty( &con->ipc, &buflen, req->id, req->tag );
                 break;
-            case IPC_MSG_ADDFILES:
+            case IPC_MSG_ADDMANYFILES:
                 buf = ipc_mkstrlist( &con->ipc, &buflen, req->id, -1,
                                      req->strs );

branches/daemon/daemon/ipc.c

@@ -78 +78 @@
 static struct msg gl_msgs[] =
 {
-    { "addfiles",            1, IPC_MSG_ADDFILES,     RB_ENTRY_INITIALIZER() },
+    { "addfiles",            1, IPC_MSG_ADDMANYFILES, RB_ENTRY_INITIALIZER() },
+    { "addfile-detailed",    2, IPC_MSG_ADDONEFILE,   RB_ENTRY_INITIALIZER() },
     { "automap",             2, IPC_MSG_AUTOMAP,      RB_ENTRY_INITIALIZER() },
     { "autostart",           2, IPC_MSG_AUTOSTART,    RB_ENTRY_INITIALIZER() },
@@ -90 +91 @@
     { "get-info",            2, IPC_MSG_GETINFO,      RB_ENTRY_INITIALIZER() },
     { "get-info-all",        2, IPC_MSG_GETINFOALL,   RB_ENTRY_INITIALIZER() },
+    { "get-pex",             2, IPC_MSG_GETPEX,       RB_ENTRY_INITIALIZER() },
     { "get-port",            2, IPC_MSG_GETPORT,      RB_ENTRY_INITIALIZER() },
     { "get-status",          2, IPC_MSG_GETSTAT,      RB_ENTRY_INITIALIZER() },
@@ -99 +101 @@
     { "noop",                2, IPC_MSG_NOOP,         RB_ENTRY_INITIALIZER() },
     { "not-supported",       2, IPC_MSG_NOTSUP,       RB_ENTRY_INITIALIZER() },
+    { "pex",                 2, IPC_MSG_PORT,         RB_ENTRY_INITIALIZER() },
     { "port",                2, IPC_MSG_PORT,         RB_ENTRY_INITIALIZER() },
     { "quit",                1, IPC_MSG_QUIT,         RB_ENTRY_INITIALIZER() },

branches/daemon/daemon/ipc.h

@@ -38 +38 @@
 enum ipc_msg
 {
-    IPC_MSG_ADDFILES = 0,
+    IPC_MSG_ADDMANYFILES = 0,
+    IPC_MSG_ADDONEFILE,
     IPC_MSG_AUTOMAP,
     IPC_MSG_AUTOSTART,
@@ -50 +51 @@
     IPC_MSG_GETINFO,
     IPC_MSG_GETINFOALL,
+    IPC_MSG_GETPEX,
     IPC_MSG_GETPORT,
     IPC_MSG_GETSTAT,
@@ -59 +61 @@
     IPC_MSG_NOOP,
     IPC_MSG_NOTSUP,
+    IPC_MSG_PEX,
     IPC_MSG_PORT,
     IPC_MSG_QUIT,

branches/daemon/daemon/ipcproto.txt

@@ -83 +83 @@
 understand.
 
+If a reference to a boolean is seen, it should be taken to mean an
+integer with a value of 0 representing false, 1 representing true, and
+any other value undefined.
+
+Individual torrents are identified by a unique integer. This integer
+is only valid for the current connection and may be invalid or refer
+to another torrent in a future connection. If a torrent is closed it's
+ID will never be reused to refer to another torrent for at least the
+duration of the connection. Negative integers or 0 are not valid IDs.
+
 A list of keys and the format of their values follows. Also listed is
 the minimum protocol version that the key may be used with.
@@ -91 +101 @@
 Format:  list of strings
 Example: 8:addfilesl21:/torrents/foo.torrent20:/home/me/bar.torrente
-Details: Each string is the absolute path to a torrent file for the
-         server to add. Note that whether or not the torrent file is
-         copied (allowing the original to be moved or deleted safely)
-         is implementation dependent and may not currently be known or
-         changed with this protocol.
+Details: Each string is the absolute path to a torrent metainfo file
+         for the server to add. Note that whether or not the torrent
+         metainfo file is copied (allowing the original to be moved or
+         deleted safely) is implementation dependent and may not
+         currently be known or changed with this protocol.
+
+Key:     "addfile-detailed"
+Version: 2
+Format:  dict
+Example: 16:addfile-detailedde
+Details: Dictionary containing information about a torrent for the
+         server to add. Valid keys include:
+           "file"       string, filename of torrent metainfo file
+           "data"       string, contents of a torrent metainfo file
+           "directory"  string, directory for data files for the torrent
+           "autostart"  boolean, start the torrent automatically
+         Either "file" or "data" is required, but both are not allowed.
 
 Key:     "automap"
 Version: 2
-Format:  int, 0 or 1
+Format:  boolean
 Example: 7:automapi1e
 Details: Enable (1) or disable (0) automatic port mapping on the
@@ -107 +129 @@
 Key:     "autostart"
 Version: 2
-Format:  int, 0 or 1
+Format:  boolean
 Example: 9:autostarti0e
 Details: Enable (1) or disable (0) automatic starting of new torrents
@@ -173 +195 @@
 Details: Same as "getinfo" message with all torrent IDs specified.
 
+Key:     "get-pex"
+Version: 2
+Format:  value is ignored
+Example: 7:get-pex0:
+Details: Requests that a "pex" message be sent back.
+
 Key:     "get-port"
 Version: 2
@@ -234 +262 @@
 Details: Sent in response to a tagged message to indicated that the
          message was not supported.
+
+Key:     "pex"
+Version: 2
+Format:  boolean
+Example: 3:pexi0e
+Details: Enables or disables peer exchange.
 
 Key:     "port"
@@ -315 +349 @@
          Negative values are interpreted as no limit.
 
-Key:     "version"
-Version: 1
-Format:  dict containing int "min" and "max"
-Example: 7:versiond3:mini1e3:maxi2ee
-Details: Described above.
-
-
-Individual torrents are identified by a unique integer. This integer
-is only valid for the current connection and may be invalid or refer
-to another torrent in a future connection. If a torrent is closed it's
-ID will never be reused to refer to another torrent for at least the
-duration of the connection. Negative integers or 0 are not valid IDs.
-
 
 Info types for "get-info" and "info" messages. The only type for which
@@ -336 +357 @@
 "name"     string, torrent name
 "path"     string, path to .torrent file
-"saved"    integer, 1 if a copy of this torrent was saved, 0 otherwise
-"private"  integer, 1 if the torrent is private, 0 otherwise
+"saved"    boolean, true if a copy of this torrent was saved
+"private"  boolean, true if the torrent is private
 "trackers" a list of lists of dictionaries containing tracker info:
              "address"  string, hostname or ip address of tracker
@@ -378 +399 @@
 "peers-total"       integer, total connected peers
 "peers-uploading"   integer, peers uploading to us
-"running"           integer, 0 if torrent is stopped or stopping, 1 otherwise
+"running"           boolean, false if torrent is stopped or stopping
 "state"             string, one of the following:
                       "checking"    performing hash check on file data

branches/daemon/daemon/remote.c

@@ -66 +66 @@
     struct strlist    remove;
     char              dir[MAXPATHLEN];
+    int               pex;
 };
 

branches/daemon/daemon/server.c

@@ -66 +66 @@
 static void defmsg   ( enum ipc_msg, benc_val_t *, int64_t, void * );
 static void noopmsg  ( enum ipc_msg, benc_val_t *, int64_t, void * );
-static void addmsg   ( enum ipc_msg, benc_val_t *, int64_t, void * );
+static void addmsg1  ( enum ipc_msg, benc_val_t *, int64_t, void * );
+static void addmsg2  ( enum ipc_msg, benc_val_t *, int64_t, void * );
 static void quitmsg  ( enum ipc_msg, benc_val_t *, int64_t, void * );
 static void intmsg   ( enum ipc_msg, benc_val_t *, int64_t, void * );
@@ -98 +99 @@
     }
 
-    if( 0 > ipc_addmsg( gl_tree, IPC_MSG_ADDFILES,     addmsg  ) ||
+    if( 0 > ipc_addmsg( gl_tree, IPC_MSG_ADDMANYFILES, addmsg1 ) ||
+        0 > ipc_addmsg( gl_tree, IPC_MSG_ADDONEFILE,   addmsg2 ) ||
         0 > ipc_addmsg( gl_tree, IPC_MSG_AUTOMAP,      intmsg  ) ||
         0 > ipc_addmsg( gl_tree, IPC_MSG_AUTOSTART,    intmsg  ) ||
@@ -109 +111 @@
         0 > ipc_addmsg( gl_tree, IPC_MSG_GETINFO,      infomsg ) ||
         0 > ipc_addmsg( gl_tree, IPC_MSG_GETINFOALL,   infomsg ) ||
+        0 > ipc_addmsg( gl_tree, IPC_MSG_GETPEX,       prefmsg ) ||
         0 > ipc_addmsg( gl_tree, IPC_MSG_GETPORT,      prefmsg ) ||
         0 > ipc_addmsg( gl_tree, IPC_MSG_GETSTAT,      infomsg ) ||
@@ -116 +119 @@
         0 > ipc_addmsg( gl_tree, IPC_MSG_LOOKUP,       lookmsg ) ||
         0 > ipc_addmsg( gl_tree, IPC_MSG_NOOP,         noopmsg ) ||
+        0 > ipc_addmsg( gl_tree, IPC_MSG_PEX,          intmsg  ) ||
         0 > ipc_addmsg( gl_tree, IPC_MSG_PORT,         intmsg  ) ||
         0 > ipc_addmsg( gl_tree, IPC_MSG_QUIT,         quitmsg ) ||
@@ -390 +394 @@
 
 void
-addmsg( enum ipc_msg id UNUSED, benc_val_t * val, int64_t tag, void * arg )
-{
-    struct client * client = arg;
-    benc_val_t    * file;
-    int64_t       * added, tor;
-    int             ii;
-    size_t          count, buflen;
+addmsg1( enum ipc_msg id UNUSED, benc_val_t * val, int64_t tag, void * arg )
+{
+    struct client * client = arg;
+    benc_val_t      pk, * added, * file;
+    int             ii, tor;
+    size_t          buflen;
     uint8_t       * buf;
+    tr_info_t     * inf;
 
     if( NULL == val || TYPE_LIST != val->type )
@@ -405 +409 @@
     }
 
-    if( 0 < tag )
-    {
-        added = calloc( val->val.l.count, sizeof( added[0] ) );
-        if( NULL == added )
-        {
-            mallocmsg( val->val.l.count * sizeof( added[0] ) );
-            byebye( client->ev, EVBUFFER_EOF, NULL );
-            return;
-        }
-        count = 0;
+    if( 0 > ipc_initinfo( &client->ipc, IPC_MSG_INFO, tag, &pk, &added ) )
+    {
+        errnomsg( "failed to build message" );
+        byebye( client->ev, EVBUFFER_EOF, NULL );
+        return;
     }
 
@@ -425 +424 @@
         }
         /* XXX need to somehow inform client of skipped or failed files */
-        tor = torrent_add( file->val.s.s );
-        if( 0 < tag )
-        {
-            added[count] = tor;
-            count++;
-        }
-    }
-
-    if( 0 < tag )
-    {
-        buf = ipc_mkints( &client->ipc, &buflen, tag, IPC_MSG_INFO,
-                          count, added );
+        tor = torrent_add( file->val.s.s, NULL, -1 );
+        if( TORRENT_ID_VALID( tor ) )
+        {
+            inf = torrent_info( tor );
+            if( 0 > ipc_addinfo( added, tor, inf, 0 ) )
+            {
+                errnomsg( "failed to build message" );
+                tr_bencFree( &pk );
+                byebye( client->ev, EVBUFFER_EOF, NULL );
+                return;
+            }
+        }
+    }
+
+    buf = ipc_mkinfo( &pk, &buflen );
+    tr_bencFree( &pk );
+    queuemsg( client, buf, buflen );
+    free( buf );
+}
+
+void
+addmsg2( enum ipc_msg id UNUSED, benc_val_t * dict, int64_t tag, void * arg )
+{
+    struct client * client = arg;
+    benc_val_t    * val, pk;
+    int             tor, start;
+    size_t          buflen;
+    uint8_t       * buf;
+    const char    * dir;
+    tr_info_t     * inf;
+
+    if( NULL == dict || TYPE_DICT != dict->type )
+    {
+        msgresp( client, tag, IPC_MSG_NOTSUP );
+        return;
+    }
+
+    val   = tr_bencDictFind( dict, "directory" );
+    dir   = ( NULL == val || TYPE_STR != val->type ? NULL : val->val.s.s );
+    val   = tr_bencDictFind( dict, "autostart" );
+    start = ( NULL == val || TYPE_INT != val->type ? -1 :
+              ( val->val.i ? 1 : 0 ) );
+    val   = tr_bencDictFind( dict, "data" );
+    if( NULL != val && TYPE_STR == val->type )
+    {
+        /* XXX not quite yet */
+        msgresp( client, tag, IPC_MSG_NOTSUP );
+        return;
+    }
+    else
+    {
+        val = tr_bencDictFind( dict, "file" );
+        if( NULL == val || TYPE_STR != val->type )
+        {
+            msgresp( client, tag, IPC_MSG_NOTSUP );
+            return;
+        }
+        /* XXX detect duplicates and return a message indicating so */
+        tor = torrent_add( val->val.s.s, dir, start );
+    }
+
+    if( TORRENT_ID_VALID( tor ) )
+    {
+        if( 0 > ipc_initinfo( &client->ipc, IPC_MSG_INFO, tag, &pk, &val ) )
+        {
+            errnomsg( "failed to build message" );
+            byebye( client->ev, EVBUFFER_EOF, NULL );
+            return;
+        }
+        inf = torrent_info( tor );
+        if( 0 > ipc_addinfo( val, tor, inf, 0 ) )
+        {
+            errnomsg( "failed to build message" );
+            tr_bencFree( &pk );
+            byebye( client->ev, EVBUFFER_EOF, NULL );
+            return;
+        }
+        buf = ipc_mkinfo( &pk, &buflen );
+        tr_bencFree( &pk );
         queuemsg( client, buf, buflen );
-        free( added );
         free( buf );
+    }
+    else
+    {
+        msgresp( client, tag, IPC_MSG_FAIL );
     }
 }
@@ -482 +551 @@
         case IPC_MSG_DOWNLIMIT:
             torrent_set_downlimit( num );
+            break;
+        case IPC_MSG_PEX:
+            torrent_set_pex( num ? 1 : 0 );
             break;
         case IPC_MSG_PORT:
@@ -803 +875 @@
                              torrent_get_downlimit() );
             break;
+        case IPC_MSG_GETPEX:
+            buf = ipc_mkint( &client->ipc, &buflen, IPC_MSG_PEX, tag,
+                             torrent_get_pex() );
+            break;
         case IPC_MSG_GETPORT:
             buf = ipc_mkint( &client->ipc, &buflen, IPC_MSG_PORT, tag,

branches/daemon/daemon/torrents.c

@@ -57 +57 @@
     uint8_t         hash[SHA_DIGEST_LENGTH];
     tr_torrent_t  * tor;
+    int             pexset;
+    int             pex;
     RB_ENTRY( tor ) idlinks;
     RB_ENTRY( tor ) hashlinks;
@@ -64 +66 @@
 RB_HEAD( hashtree, tor );
 
-static struct tor * opentorrent ( const char *, const char * );
+static struct tor * opentorrent ( const char *, const char *, const char * );
 static void         closetorrent( struct tor *, int );
 static void         starttimer  ( int );
@@ -76 +78 @@
 static struct tor * idlookup    ( int, int );
 static struct tor * hashlookup  ( const uint8_t *, int );
+static struct tor * iterate     ( struct tor * );
 
 static struct event_base * gl_base      = NULL;
@@ -89 +92 @@
 
 static int                 gl_autostart = 1;
+static int                 gl_pex       = 1;
 static int                 gl_port      = TR_DEFAULT_PORT;
 static int                 gl_mapping   = 0;
@@ -113 +117 @@
 
     loadstate();
-
-    if( TR_DEFAULT_PORT != gl_port )
-    {
-        tr_setBindPort( gl_handle, gl_port );
-    }
-    tr_natTraversalEnable( gl_handle, gl_mapping );
-    tr_setGlobalUploadLimit( gl_handle, gl_uplimit );
-    tr_setGlobalDownloadLimit( gl_handle, gl_downlimit );
-}
-
-int
-torrent_add( const char * path )
+}
+
+int
+torrent_add( const char * path, const char * dir, int autostart )
 {
     struct tor * tor;
@@ -131 +127 @@
     assert( !gl_exiting );
 
-    tor = opentorrent( path, NULL );
+    tor = opentorrent( path, NULL, dir );
     if( NULL == tor )
     {
@@ -137 +133 @@
     }
 
-    if( gl_autostart )
+    if( 0 > autostart )
+    {
+        autostart = gl_autostart;
+    }
+    if( autostart )
     {
         tr_torrentStart( tor->tor );
@@ -284 +284 @@
     assert( !gl_exiting );
 
-    if( NULL == tor )
-    {
-        tor = RB_MIN( tortree, &gl_tree );
-    }
-    else
-    {
-        tor = RB_NEXT( tortree, &gl_tree, tor );
-    }
-
-    while( NULL != tor && tor->deleting )
-    {
-        tor = RB_NEXT( tortree, &gl_tree, tor );
-    }
+    tor = iterate( tor );
 
     if( NULL != tor )
@@ -360 +348 @@
 
 void
+torrent_set_pex( int pex )
+{
+    struct tor * tor;
+
+    assert( NULL != gl_handle );
+    assert( !gl_exiting );
+
+    if( pex == gl_pex )
+    {
+        return;
+    }
+    gl_pex = pex;
+
+    for( tor = iterate( NULL ); NULL != tor; tor = iterate( tor ) )
+    {
+        if( tor->pexset )
+        {
+            continue;
+        }
+        tr_torrentDisablePex( tor->tor, !gl_pex );
+    }
+
+    savestate();
+}
+
+int
+torrent_get_pex( void )
+{
+    return gl_pex;
+}
+
+void
 torrent_enable_port_mapping( int automap )
 {
@@ -424 +444 @@
 
 struct tor *
-opentorrent( const char * path, const char * hash )
+opentorrent( const char * path, const char * hash, const char * dir )
 {
     struct tor * tor, * found;
@@ -432 +452 @@
     assert( NULL == path || NULL == hash );
     assert( NULL != path || NULL != hash );
+
+    /* XXX should probably wrap around back to 1 and avoid duplicates */
+    if( INT_MAX == gl_lastid )
+    {
+        errmsg( "Congratulations, you're the %ith torrent! Your prize the "
+                "inability to load any more torrents, enjoy!", INT_MAX );
+        return NULL;
+    }
 
     tor = calloc( 1, sizeof *tor );
@@ -473 +501 @@
         return found;
     }
-    tor->id       = ++gl_lastid;
+    gl_lastid++;
+    tor->id       = gl_lastid;
     tor->deleting = 0;
 
@@ -480 +509 @@
     memcpy( tor->hash, inf->hash, sizeof tor->hash );
 
-    tr_torrentSetFolder( tor->tor, gl_dir );
+    tr_torrentSetFolder( tor->tor, ( NULL == dir ? gl_dir : dir ) );
+
+    if( TR_FLAG_PRIVATE & inf->flags )
+    {
+        tor->pexset = 1;
+        tor->pex    = 0;
+    }
+    else
+    {
+        tr_torrentDisablePex( tor->tor, !gl_pex );
+    }
 
     found = RB_INSERT( tortree, &gl_tree, tor );
@@ -600 +639 @@
     uint8_t   *  buf;
     size_t       len;
-    benc_val_t   top, * num, * str, * list, * dict, * hash, * pause, * dir;
+    benc_val_t   top, * num, * str, * list, * dict;
     int          ii;
     struct tor * tor;
+    const char * dir;
 
     buf = readfile( gl_state, &len );
@@ -621 +661 @@
     if( NULL != num && TYPE_INT == num->type )
     {
-        gl_autostart = num->val.i;
-    }
+        gl_autostart = ( num->val.i ? 1 : 0 );
+    }
+
     num = tr_bencDictFind( &top, "port" );
     if( NULL != num && TYPE_INT == num->type &&
@@ -629 +670 @@
         gl_port = num->val.i;
     }
+    tr_setBindPort( gl_handle, gl_port );
+
+    num = tr_bencDictFind( &top, "default-pex" );
+    if( NULL != num && TYPE_INT == num->type )
+    {
+        gl_pex = ( num->val.i ? 1 : 0 );
+    }
+
     num = tr_bencDictFind( &top, "port-mapping" );
     if( NULL != num && TYPE_INT == num->type )
     {
-        gl_mapping = num->val.i;
-    }
+        gl_mapping = ( num->val.i ? 1 : 0 );
+    }
+    tr_natTraversalEnable( gl_handle, gl_mapping );
+
     num = tr_bencDictFind( &top, "upload-limit" );
     if( NULL != num && TYPE_INT == num->type )
@@ -639 +690 @@
         gl_uplimit = num->val.i;
     }
+    tr_setGlobalUploadLimit( gl_handle, gl_uplimit );
+
     num = tr_bencDictFind( &top, "download-limit" );
     if( NULL != num && TYPE_INT == num->type )
@@ -644 +697 @@
         gl_downlimit = num->val.i;
     }
+    tr_setGlobalDownloadLimit( gl_handle, gl_downlimit );
+
     str = tr_bencDictFind( &top, "default-directory" );
     if( NULL != str && TYPE_STR == str->type )
@@ -651 +706 @@
 
     list = tr_bencDictFind( &top, "torrents" );
-    if( NULL != list && TYPE_LIST == list->type )
-    {
-        for( ii = 0; ii < list->val.l.count; ii++ )
-        {
-            dict = &list->val.l.vals[ii];
-            if( TYPE_DICT != dict->type )
-            {
-                continue;
-            }
-            hash = tr_bencDictFind( dict, "hash" );
-            if( NULL == hash || TYPE_STR != hash->type ||
-                2 * SHA_DIGEST_LENGTH != hash->val.s.i )
-            {
-                continue;
-            }
-            tor = opentorrent( NULL, hash->val.s.s );
-            if( NULL == tor )
-            {
-                continue;
-            }
-            dir = tr_bencDictFind( dict, "directory" );
-            if( NULL != dir && TYPE_STR == dir->type )
-            {
-                tr_torrentSetFolder( tor->tor, dir->val.s.s );
-            }
-            pause = tr_bencDictFind( dict, "paused" );
-            if( NULL != pause && TYPE_INT == pause->type && !pause->val.i )
-            {
-                tr_torrentStart( tor->tor );
-            }
+    if( NULL == list || TYPE_LIST != list->type )
+    {
+        return 0;
+    }
+
+    for( ii = 0; ii < list->val.l.count; ii++ )
+    {
+        dict = &list->val.l.vals[ii];
+        if( TYPE_DICT != dict->type )
+        {
+            continue;
+        }
+
+        str = tr_bencDictFind( dict, "directory" );
+        dir = ( NULL != str && TYPE_STR == str->type ? str->val.s.s : NULL );
+
+        str = tr_bencDictFind( dict, "hash" );
+        if( NULL == str || TYPE_STR != str->type ||
+            2 * SHA_DIGEST_LENGTH != str->val.s.i )
+        {
+            continue;
+        }
+
+        tor = opentorrent( NULL, str->val.s.s, dir );
+        if( NULL == tor )
+        {
+            continue;
+        }
+
+        num = tr_bencDictFind( dict, "pex" );
+        if( NULL != num && TYPE_INT == num->type )
+        {
+            tor->pexset = 1;
+            tor->pex = ( num->val.i ? 1 : 0 );
+        }
+        tr_torrentDisablePex( tor->tor, !( tor->pexset ? tor->pex : gl_pex ) );
+
+        num = tr_bencDictFind( dict, "paused" );
+        if( NULL != num && TYPE_INT == num->type && !num->val.i )
+        {
+            tr_torrentStart( tor->tor );
         }
     }
@@ -695 +761 @@
     tr_stat_t  * st;
     uint8_t    * buf;
-    int          len;
+    int          len, pexset;
 
     tr_bencInit( &top, TYPE_DICT );
@@ -707 +773 @@
     tr_bencInitInt( tr_bencDictAdd( &top, "autostart" ),      gl_autostart );
     tr_bencInitInt( tr_bencDictAdd( &top, "port" ),           gl_port );
+    tr_bencInitInt( tr_bencDictAdd( &top, "default-pex" ),    gl_pex );
     tr_bencInitInt( tr_bencDictAdd( &top, "port-mapping" ),   gl_mapping );
     tr_bencInitInt( tr_bencDictAdd( &top, "upload-limit" ),   gl_uplimit );
@@ -737 +804 @@
         assert( NULL != tor );
         tr_bencInit( tor, TYPE_DICT );
-        if( tr_bencDictReserve( tor, 3 ) )
+        inf    = tr_torrentInfo( ii->tor );
+        st     = tr_torrentStat( ii->tor );
+        pexset = ( ii->pexset && !( TR_FLAG_PRIVATE & inf->flags ) );
+        if( tr_bencDictReserve( tor, ( pexset ? 4 : 3 ) ) )
         {
             goto nomem;
         }
-        inf = tr_torrentInfo( ii->tor );
-        st  = tr_torrentStat( ii->tor );
         tr_bencInitStr( tr_bencDictAdd( tor, "hash" ),
                         inf->hashString, 2 * SHA_DIGEST_LENGTH, 1 );
@@ -749 +817 @@
         tr_bencInitStr( tr_bencDictAdd( tor, "directory" ),
                         tr_torrentGetFolder( ii->tor ), -1, 1 );
+        if( pexset )
+        {
+            tr_bencInitInt( tr_bencDictAdd( tor, "pex" ), ii->pex );
+        }
     }
 
@@ -894 +966 @@
     return found;
 }
+
+struct tor *
+iterate( struct tor * tor )
+{
+    assert( NULL != gl_handle );
+    assert( !gl_exiting );
+
+    if( NULL == tor )
+    {
+        tor = RB_MIN( tortree, &gl_tree );
+    }
+    else
+    {
+        tor = RB_NEXT( tortree, &gl_tree, tor );
+    }
+
+    while( NULL != tor && tor->deleting )
+    {
+        tor = RB_NEXT( tortree, &gl_tree, tor );
+    }
+
+    return tor;
+}

branches/daemon/daemon/torrents.h

@@ -34 +34 @@
 
 void         torrent_init                ( struct event_base * );
-int          torrent_add                 ( const char * );
+int          torrent_add                 ( const char *, const char *, int );
 void         torrent_start               ( int );
 void         torrent_stop                ( int );
@@ -48 +48 @@
 void         torrent_set_port            ( int );
 int          torrent_get_port            ( void );
+void         torrent_set_pex             ( int );
+int          torrent_get_pex             ( void );
 void         torrent_enable_port_mapping ( int );
 int          torrent_get_port_mapping    ( void );