From: Matthias Wachs <wachs@net.in.tum.de>
Date: Tue, 30 Aug 2011 09:24:45 +0000 (+0000)
Subject: removing unique id code
X-Git-Tag: initial-import-from-subversion-38251~17297
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=76e9a6b5cfd602b6c3eeadec11dd3811fddcfb90;p=oweals%2Fgnunet.git

removing unique id code
---

diff --git a/src/include/gnunet_server_lib.h b/src/include/gnunet_server_lib.h
index 682a265ff..f03d9625d 100644
--- a/src/include/gnunet_server_lib.h
+++ b/src/include/gnunet_server_lib.h
@@ -325,16 +325,6 @@ GNUNET_SERVER_client_get_address (struct GNUNET_SERVER_Client *client,
                                   void **addr, size_t * addrlen);
 
 
-/**
- * Retrieve the unique id from the opaque defined GNUNET_SERVER_Client
- *
- * @param client the client
- * @return the unique id
- */
-uint64_t
-GNUNET_SERVER_client_get_id (struct GNUNET_SERVER_Client *client);
-
-
 /**
  * Functions with this signature are called whenever a client
  * is disconnected on the network level.
diff --git a/src/util/server.c b/src/util/server.c
index ce5d16e1e..c8eb15f1c 100644
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -247,11 +247,6 @@ struct GNUNET_SERVER_Client
    * Type of last message processed (for warn_no_receive_done).
    */
   uint16_t warn_type;
-
-  /**
-   * unique identifier to distinguish between clients
-   */
-  uint64_t id;
 };
 
 
@@ -937,18 +932,6 @@ client_message_tokenizer_callback (void *cls, void *client,
 }
 
 
-/**
- * Get a unique identifier for each GNUNET_SERVER_Client
- */
-static uint64_t
-get_client_id (void)
-{
-  static uint64_t id;
-
-  GNUNET_assert (id < ULONG_LONG_MAX);
-  return (id++);
-}
-
 /**
  * Add a TCP socket-based connection to the set of handles managed by
  * this server.  Use this function for outgoing (P2P) connections that
@@ -980,7 +963,6 @@ GNUNET_SERVER_connect_socket (struct GNUNET_SERVER_Handle *server,
   client->receive_pending = GNUNET_YES;
   client->callback = NULL;
   client->callback_cls = NULL;
-  client->id = get_client_id ();
   GNUNET_CONNECTION_receive (client->connection,
                              GNUNET_SERVER_MAX_MESSAGE_SIZE - 1,
                              client->idle_timeout, &process_incoming, client);
@@ -1292,18 +1274,6 @@ GNUNET_SERVER_client_persist_ (struct GNUNET_SERVER_Client *client)
 }
 
 
-/**
- * Retrieve the unique id from the opaque defined GNUNET_SERVER_Client
- *
- * @param client the client
- * @return the unique id
- */
-uint64_t
-GNUNET_SERVER_client_get_id (struct GNUNET_SERVER_Client *client)
-{
-  return client->id;
-}
-
 /**
  * Resume receiving from this client, we are done processing the
  * current request.  This function must be called from within each