types

[oweals/gnunet.git] / src / include / gnunet_server_lib.h

diff --git a/src/include/gnunet_server_lib.h b/src/include/gnunet_server_lib.h
index 4e4f35e260157fbeac1799ddc04211d820f70621..632833035db7688dcaaa4af6da203e77508ba3bc 100644 (file)
--- a/src/include/gnunet_server_lib.h
+++ b/src/include/gnunet_server_lib.h
@@ -37,7 +37,7 @@ extern "C"
 #endif
 
 #include "gnunet_common.h"
-#include "gnunet_network_lib.h"
+#include "gnunet_connection_lib.h"
 #include "gnunet_scheduler_lib.h"
 
 
@@ -64,13 +64,10 @@ struct GNUNET_SERVER_Client;
  * received.
  *
  * @param cls closure
- * @param server the server handling the message
  * @param client identification of the client
  * @param message the actual message
  */
 typedef void (*GNUNET_SERVER_MessageCallback) (void *cls,
-                                               struct GNUNET_SERVER_Handle *
-                                               server,
                                                struct GNUNET_SERVER_Client *
                                                client,
                                                const struct
@@ -130,7 +127,7 @@ struct GNUNET_SERVER_MessageHandler
 struct GNUNET_SERVER_Handle *GNUNET_SERVER_create (struct
                                                    GNUNET_SCHEDULER_Handle
                                                    *sched,
-                                                   GNUNET_NETWORK_AccessCheck
+                                                   GNUNET_CONNECTION_AccessCheck
                                                    access, void *access_cls,
                                                    const struct sockaddr
                                                    *serverAddr,
@@ -178,14 +175,14 @@ GNUNET_SERVER_add_handlers (struct GNUNET_SERVER_Handle *server,
  * @param callback_cls closure for callback
  * @return non-NULL if the notify callback was queued; can be used
  *           to cancel the request using
- *           GNUNET_NETWORK_notify_transmit_ready_cancel.
+ *           GNUNET_CONNECTION_notify_transmit_ready_cancel.
  *         NULL if we are already going to notify someone else (busy)
  */
-struct GNUNET_NETWORK_TransmitHandle
+struct GNUNET_CONNECTION_TransmitHandle
   *GNUNET_SERVER_notify_transmit_ready (struct GNUNET_SERVER_Client *client,
                                         size_t size,
                                         struct GNUNET_TIME_Relative timeout,
-                                        GNUNET_NETWORK_TransmitReadyNotify
+                                        GNUNET_CONNECTION_TransmitReadyNotify
                                         callback, void *callback_cls);
 
 
@@ -241,7 +238,7 @@ struct GNUNET_SERVER_Client *GNUNET_SERVER_connect_socket (struct
                                                            GNUNET_SERVER_Handle
                                                            *server,
                                                            struct
-                                                           GNUNET_NETWORK_SocketHandle
+                                                           GNUNET_CONNECTION_Handle
                                                            *connection);
 
 
@@ -257,14 +254,14 @@ struct GNUNET_SERVER_Client *GNUNET_SERVER_connect_socket (struct
  * @param receiver function to call with received data
  * @param receiver_cls closure for receiver
  * @return task identifier that can be used to cancel the receive,
- *         GNUNET_SCHEDULER_NO_PREREQUISITE_TASK should be returned
+ *         GNUNET_SCHEDULER_NO_TASK should be returned
  *         if the receiver function was already called
  */
 typedef GNUNET_SCHEDULER_TaskIdentifier
   (*GNUNET_SERVER_ReceiveCallback) (void *cls,
                                     size_t max,
                                     struct GNUNET_TIME_Relative timeout,
-                                    GNUNET_NETWORK_Receiver
+                                    GNUNET_CONNECTION_Receiver
                                     receiver, void *receiver_cls);
 
 
@@ -297,7 +294,7 @@ typedef void *(*GNUNET_SERVER_TransmitReadyCallback) (void *cls,
                                                       struct
                                                       GNUNET_TIME_Relative
                                                       timeout,
-                                                      GNUNET_NETWORK_TransmitReadyNotify
+                                                      GNUNET_CONNECTION_TransmitReadyNotify
                                                       notify,
                                                       void *notify_cls);