Changeset 5766

Timestamp:

May 7, 2008, 11:57:23 AM (14 years ago)

Author:

charles

Message:

use sendpkmsg()

File:

• trunk/daemon/server.c (modified) (13 diffs)

trunk/daemon/server.c

@@ -39 +39 @@
 #include <libtransmission/bencode.h>
 #include <libtransmission/ipcparse.h>
+#include <libtransmission/utils.h> /* tr_free */
 
 #include "bsdtree.h"
@@ -388 +389 @@
 }
 
-int
+static int
 queuemsg( struct client * client, uint8_t * buf, size_t buflen )
 {
@@ -417 +418 @@
 }
 
+static int
+queuepkmsg( struct client * client, tr_benc * pk )
+{
+    size_t buflen;
+    uint8_t * buf = ipc_serialize( pk, &buflen );
+    int ret = queuemsg( client, buf, buflen );
+    tr_free( buf );
+    return ret;
+}
+
 int
 msgresp( struct client * client, int64_t tag, enum ipc_msg id )
@@ -460 +471 @@
     benc_val_t      pk, * added;
     int             ii, tor;
-    size_t          buflen;
-    uint8_t       * buf;
 
     if( !tr_bencIsList( val ) )
@@ -497 +506 @@
     }
 
-    buf = ipc_serialize( &pk, &buflen );
+    queuepkmsg( client, &pk );
     tr_bencFree( &pk );
-    queuemsg( client, buf, buflen );
-    free( buf );
 }
 
@@ -509 +516 @@
     benc_val_t    * val, pk;
     int             tor, start;
-    size_t          buflen;
-    uint8_t       * buf;
     const char    * dir;
 
@@ -558 +563 @@
             return;
         }
-        buf = ipc_serialize( &pk, &buflen );
+
+        queuepkmsg( client, &pk );
         tr_bencFree( &pk );
-        queuemsg( client, buf, buflen );
-        free( buf );
     }
     else
@@ -658 +662 @@
 {
     struct client * client = arg;
-    uint8_t       * buf;
-    size_t          buflen;
     benc_val_t      pk, * pkinf, * typelist, * idlist, * idval;
     int             all, types, ii, tor;
@@ -755 +757 @@
     }
 
-    /* generate packet data and send it */
-    buf = ipc_serialize( &pk, &buflen );
+    queuepkmsg( client, &pk );
     tr_bencFree( &pk );
-    queuemsg( client, buf, buflen );
-    free( buf );
 }
 
@@ -854 +853 @@
 {
     struct client * client = arg;
-    uint8_t       * buf;
-    size_t          buflen;
     int             ii;
     benc_val_t    * hash, pk, * pkinf;
@@ -897 +894 @@
     }
 
-    buf = ipc_serialize( &pk, &buflen );
+    queuepkmsg( client, &pk );
     tr_bencFree( &pk );
-    queuemsg( client, buf, buflen );
-    free( buf );
 }
 
@@ -963 +958 @@
 {
     struct client  * client = arg;
-    uint8_t        * buf;
-    size_t           buflen;
     int              ii;
     benc_val_t       pk, *pkval;
@@ -1009 +1002 @@
     }
 
-    buf = ipc_serialize( &pk, &buflen );
+    queuepkmsg( client, &pk );
     tr_bencFree( &pk );
-    queuemsg( client, buf, buflen );
-    free( buf );
-}
+}