From b1a757d39ec31b6e745ee4f5974a81e2af7ea06b Mon Sep 17 00:00:00 2001 From: Nils Durner Date: Sat, 29 Aug 2009 17:55:26 +0000 Subject: [PATCH] naming --- src/core/core_api.c | 2 +- src/core/gnunet-service-core.c | 2 +- src/include/gnunet_client_lib.h | 2 +- src/include/gnunet_connection_lib.h | 22 +++++++++--------- src/include/gnunet_server_lib.h | 2 +- src/transport/plugin_transport_tcp.c | 6 ++--- src/transport/transport_api.c | 4 ++-- src/util/client.c | 12 +++++----- src/util/network.c | 26 +++++++++++----------- src/util/server.c | 20 ++++++++--------- src/util/test_network.c | 20 ++++++++--------- src/util/test_network_addressing.c | 22 +++++++++--------- src/util/test_network_receive_cancel.c | 18 +++++++-------- src/util/test_network_timeout.c | 12 +++++----- src/util/test_network_timeout_no_connect.c | 4 ++-- src/util/test_network_transmit_cancel.c | 8 +++---- 16 files changed, 91 insertions(+), 91 deletions(-) diff --git a/src/core/core_api.c b/src/core/core_api.c index 6a1b88147..619a0420f 100644 --- a/src/core/core_api.c +++ b/src/core/core_api.c @@ -836,7 +836,7 @@ void GNUNET_CORE_disconnect (struct GNUNET_CORE_Handle *handle) { if (handle->th != NULL) - GNUNET_NETWORK_connection_notify_transmit_ready_cancel (handle->th); + GNUNET_CONNECTION_notify_transmit_ready_cancel (handle->th); if (handle->reconnect_task != GNUNET_SCHEDULER_NO_TASK) GNUNET_SCHEDULER_cancel (handle->sched, handle->reconnect_task); GNUNET_CLIENT_disconnect (handle->client); diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c index 8a750fd69..eab031f1c 100644 --- a/src/core/gnunet-service-core.c +++ b/src/core/gnunet-service-core.c @@ -1021,7 +1021,7 @@ handle_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client) else prev->next = pos->next; if (pos->th != NULL) - GNUNET_NETWORK_connection_notify_transmit_ready_cancel (pos->th); + GNUNET_CONNECTION_notify_transmit_ready_cancel (pos->th); while (NULL != (e = pos->event_head)) { pos->event_head = e->next; diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h index eb75e8d1e..4ac993dea 100644 --- a/src/include/gnunet_client_lib.h +++ b/src/include/gnunet_client_lib.h @@ -109,7 +109,7 @@ void GNUNET_CLIENT_receive (struct GNUNET_CLIENT_Connection *sock, * @param notify_cls closure for notify * @return NULL if someone else is already waiting to be notified * non-NULL if the notify callback was queued (can be used to cancel - * using GNUNET_NETWORK_connection_notify_transmit_ready_cancel) + * using GNUNET_CONNECTION_notify_transmit_ready_cancel) */ struct GNUNET_NETWORK_TransmitHandle *GNUNET_CLIENT_notify_transmit_ready (struct GNUNET_CLIENT_Connection *sock, diff --git a/src/include/gnunet_connection_lib.h b/src/include/gnunet_connection_lib.h index 69bd7d4a6..34f6bd8a2 100644 --- a/src/include/gnunet_connection_lib.h +++ b/src/include/gnunet_connection_lib.h @@ -95,7 +95,7 @@ typedef void (*GNUNET_NETWORK_Receiver) (void *cls, * @return the boxed socket handle */ struct GNUNET_NETWORK_ConnectionHandle - *GNUNET_NETWORK_connection_create_from_existing (struct + *GNUNET_CONNECTION_create_from_existing (struct GNUNET_SCHEDULER_Handle *sched, struct @@ -116,7 +116,7 @@ struct GNUNET_NETWORK_ConnectionHandle * @return the socket handle, NULL on error (for example, access refused) */ struct GNUNET_NETWORK_ConnectionHandle - *GNUNET_NETWORK_connection_create_from_accept (struct + *GNUNET_CONNECTION_create_from_accept (struct GNUNET_SCHEDULER_Handle *sched, GNUNET_NETWORK_AccessCheck @@ -139,7 +139,7 @@ struct GNUNET_NETWORK_ConnectionHandle * @return the socket handle */ struct GNUNET_NETWORK_ConnectionHandle - *GNUNET_NETWORK_connection_create_from_connect (struct + *GNUNET_CONNECTION_create_from_connect (struct GNUNET_SCHEDULER_Handle *sched, const char *hostname, @@ -162,7 +162,7 @@ struct GNUNET_NETWORK_ConnectionHandle * @return the socket handle */ struct GNUNET_NETWORK_ConnectionHandle - *GNUNET_NETWORK_connection_create_from_sockaddr (struct + *GNUNET_CONNECTION_create_from_sockaddr (struct GNUNET_SCHEDULER_Handle *sched, int af_family, const struct sockaddr @@ -178,7 +178,7 @@ struct GNUNET_NETWORK_ConnectionHandle * @param sock socket to check * @return GNUNET_YES if valid, GNUNET_NO otherwise */ -int GNUNET_NETWORK_connection_check (struct GNUNET_NETWORK_ConnectionHandle +int GNUNET_CONNECTION_check (struct GNUNET_NETWORK_ConnectionHandle *sock); @@ -190,7 +190,7 @@ int GNUNET_NETWORK_connection_check (struct GNUNET_NETWORK_ConnectionHandle * @param addrlen where to store the length of the address * @return GNUNET_OK on success */ -int GNUNET_NETWORK_connection_get_address (struct +int GNUNET_CONNECTION_get_address (struct GNUNET_NETWORK_ConnectionHandle *sock, void **addr, size_t * addrlen); @@ -202,7 +202,7 @@ int GNUNET_NETWORK_connection_get_address (struct * * @param sock socket to destroy */ -void GNUNET_NETWORK_connection_destroy (struct GNUNET_NETWORK_ConnectionHandle +void GNUNET_CONNECTION_destroy (struct GNUNET_NETWORK_ConnectionHandle *sock); @@ -221,7 +221,7 @@ void GNUNET_NETWORK_connection_destroy (struct GNUNET_NETWORK_ConnectionHandle * @return scheduler task ID used for receiving, GNUNET_SCHEDULER_NO_TASK on error */ GNUNET_SCHEDULER_TaskIdentifier -GNUNET_NETWORK_connection_receive (struct GNUNET_NETWORK_ConnectionHandle +GNUNET_CONNECTION_receive (struct GNUNET_NETWORK_ConnectionHandle *sock, size_t max, struct GNUNET_TIME_Relative timeout, GNUNET_NETWORK_Receiver receiver, @@ -237,7 +237,7 @@ GNUNET_NETWORK_connection_receive (struct GNUNET_NETWORK_ConnectionHandle * @param task task identifier returned from the receive call * @return closure of the original receiver callback */ -void *GNUNET_NETWORK_connection_receive_cancel (struct +void *GNUNET_CONNECTION_receive_cancel (struct GNUNET_NETWORK_ConnectionHandle *sock, GNUNET_SCHEDULER_TaskIdentifier @@ -295,7 +295,7 @@ struct GNUNET_NETWORK_TransmitHandle; * NULL if we are already going to notify someone else (busy) */ struct GNUNET_NETWORK_TransmitHandle - *GNUNET_NETWORK_connection_notify_transmit_ready (struct + *GNUNET_CONNECTION_notify_transmit_ready (struct GNUNET_NETWORK_ConnectionHandle *sock, size_t size, struct @@ -312,7 +312,7 @@ struct GNUNET_NETWORK_TransmitHandle * @param h handle for notification to cancel */ void -GNUNET_NETWORK_connection_notify_transmit_ready_cancel (struct +GNUNET_CONNECTION_notify_transmit_ready_cancel (struct GNUNET_NETWORK_TransmitHandle *h); diff --git a/src/include/gnunet_server_lib.h b/src/include/gnunet_server_lib.h index 092bab40b..f62a409ce 100644 --- a/src/include/gnunet_server_lib.h +++ b/src/include/gnunet_server_lib.h @@ -175,7 +175,7 @@ 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_connection_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 diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c index 2e174f80a..feab67195 100644 --- a/src/transport/plugin_transport_tcp.c +++ b/src/transport/plugin_transport_tcp.c @@ -665,7 +665,7 @@ connect_and_create_validation_session (struct Plugin *plugin, GNUNET_break_op (0); return NULL; /* invalid address */ } - conn = GNUNET_NETWORK_connection_create_from_sockaddr (plugin->env->sched, + conn = GNUNET_CONNECTION_create_from_sockaddr (plugin->env->sched, af, addr, addrlen, @@ -796,7 +796,7 @@ disconnect_session (struct Session *session) /* clean up state */ if (session->transmit_handle != NULL) { - GNUNET_NETWORK_connection_notify_transmit_ready_cancel (session->transmit_handle); + GNUNET_CONNECTION_notify_transmit_ready_cancel (session->transmit_handle); session->transmit_handle = NULL; } while (NULL != (pm = session->pending_messages)) @@ -923,7 +923,7 @@ try_connect_to_address (void *cls, { cc->welcome = create_welcome (addrlen, addr, cc->plugin); cc->sa = - GNUNET_NETWORK_connection_create_from_sockaddr (cc->plugin->env->sched, + GNUNET_CONNECTION_create_from_sockaddr (cc->plugin->env->sched, af, addr, addrlen, GNUNET_SERVER_MAX_MESSAGE_SIZE); #if DEBUG_TCP diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c index 93efcb4ba..451b66c12 100644 --- a/src/transport/transport_api.c +++ b/src/transport/transport_api.c @@ -1573,7 +1573,7 @@ demultiplexer (void *cls, const struct GNUNET_MessageHeader *msg) #endif if (h->network_handle != NULL) { - GNUNET_NETWORK_connection_notify_transmit_ready_cancel (h->network_handle); + GNUNET_CONNECTION_notify_transmit_ready_cancel (h->network_handle); h->network_handle = NULL; h->transmission_scheduled = GNUNET_NO; th = h->connect_ready_head; @@ -1964,7 +1964,7 @@ GNUNET_TRANSPORT_notify_transmit_ready_cancel (struct h = th->handle; if ((h->connect_ready_head == NULL) && (h->network_handle != NULL)) { - GNUNET_NETWORK_connection_notify_transmit_ready_cancel (h->network_handle); + GNUNET_CONNECTION_notify_transmit_ready_cancel (h->network_handle); h->network_handle = NULL; h->transmission_scheduled = GNUNET_NO; } diff --git a/src/util/client.c b/src/util/client.c index 4e6e09066..9836b3e79 100644 --- a/src/util/client.c +++ b/src/util/client.c @@ -147,7 +147,7 @@ GNUNET_CLIENT_connect (struct GNUNET_SCHEDULER_Handle *sched, service_name); return NULL; } - sock = GNUNET_NETWORK_connection_create_from_connect (sched, + sock = GNUNET_CONNECTION_create_from_connect (sched, hostname, port, GNUNET_SERVER_MAX_MESSAGE_SIZE); @@ -184,7 +184,7 @@ void GNUNET_CLIENT_disconnect (struct GNUNET_CLIENT_Connection *sock) { GNUNET_assert (sock->sock != NULL); - GNUNET_NETWORK_connection_destroy (sock->sock); + GNUNET_CONNECTION_destroy (sock->sock); sock->sock = NULL; sock->receiver_handler = NULL; GNUNET_SCHEDULER_add_after (sock->sched, @@ -331,7 +331,7 @@ GNUNET_CLIENT_receive (struct GNUNET_CLIENT_Connection *sock, GNUNET_SCHEDULER_NO_TASK, &receive_task, sock); else - sock->receiver_task = GNUNET_NETWORK_connection_receive (sock->sock, + sock->receiver_task = GNUNET_CONNECTION_receive (sock->sock, GNUNET_SERVER_MAX_MESSAGE_SIZE, timeout, &receive_helper, sock); @@ -362,7 +362,7 @@ write_shutdown (void *cls, size_t size, void *buf) void GNUNET_CLIENT_service_shutdown (struct GNUNET_CLIENT_Connection *sock) { - GNUNET_NETWORK_connection_notify_transmit_ready (sock->sock, + GNUNET_CONNECTION_notify_transmit_ready (sock->sock, sizeof (struct GNUNET_MessageHeader), GNUNET_TIME_UNIT_FOREVER_REL, &write_shutdown, NULL); @@ -478,7 +478,7 @@ GNUNET_CLIENT_service_test (struct GNUNET_SCHEDULER_Handle *sched, conn->test_cb = task; conn->test_cb_cls = task_cls; if (NULL == - GNUNET_NETWORK_connection_notify_transmit_ready (conn->sock, + GNUNET_CONNECTION_notify_transmit_ready (conn->sock, sizeof (struct GNUNET_MessageHeader), timeout, &write_test, NULL)) @@ -515,7 +515,7 @@ GNUNET_CLIENT_notify_transmit_ready (struct GNUNET_CLIENT_Connection *sock, GNUNET_NETWORK_TransmitReadyNotify notify, void *notify_cls) { - return GNUNET_NETWORK_connection_notify_transmit_ready (sock->sock, + return GNUNET_CONNECTION_notify_transmit_ready (sock->sock, size, timeout, notify, notify_cls); } diff --git a/src/util/network.c b/src/util/network.c index 6d8b9f938..02d9e5dfd 100644 --- a/src/util/network.c +++ b/src/util/network.c @@ -167,7 +167,7 @@ struct GNUNET_NETWORK_ConnectionHandle GNUNET_SCHEDULER_TaskIdentifier write_task; /** - * The handle we return for GNUNET_NETWORK_connection_notify_transmit_ready. + * The handle we return for GNUNET_CONNECTION_notify_transmit_ready. */ struct GNUNET_NETWORK_TransmitHandle nth; @@ -218,7 +218,7 @@ struct GNUNET_NETWORK_ConnectionHandle * @return the boxed socket handle */ struct GNUNET_NETWORK_ConnectionHandle * -GNUNET_NETWORK_connection_create_from_existing (struct GNUNET_SCHEDULER_Handle +GNUNET_CONNECTION_create_from_existing (struct GNUNET_SCHEDULER_Handle *sched, struct GNUNET_NETWORK_Descriptor *osSocket, size_t maxbuf) { @@ -245,7 +245,7 @@ GNUNET_NETWORK_connection_create_from_existing (struct GNUNET_SCHEDULER_Handle * @return the socket handle, NULL on error */ struct GNUNET_NETWORK_ConnectionHandle * -GNUNET_NETWORK_connection_create_from_accept (struct GNUNET_SCHEDULER_Handle +GNUNET_CONNECTION_create_from_accept (struct GNUNET_SCHEDULER_Handle *sched, GNUNET_NETWORK_AccessCheck access, void *access_cls, struct GNUNET_NETWORK_Descriptor *lsock, @@ -338,7 +338,7 @@ GNUNET_NETWORK_connection_create_from_accept (struct GNUNET_SCHEDULER_Handle * @return GNUNET_OK on success */ int -GNUNET_NETWORK_connection_get_address (struct GNUNET_NETWORK_ConnectionHandle *sock, +GNUNET_CONNECTION_get_address (struct GNUNET_NETWORK_ConnectionHandle *sock, void **addr, size_t * addrlen) { if ((sock->addr == NULL) || (sock->addrlen == 0)) @@ -546,7 +546,7 @@ connect_continuation (void *cls, * @return the socket handle */ struct GNUNET_NETWORK_ConnectionHandle * -GNUNET_NETWORK_connection_create_from_connect (struct GNUNET_SCHEDULER_Handle +GNUNET_CONNECTION_create_from_connect (struct GNUNET_SCHEDULER_Handle *sched, const char *hostname, uint16_t port, size_t maxbuf) { @@ -593,7 +593,7 @@ GNUNET_NETWORK_connection_create_from_connect (struct GNUNET_SCHEDULER_Handle * @return the socket handle */ struct GNUNET_NETWORK_ConnectionHandle * -GNUNET_NETWORK_connection_create_from_sockaddr (struct GNUNET_SCHEDULER_Handle +GNUNET_CONNECTION_create_from_sockaddr (struct GNUNET_SCHEDULER_Handle *sched, int af_family, const struct sockaddr *serv_addr, socklen_t addrlen, size_t maxbuf) @@ -634,7 +634,7 @@ GNUNET_NETWORK_connection_create_from_sockaddr (struct GNUNET_SCHEDULER_Handle GNUNET_break (0 == GNUNET_NETWORK_socket_close (s)); return NULL; } - ret = GNUNET_NETWORK_connection_create_from_existing (sched, s, maxbuf); + ret = GNUNET_CONNECTION_create_from_existing (sched, s, maxbuf); ret->addr = GNUNET_malloc (addrlen); memcpy (ret->addr, serv_addr, addrlen); ret->addrlen = addrlen; @@ -651,7 +651,7 @@ GNUNET_NETWORK_connection_create_from_sockaddr (struct GNUNET_SCHEDULER_Handle * @return GNUNET_YES if valid, GNUNET_NO otherwise */ int -GNUNET_NETWORK_connection_check (struct GNUNET_NETWORK_ConnectionHandle *sock) +GNUNET_CONNECTION_check (struct GNUNET_NETWORK_ConnectionHandle *sock) { if (sock->ai != NULL) return GNUNET_YES; /* still trying to connect */ @@ -723,7 +723,7 @@ destroy_continuation (void *cls, * @param sock socket to destroy */ void -GNUNET_NETWORK_connection_destroy (struct GNUNET_NETWORK_ConnectionHandle *sock) +GNUNET_CONNECTION_destroy (struct GNUNET_NETWORK_ConnectionHandle *sock) { if (sock->write_buffer_off == 0) sock->ai_pos = NULL; /* if we're still trying to connect and have @@ -911,7 +911,7 @@ receive_again (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) * @return scheduler task ID used for receiving, GNUNET_SCHEDULER_NO_TASK on error */ GNUNET_SCHEDULER_TaskIdentifier -GNUNET_NETWORK_connection_receive (struct GNUNET_NETWORK_ConnectionHandle *sock, +GNUNET_CONNECTION_receive (struct GNUNET_NETWORK_ConnectionHandle *sock, size_t max, struct GNUNET_TIME_Relative timeout, GNUNET_NETWORK_Receiver receiver, void *receiver_cls) @@ -942,7 +942,7 @@ GNUNET_NETWORK_connection_receive (struct GNUNET_NETWORK_ConnectionHandle *sock, * @return closure of the original receiver callback */ void * -GNUNET_NETWORK_connection_receive_cancel (struct GNUNET_NETWORK_ConnectionHandle *sock, +GNUNET_CONNECTION_receive_cancel (struct GNUNET_NETWORK_ConnectionHandle *sock, GNUNET_SCHEDULER_TaskIdentifier task) { GNUNET_assert (sock->read_task == task); @@ -1164,7 +1164,7 @@ SCHEDULE_WRITE: * NULL if we are already going to notify someone else (busy) */ struct GNUNET_NETWORK_TransmitHandle * -GNUNET_NETWORK_connection_notify_transmit_ready (struct GNUNET_NETWORK_ConnectionHandle +GNUNET_CONNECTION_notify_transmit_ready (struct GNUNET_NETWORK_ConnectionHandle *sock, size_t size, struct GNUNET_TIME_Relative timeout, GNUNET_NETWORK_TransmitReadyNotify @@ -1228,7 +1228,7 @@ GNUNET_NETWORK_connection_notify_transmit_ready (struct GNUNET_NETWORK_Connectio * notification. */ void -GNUNET_NETWORK_connection_notify_transmit_ready_cancel (struct +GNUNET_CONNECTION_notify_transmit_ready_cancel (struct GNUNET_NETWORK_TransmitHandle *h) { GNUNET_assert (h->notify_ready != NULL); diff --git a/src/util/server.c b/src/util/server.c index ff9ea993d..e8683dce8 100644 --- a/src/util/server.c +++ b/src/util/server.c @@ -331,7 +331,7 @@ process_listen_socket (void *cls, shutpipe = GNUNET_DISK_pipe_handle (server->shutpipe, 0); GNUNET_assert (GNUNET_NETWORK_fdset_isset (tc->read_ready, server->listen_socket)); GNUNET_assert (!GNUNET_NETWORK_fdset_handle_isset (tc->read_ready, shutpipe)); - sock = GNUNET_NETWORK_connection_create_from_accept (tc->sched, + sock = GNUNET_CONNECTION_create_from_accept (tc->sched, server->access, server->access_cls, server->listen_socket, @@ -870,7 +870,7 @@ sock_receive (void *cls, struct GNUNET_TIME_Relative timeout, GNUNET_NETWORK_Receiver receiver, void *receiver_cls) { - return GNUNET_NETWORK_connection_receive (cls, max, timeout, receiver, receiver_cls); + return GNUNET_CONNECTION_receive (cls, max, timeout, receiver, receiver_cls); } @@ -878,12 +878,12 @@ sock_receive (void *cls, * Wrapper to cancel receiving from a socket. * * @param cls handle to the GNUNET_NETWORK_ConnectionHandle to cancel - * @param tc task ID that was returned by GNUNET_NETWORK_connection_receive + * @param tc task ID that was returned by GNUNET_CONNECTION_receive */ static void sock_receive_cancel (void *cls, GNUNET_SCHEDULER_TaskIdentifier ti) { - GNUNET_NETWORK_connection_receive_cancel (cls, ti); + GNUNET_CONNECTION_receive_cancel (cls, ti); } @@ -897,7 +897,7 @@ sock_notify_transmit_ready (void *cls, GNUNET_NETWORK_TransmitReadyNotify notify, void *notify_cls) { - return GNUNET_NETWORK_connection_notify_transmit_ready (cls, size, timeout, notify, + return GNUNET_CONNECTION_notify_transmit_ready (cls, size, timeout, notify, notify_cls); } @@ -908,7 +908,7 @@ sock_notify_transmit_ready (void *cls, static void sock_notify_transmit_ready_cancel (void *cls, void *h) { - GNUNET_NETWORK_connection_notify_transmit_ready_cancel (h); + GNUNET_CONNECTION_notify_transmit_ready_cancel (h); } @@ -921,7 +921,7 @@ sock_notify_transmit_ready_cancel (void *cls, void *h) static int sock_check (void *cls) { - return GNUNET_NETWORK_connection_check (cls); + return GNUNET_CONNECTION_check (cls); } @@ -933,7 +933,7 @@ sock_check (void *cls) static void sock_destroy (void *cls) { - GNUNET_NETWORK_connection_destroy (cls); + GNUNET_CONNECTION_destroy (cls); } @@ -1067,7 +1067,7 @@ GNUNET_SERVER_client_get_address (struct GNUNET_SERVER_Client *client, { if (client->receive != &sock_receive) return GNUNET_SYSERR; /* not a network client */ - return GNUNET_NETWORK_connection_get_address (client->client_closure, + return GNUNET_CONNECTION_get_address (client->client_closure, addr, addrlen); } @@ -1130,7 +1130,7 @@ GNUNET_SERVER_client_disconnect (struct GNUNET_SERVER_Client *client) * @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_connection_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 * diff --git a/src/util/test_network.c b/src/util/test_network.c index 6f09c4fce..b628a18db 100644 --- a/src/util/test_network.c +++ b/src/util/test_network.c @@ -88,7 +88,7 @@ receive_check (void *cls, #if VERBOSE GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receive needs more data\n"); #endif - GNUNET_NETWORK_connection_receive (asock, + GNUNET_CONNECTION_receive (asock, 1024, GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5), &receive_check, @@ -101,7 +101,7 @@ receive_check (void *cls, "Receive closes accepted socket\n"); #endif *ok = 0; - GNUNET_NETWORK_connection_destroy (asock); + GNUNET_CONNECTION_destroy (asock); } } @@ -112,19 +112,19 @@ run_accept (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) #if VERBOSE GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test accepts connection\n"); #endif - asock = GNUNET_NETWORK_connection_create_from_accept (tc->sched, + asock = GNUNET_CONNECTION_create_from_accept (tc->sched, NULL, NULL, ls, 1024); GNUNET_assert (asock != NULL); - GNUNET_assert (GNUNET_YES == GNUNET_NETWORK_connection_check (asock)); + GNUNET_assert (GNUNET_YES == GNUNET_CONNECTION_check (asock)); #if VERBOSE GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test destroys listen socket\n"); #endif - GNUNET_NETWORK_connection_destroy (lsock); + GNUNET_CONNECTION_destroy (lsock); #if VERBOSE GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test asks to receive on accepted socket\n"); #endif - GNUNET_NETWORK_connection_receive (asock, + GNUNET_CONNECTION_receive (asock, 1024, GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5), &receive_check, cls); @@ -146,23 +146,23 @@ static void task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { ls = open_listen_socket (); - lsock = GNUNET_NETWORK_connection_create_from_existing (tc->sched, ls, 0); + lsock = GNUNET_CONNECTION_create_from_existing (tc->sched, ls, 0); GNUNET_assert (lsock != NULL); - csock = GNUNET_NETWORK_connection_create_from_connect (tc->sched, + csock = GNUNET_CONNECTION_create_from_connect (tc->sched, "localhost", PORT, 1024); GNUNET_assert (csock != NULL); #if VERBOSE GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test asks for write notification\n"); #endif GNUNET_assert (NULL != - GNUNET_NETWORK_connection_notify_transmit_ready (csock, + GNUNET_CONNECTION_notify_transmit_ready (csock, 12, GNUNET_TIME_UNIT_SECONDS, &make_hello, NULL)); #if VERBOSE GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test destroys client socket\n"); #endif - GNUNET_NETWORK_connection_destroy (csock); + GNUNET_CONNECTION_destroy (csock); #if VERBOSE GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Test prepares to accept\n"); #endif diff --git a/src/util/test_network_addressing.c b/src/util/test_network_addressing.c index a2682a733..177810eae 100644 --- a/src/util/test_network_addressing.c +++ b/src/util/test_network_addressing.c @@ -82,7 +82,7 @@ receive_check (void *cls, sofar += available; if (sofar < 12) { - GNUNET_NETWORK_connection_receive (asock, + GNUNET_CONNECTION_receive (asock, 1024, GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5), &receive_check, @@ -91,7 +91,7 @@ receive_check (void *cls, else { *ok = 0; - GNUNET_NETWORK_connection_destroy (asock); + GNUNET_CONNECTION_destroy (asock); } } @@ -104,12 +104,12 @@ run_accept (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) struct sockaddr_in *v4; struct sockaddr_in expect; - asock = GNUNET_NETWORK_connection_create_from_accept (tc->sched, + asock = GNUNET_CONNECTION_create_from_accept (tc->sched, NULL, NULL, ls, 1024); GNUNET_assert (asock != NULL); - GNUNET_assert (GNUNET_YES == GNUNET_NETWORK_connection_check (asock)); + GNUNET_assert (GNUNET_YES == GNUNET_CONNECTION_check (asock)); GNUNET_assert (GNUNET_OK == - GNUNET_NETWORK_connection_get_address (asock, &addr, &alen)); + GNUNET_CONNECTION_get_address (asock, &addr, &alen)); GNUNET_assert (alen == sizeof (struct sockaddr_in)); v4 = addr; memset (&expect, 0, sizeof (expect)); @@ -118,8 +118,8 @@ run_accept (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) expect.sin_addr.s_addr = htonl (INADDR_LOOPBACK); GNUNET_assert (0 == memcmp (&expect, v4, alen)); GNUNET_free (addr); - GNUNET_NETWORK_connection_destroy (lsock); - GNUNET_NETWORK_connection_receive (asock, + GNUNET_CONNECTION_destroy (lsock); + GNUNET_CONNECTION_receive (asock, 1024, GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5), &receive_check, cls); @@ -138,24 +138,24 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { struct sockaddr_in v4; ls = open_listen_socket (); - lsock = GNUNET_NETWORK_connection_create_from_existing (tc->sched, ls, 0); + lsock = GNUNET_CONNECTION_create_from_existing (tc->sched, ls, 0); GNUNET_assert (lsock != NULL); v4.sin_family = AF_INET; v4.sin_port = htons (PORT); v4.sin_addr.s_addr = htonl (INADDR_LOOPBACK); - csock = GNUNET_NETWORK_connection_create_from_sockaddr (tc->sched, + csock = GNUNET_CONNECTION_create_from_sockaddr (tc->sched, AF_INET, (const struct sockaddr *) &v4, sizeof (v4), 1024); GNUNET_assert (csock != NULL); GNUNET_assert (NULL != - GNUNET_NETWORK_connection_notify_transmit_ready (csock, + GNUNET_CONNECTION_notify_transmit_ready (csock, 12, GNUNET_TIME_UNIT_SECONDS, &make_hello, NULL)); - GNUNET_NETWORK_connection_destroy (csock); + GNUNET_CONNECTION_destroy (csock); GNUNET_SCHEDULER_add_read_net (tc->sched, GNUNET_NO, GNUNET_SCHEDULER_PRIORITY_HIGH, diff --git a/src/util/test_network_receive_cancel.c b/src/util/test_network_receive_cancel.c index 1a3cb4866..a9834c0e2 100644 --- a/src/util/test_network_receive_cancel.c +++ b/src/util/test_network_receive_cancel.c @@ -85,13 +85,13 @@ static void run_accept_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - asock = GNUNET_NETWORK_connection_create_from_accept (tc->sched, + asock = GNUNET_CONNECTION_create_from_accept (tc->sched, NULL, NULL, ls, 1024); GNUNET_assert (asock != NULL); - GNUNET_assert (GNUNET_YES == GNUNET_NETWORK_connection_check (asock)); - GNUNET_NETWORK_connection_destroy (lsock); + GNUNET_assert (GNUNET_YES == GNUNET_CONNECTION_check (asock)); + GNUNET_CONNECTION_destroy (lsock); receive_task - = GNUNET_NETWORK_connection_receive (asock, + = GNUNET_CONNECTION_receive (asock, 1024, GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5), &dead_receive, @@ -103,9 +103,9 @@ static void receive_cancel_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { int *ok = cls; - GNUNET_NETWORK_connection_receive_cancel (asock, receive_task); - GNUNET_NETWORK_connection_destroy (csock); - GNUNET_NETWORK_connection_destroy (asock); + GNUNET_CONNECTION_receive_cancel (asock, receive_task); + GNUNET_CONNECTION_destroy (csock); + GNUNET_CONNECTION_destroy (asock); *ok = 0; } @@ -115,9 +115,9 @@ static void task_receive_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { ls = open_listen_socket (); - lsock = GNUNET_NETWORK_connection_create_from_existing (tc->sched, ls, 0); + lsock = GNUNET_CONNECTION_create_from_existing (tc->sched, ls, 0); GNUNET_assert (lsock != NULL); - csock = GNUNET_NETWORK_connection_create_from_connect (tc->sched, + csock = GNUNET_CONNECTION_create_from_connect (tc->sched, "localhost", PORT, 1024); GNUNET_assert (csock != NULL); GNUNET_SCHEDULER_add_read_net (tc->sched, diff --git a/src/util/test_network_timeout.c b/src/util/test_network_timeout.c index 442775463..ef39ac2a1 100644 --- a/src/util/test_network_timeout.c +++ b/src/util/test_network_timeout.c @@ -74,8 +74,8 @@ send_kilo (void *cls, size_t size, void *buf) #endif GNUNET_assert (buf == NULL); *ok = 0; - GNUNET_NETWORK_connection_destroy (lsock); - GNUNET_NETWORK_connection_destroy (csock); + GNUNET_CONNECTION_destroy (lsock); + GNUNET_CONNECTION_destroy (csock); return 0; } #if VERBOSE @@ -85,7 +85,7 @@ send_kilo (void *cls, size_t size, void *buf) memset (buf, 42, 1024); GNUNET_assert (NULL != - GNUNET_NETWORK_connection_notify_transmit_ready (csock, + GNUNET_CONNECTION_notify_transmit_ready (csock, 1024, GNUNET_TIME_UNIT_SECONDS, &send_kilo, cls)); @@ -98,13 +98,13 @@ task_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { ls = open_listen_socket (); - lsock = GNUNET_NETWORK_connection_create_from_existing (tc->sched, ls, 0); + lsock = GNUNET_CONNECTION_create_from_existing (tc->sched, ls, 0); GNUNET_assert (lsock != NULL); - csock = GNUNET_NETWORK_connection_create_from_connect (tc->sched, + csock = GNUNET_CONNECTION_create_from_connect (tc->sched, "localhost", PORT, 1024); GNUNET_assert (csock != NULL); GNUNET_assert (NULL != - GNUNET_NETWORK_connection_notify_transmit_ready (csock, + GNUNET_CONNECTION_notify_transmit_ready (csock, 1024, GNUNET_TIME_UNIT_SECONDS, &send_kilo, cls)); diff --git a/src/util/test_network_timeout_no_connect.c b/src/util/test_network_timeout_no_connect.c index 902edd2fa..823216104 100644 --- a/src/util/test_network_timeout_no_connect.c +++ b/src/util/test_network_timeout_no_connect.c @@ -51,11 +51,11 @@ handle_timeout (void *cls, size_t size, void *buf) static void task_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - csock = GNUNET_NETWORK_connection_create_from_connect (tc->sched, + csock = GNUNET_CONNECTION_create_from_connect (tc->sched, "localhost", PORT, 1024); GNUNET_assert (csock != NULL); GNUNET_assert (NULL != - GNUNET_NETWORK_connection_notify_transmit_ready (csock, + GNUNET_CONNECTION_notify_transmit_ready (csock, 1024, GNUNET_TIME_UNIT_SECONDS, &handle_timeout, cls)); diff --git a/src/util/test_network_transmit_cancel.c b/src/util/test_network_transmit_cancel.c index c46fecd22..edc45bb9f 100644 --- a/src/util/test_network_transmit_cancel.c +++ b/src/util/test_network_transmit_cancel.c @@ -48,15 +48,15 @@ task_transmit_cancel (void *cls, struct GNUNET_NETWORK_TransmitHandle *th; struct GNUNET_NETWORK_ConnectionHandle *csock; - csock = GNUNET_NETWORK_connection_create_from_connect (tc->sched, + csock = GNUNET_CONNECTION_create_from_connect (tc->sched, "localhost", PORT, 1024); GNUNET_assert (csock != NULL); - th = GNUNET_NETWORK_connection_notify_transmit_ready (csock, + th = GNUNET_CONNECTION_notify_transmit_ready (csock, 12, GNUNET_TIME_UNIT_MINUTES, ¬_run, cls); - GNUNET_NETWORK_connection_notify_transmit_ready_cancel (th); - GNUNET_NETWORK_connection_destroy (csock); + GNUNET_CONNECTION_notify_transmit_ready_cancel (th); + GNUNET_CONNECTION_destroy (csock); *ok = 0; } -- 2.25.1