[GNUnet-SVN] r11908 - in gnunet/src: include util

[gnunet]

Author: grothoff
Date: 2010-06-23 16:26:58 +0200 (Wed, 23 Jun 2010)
New Revision: 11908

Modified:
   gnunet/src/include/gnunet_server_lib.h
   gnunet/src/util/server_mst.c
Log:
doxy

Modified: gnunet/src/include/gnunet_server_lib.h
===================================================================
--- gnunet/src/include/gnunet_server_lib.h      2010-06-23 14:23:50 UTC (rev 
11907)
+++ gnunet/src/include/gnunet_server_lib.h      2010-06-23 14:26:58 UTC (rev 
11908)
@@ -544,8 +544,6 @@
  *
  * @param maxbuf maximum message size to support (typically
  *    GNUNET_SERVER_MAX_MESSAGE_SIZE)
- * @param client_identity ID of client for which this is a buffer,
- *        can be NULL (will be passed back to 'cb')
  * @param cb function to call on completed messages
  * @param cb_cls closure for cb
  * @return handle to tokenizer
@@ -561,6 +559,8 @@
  * callback for all complete messages.
  *
  * @param mst tokenizer to use
+ * @param client_identity ID of client for which this is a buffer,
+ *        can be NULL (will be passed back to 'cb')
  * @param buf input data to add
  * @param size number of bytes in buf
  * @param purge should any excess bytes in the buffer be discarded 

Modified: gnunet/src/util/server_mst.c
===================================================================
--- gnunet/src/util/server_mst.c        2010-06-23 14:23:50 UTC (rev 11907)
+++ gnunet/src/util/server_mst.c        2010-06-23 14:26:58 UTC (rev 11908)
@@ -121,7 +121,7 @@
  */
 int
 GNUNET_SERVER_mst_receive (struct GNUNET_SERVER_MessageStreamTokenizer *mst,
-                          void *client,
+                          void *client_identity,
                           const char *buf,
                           size_t size,
                           int purge,
@@ -221,7 +221,7 @@
        }
       if (one_shot == GNUNET_YES)
        one_shot = GNUNET_SYSERR;
-      mst->cb (mst->cb_cls, client, hdr);
+      mst->cb (mst->cb_cls, client_identity, hdr);
       mst->off += want;
       if (mst->off == mst->pos)
        {
@@ -257,7 +257,7 @@
            }
          if (one_shot == GNUNET_YES)
            one_shot = GNUNET_SYSERR;
-         mst->cb (mst->cb_cls, client, hdr);
+         mst->cb (mst->cb_cls, client_identity, hdr);
          buf += want;
          size -= want;
        }