Changeset 2043 for trunk/macosx/IPCController.m

Timestamp:

Jun 11, 2007, 12:37:10 AM (15 years ago)

Author:

joshe

Message:

Send bad-format instead of not-supported where appropriate.
Implement supported message.

File:

• trunk/macosx/IPCController.m (modified) (14 diffs)

trunk/macosx/IPCController.m

@@ -68 +68 @@
 void
 msg_setstr   ( enum ipc_msg msgid, benc_val_t * val, int64_t tag, void * arg );
+void
+msg_empty    ( enum ipc_msg msgid, benc_val_t * val, int64_t tag, void * arg );
+void
+msg_sup      ( enum ipc_msg msgid, benc_val_t * val, int64_t tag, void * arg );
 static void
 msg_default  ( enum ipc_msg msgid, benc_val_t * val, int64_t tag, void * arg );
@@ -156 +160 @@
         0 > ipc_addmsg( _funcs, IPC_MSG_GETUPLIMIT,   msg_getint    ) ||
         0 > ipc_addmsg( _funcs, IPC_MSG_LOOKUP,       msg_lookup    ) ||
+        0 > ipc_addmsg( _funcs, IPC_MSG_NOOP,         msg_empty     ) ||
         0 > ipc_addmsg( _funcs, IPC_MSG_PEX,          msg_setbool   ) ||
         0 > ipc_addmsg( _funcs, IPC_MSG_PORT,         msg_setint    ) ||
+        0 > ipc_addmsg( _funcs, IPC_MSG_QUIT,         msg_empty     ) ||
         0 > ipc_addmsg( _funcs, IPC_MSG_REMOVE,       msg_action    ) ||
         0 > ipc_addmsg( _funcs, IPC_MSG_REMOVEALL,    msg_actionall ) ||
@@ -164 +170 @@
         0 > ipc_addmsg( _funcs, IPC_MSG_STOP,         msg_action    ) ||
         0 > ipc_addmsg( _funcs, IPC_MSG_STOPALL,      msg_actionall ) ||
+        0 > ipc_addmsg( _funcs, IPC_MSG_SUP,          msg_sup       ) ||
         0 > ipc_addmsg( _funcs, IPC_MSG_UPLIMIT,      msg_setint    ) )
     {
@@ -542 +549 @@
     if( NULL == hashes )
     {
-        [client sendrespEmpty: IPC_MSG_NOTSUP tag: tag];
+        [client sendrespEmpty: IPC_MSG_BAD tag: tag];
         return;
     }
@@ -578 +585 @@
   bad:
     NSLog( @"Got bad IPC packet" );
-    [client sendrespEmpty: IPC_MSG_NOTSUP tag: tag];
+    [client sendrespEmpty: IPC_MSG_BAD tag: tag];
 }
 
@@ -592 +599 @@
     {
         NSLog( @"Got bad IPC packet" );
-        [client sendrespEmpty: IPC_MSG_NOTSUP tag: tag];
+        [client sendrespEmpty: IPC_MSG_BAD tag: tag];
         return;
     }
@@ -614 +621 @@
     {
         NSLog( @"Got bad IPC packet" );
-        [client sendrespEmpty: IPC_MSG_NOTSUP tag: tag];
+        [client sendrespEmpty: IPC_MSG_BAD tag: tag];
         return;
     }
@@ -685 +692 @@
     {
         NSLog( @"Got bad IPC packet" );
-        [client sendrespEmpty: IPC_MSG_NOTSUP tag: tag];
+        [client sendrespEmpty: IPC_MSG_BAD tag: tag];
         return;
     }
@@ -763 +770 @@
   bad:
     NSLog( @"Got bad IPC packet" );
-    [client sendrespEmpty: IPC_MSG_NOTSUP tag: tag];
+    [client sendrespEmpty: IPC_MSG_BAD tag: tag];
 }
 
@@ -826 +833 @@
     {
         NSLog( @"Got bad IPC packet" );
-        [client sendrespEmpty: IPC_MSG_NOTSUP tag: tag];
+        [client sendrespEmpty: IPC_MSG_BAD tag: tag];
         return;
     }
@@ -851 +858 @@
     {
         NSLog( @"Got bad IPC packet" );
-        [client sendrespEmpty: IPC_MSG_NOTSUP tag: tag];
+        [client sendrespEmpty: IPC_MSG_BAD tag: tag];
         return;
     }
@@ -876 +883 @@
     {
         NSLog( @"Got bad IPC packet" );
-        [client sendrespEmpty: IPC_MSG_NOTSUP tag: tag];
+        [client sendrespEmpty: IPC_MSG_BAD tag: tag];
         return;
     }
@@ -891 +898 @@
 }
 
-
-void
-msg_default( enum ipc_msg msgid, benc_val_t * val, int64_t tag, void * arg )
+void
+msg_empty( enum ipc_msg msgid, benc_val_t * val, int64_t tag, void * arg )
 {
     IPCClient * client = arg;
@@ -907 +913 @@
             break;
         default:
-            [client sendrespEmpty: IPC_MSG_NOTSUP tag: tag];
-            break;
-    }
-}
+            assert( 0 );
+            break;
+    }
+}
+
+void
+msg_sup( enum ipc_msg msgid, benc_val_t * val, int64_t tag, void * arg )
+{
+    IPCClient       * client = arg;
+    benc_val_t        packet, * pkval, * name;
+    struct ipc_info * ipc;
+    int               ii;
+    enum ipc_msg      found;
+    uint8_t         * buf;
+    size_t            size;
+
+    if( NULL == val || TYPE_LIST != val->type )
+        goto bad;
+
+    ipc   = [client ipc];
+    pkval = ipc_initval( ipc, IPC_MSG_SUP, tag, &packet, TYPE_LIST );
+    if( NULL == pkval )
+        goto fail;
+    if( tr_bencListReserve( pkval, val->val.l.count ) )
+    {
+        tr_bencFree( &packet );
+        goto fail;
+    }
+
+    for( ii = 0; val->val.l.count > ii; ii++ )
+    {
+        name = &val->val.l.vals[ii];
+        if( NULL == name || TYPE_STR != name->type )
+            goto bad;
+        found = ipc_msgid( ipc, name->val.s.s );
+        if( IPC__MSG_COUNT == found || !ipc_ishandled( ipc, found ) )
+        {
+            continue;
+        }
+        tr_bencInitStr( tr_bencListAdd( pkval ),
+                        name->val.s.s, name->val.s.i, 1 );
+    }
+
+    buf = ipc_mkval( &packet, &size );
+    tr_bencFree( &packet );
+    if( NULL == buf )
+        goto fail;
+    [client sendresp: buf size: size ];
+    return;
+
+  bad:
+    NSLog( @"Got bad IPC packet" );
+    [client sendrespEmpty: IPC_MSG_BAD tag: tag];
+    return;
+
+  fail:
+    NSLog( @"Failed to create IPC reply packet" );
+    [[client controller] killclient: client];
+}
+
+void
+msg_default( enum ipc_msg msgid, benc_val_t * val, int64_t tag, void * arg )
+{
+    IPCClient * client = arg;
+
+    [client sendrespEmpty: IPC_MSG_NOTSUP tag: tag];
+}