doxy

diff --git a/src/include/gnunet_server_lib.h b/src/include/gnunet_server_lib.h
index 9649b177660124bba8812de51f49667ce7d3ac9f..fb6713b84eb6b1ac6ddd192e3dcfd88294a7ed83 100644 (file)
--- a/src/include/gnunet_server_lib.h
+++ b/src/include/gnunet_server_lib.h
@@ -544,8 +544,6 @@ typedef void (*GNUNET_SERVER_MessageTokenizerCallback) (void *cls,
  *
  * @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 @@ GNUNET_SERVER_mst_create (size_t maxbuf,
  * 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 

diff --git a/src/util/server_mst.c b/src/util/server_mst.c
index b124b80b6f62b6a431723ae868613ff7a6c8023c..29c04e96c6ee64ae953108fd9966dc44e1427dcc 100644 (file)
--- a/src/util/server_mst.c
+++ b/src/util/server_mst.c
@@ -121,7 +121,7 @@ GNUNET_SERVER_mst_create (size_t maxbuf,
  */
 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 @@ GNUNET_SERVER_mst_receive (struct GNUNET_SERVER_MessageStreamTokenizer *mst,
        }
       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 @@ GNUNET_SERVER_mst_receive (struct GNUNET_SERVER_MessageStreamTokenizer *mst,
            }
          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;
        }