Changeset 2038

Timestamp:

Jun 10, 2007, 10:56:18 PM (15 years ago)

Author:

joshe

Message:

Return bad-format message when appropriate.
Fix supported message to be more accurate.

Location:

trunk

Files:

• daemon/server.c (modified) (15 diffs)
• libtransmission/ipcparse.c (modified) (1 diff)
• libtransmission/ipcparse.h (modified) (1 diff)

trunk/daemon/server.c

@@ -63 +63 @@
 static void doread   ( struct bufferevent *, void * );
 static int  queuemsg ( struct client *, uint8_t *, size_t );
-static void msgresp  ( struct client *, int64_t, enum ipc_msg );
+static int  msgresp  ( struct client *, int64_t, enum ipc_msg );
 static void defmsg   ( enum ipc_msg, benc_val_t *, int64_t, void * );
 static void noopmsg  ( enum ipc_msg, benc_val_t *, int64_t, void * );
@@ -389 +389 @@
 }
 
-void
+int
 msgresp( struct client * client, int64_t tag, enum ipc_msg id )
 {
     uint8_t * buf;
     size_t    buflen;
+    int       ret;
 
     if( 0 >= tag )
     {
-        return;
+        return 0;
     }
 
     buf = ipc_mkempty( &client->ipc, &buflen, id, tag );
-    queuemsg( client, buf, buflen );
+    ret = queuemsg( client, buf, buflen );
     free( buf );
+
+    return ret;
 }
 
@@ -435 +438 @@
     if( NULL == val || TYPE_LIST != val->type )
     {
-        msgresp( client, tag, IPC_MSG_NOTSUP );
+        msgresp( client, tag, IPC_MSG_BAD );
         return;
     }
@@ -488 +491 @@
     if( NULL == dict || TYPE_DICT != dict->type )
     {
-        msgresp( client, tag, IPC_MSG_NOTSUP );
+        msgresp( client, tag, IPC_MSG_BAD );
         return;
     }
@@ -509 +512 @@
         if( NULL == val || TYPE_STR != val->type )
         {
-            msgresp( client, tag, IPC_MSG_NOTSUP );
+            msgresp( client, tag, IPC_MSG_BAD );
             return;
         }
@@ -568 +571 @@
     if( NULL == val || TYPE_INT != val->type )
     {
-        msgresp( client, tag, IPC_MSG_NOTSUP );
+        msgresp( client, tag, IPC_MSG_BAD );
         return;
     }
@@ -608 +611 @@
     if( NULL == val || TYPE_STR != val->type )
     {
-        msgresp( client, tag, IPC_MSG_NOTSUP );
+        msgresp( client, tag, IPC_MSG_BAD );
         return;
     }
@@ -673 +676 @@
         if( NULL == val || TYPE_LIST != val->type )
         {
-            msgresp( client, tag, IPC_MSG_NOTSUP );
+            msgresp( client, tag, IPC_MSG_BAD );
             tr_bencFree( &pk );
             return;
@@ -695 +698 @@
         if( NULL == val || TYPE_DICT != val->type )
         {
-            msgresp( client, tag, IPC_MSG_NOTSUP );
+            msgresp( client, tag, IPC_MSG_BAD );
             tr_bencFree( &pk );
             return;
@@ -704 +707 @@
             NULL == idlist   || TYPE_LIST != idlist->type )
         {
-            msgresp( client, tag, IPC_MSG_NOTSUP );
+            msgresp( client, tag, IPC_MSG_BAD );
             tr_bencFree( &pk );
             return;
@@ -814 +817 @@
         if( NULL == val || TYPE_LIST != val->type )
         {
-            msgresp( client, tag, IPC_MSG_NOTSUP );
+            msgresp( client, tag, IPC_MSG_BAD );
             return;
         }
@@ -844 +847 @@
     if( NULL == val || TYPE_LIST != val->type )
     {
-        msgresp( client, tag, IPC_MSG_NOTSUP );
+        msgresp( client, tag, IPC_MSG_BAD );
         return;
     }
@@ -863 +866 @@
         {
             tr_bencFree( &pk );
-            msgresp( client, tag, IPC_MSG_NOTSUP );
+            msgresp( client, tag, IPC_MSG_BAD );
             return;
         }
@@ -946 +949 @@
     if( NULL == val || TYPE_LIST != val->type )
     {
-        msgresp( client, tag, IPC_MSG_NOTSUP );
+        msgresp( client, tag, IPC_MSG_BAD );
         return;
     }
@@ -972 +975 @@
         {
             tr_bencFree( &pk );
-            msgresp( client, tag, IPC_MSG_NOTSUP );
+            msgresp( client, tag, IPC_MSG_BAD );
             return;
         }
         found = ipc_msgid( &client->ipc, name->val.s.s );
-        if( IPC__MSG_COUNT == found )
+        if( IPC__MSG_COUNT == found || !ipc_ishandled( &client->ipc, found ) )
         {
             continue;

trunk/libtransmission/ipcparse.c

@@ -1127 +1127 @@
 
 int
+ipc_ishandled( struct ipc_info * info, enum ipc_msg id )
+{
+    struct msgfunc key;
+
+    assert( MSGVALID( id ) );
+
+    bzero( &key, sizeof key );
+    key.id = id;
+    return ( NULL != RB_FIND( functree, &info->funcs->msgs, &key ) );
+}
+
+int
 ipc_havetags( struct ipc_info * info )
 {

trunk/libtransmission/ipcparse.h

@@ -165 +165 @@
 int          ipc_havemsg  ( struct ipc_info *, enum ipc_msg );
 enum ipc_msg ipc_msgid    ( struct ipc_info *, const char * );
+int          ipc_ishandled( struct ipc_info *, enum ipc_msg );
 int          ipc_havetags ( struct ipc_info * );
 int          ipc_infotypes( enum ipc_msg, benc_val_t * );