[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r8873 - in gnunet/src: core include transport util
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r8873 - in gnunet/src: core include transport util |
|
Date: |
Sat, 29 Aug 2009 11:55:27 -0600 |
Author: durner
Date: 2009-08-29 11:55:26 -0600 (Sat, 29 Aug 2009)
New Revision: 8873
Modified:
gnunet/src/core/core_api.c
gnunet/src/core/gnunet-service-core.c
gnunet/src/include/gnunet_client_lib.h
gnunet/src/include/gnunet_connection_lib.h
gnunet/src/include/gnunet_server_lib.h
gnunet/src/transport/plugin_transport_tcp.c
gnunet/src/transport/transport_api.c
gnunet/src/util/client.c
gnunet/src/util/network.c
gnunet/src/util/server.c
gnunet/src/util/test_network.c
gnunet/src/util/test_network_addressing.c
gnunet/src/util/test_network_receive_cancel.c
gnunet/src/util/test_network_timeout.c
gnunet/src/util/test_network_timeout_no_connect.c
gnunet/src/util/test_network_transmit_cancel.c
Log:
naming
Modified: gnunet/src/core/core_api.c
===================================================================
--- gnunet/src/core/core_api.c 2009-08-29 17:46:36 UTC (rev 8872)
+++ gnunet/src/core/core_api.c 2009-08-29 17:55:26 UTC (rev 8873)
@@ -836,7 +836,7 @@
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);
Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c 2009-08-29 17:46:36 UTC (rev
8872)
+++ gnunet/src/core/gnunet-service-core.c 2009-08-29 17:55:26 UTC (rev
8873)
@@ -1021,7 +1021,7 @@
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;
Modified: gnunet/src/include/gnunet_client_lib.h
===================================================================
--- gnunet/src/include/gnunet_client_lib.h 2009-08-29 17:46:36 UTC (rev
8872)
+++ gnunet/src/include/gnunet_client_lib.h 2009-08-29 17:55:26 UTC (rev
8873)
@@ -109,7 +109,7 @@
* @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,
Modified: gnunet/src/include/gnunet_connection_lib.h
===================================================================
--- gnunet/src/include/gnunet_connection_lib.h 2009-08-29 17:46:36 UTC (rev
8872)
+++ gnunet/src/include/gnunet_connection_lib.h 2009-08-29 17:55:26 UTC (rev
8873)
@@ -95,7 +95,7 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
*
* @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 @@
* @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 @@
* @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 @@
* 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 @@
* @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);
Modified: gnunet/src/include/gnunet_server_lib.h
===================================================================
--- gnunet/src/include/gnunet_server_lib.h 2009-08-29 17:46:36 UTC (rev
8872)
+++ gnunet/src/include/gnunet_server_lib.h 2009-08-29 17:55:26 UTC (rev
8873)
@@ -175,7 +175,7 @@
* @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
Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2009-08-29 17:46:36 UTC (rev
8872)
+++ gnunet/src/transport/plugin_transport_tcp.c 2009-08-29 17:55:26 UTC (rev
8873)
@@ -665,7 +665,7 @@
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 @@
/* 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 @@
{
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
Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c 2009-08-29 17:46:36 UTC (rev
8872)
+++ gnunet/src/transport/transport_api.c 2009-08-29 17:55:26 UTC (rev
8873)
@@ -1573,7 +1573,7 @@
#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 @@
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;
}
Modified: gnunet/src/util/client.c
===================================================================
--- gnunet/src/util/client.c 2009-08-29 17:46:36 UTC (rev 8872)
+++ gnunet/src/util/client.c 2009-08-29 17:55:26 UTC (rev 8873)
@@ -147,7 +147,7 @@
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 @@
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_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 @@
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 @@
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_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);
}
Modified: gnunet/src/util/network.c
===================================================================
--- gnunet/src/util/network.c 2009-08-29 17:46:36 UTC (rev 8872)
+++ gnunet/src/util/network.c 2009-08-29 17:55:26 UTC (rev 8873)
@@ -167,7 +167,7 @@
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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* @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_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 @@
* @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 @@
* @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 @@
* @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 @@
* @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 @@
* 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 @@
* 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);
Modified: gnunet/src/util/server.c
===================================================================
--- gnunet/src/util/server.c 2009-08-29 17:46:36 UTC (rev 8872)
+++ gnunet/src/util/server.c 2009-08-29 17:55:26 UTC (rev 8873)
@@ -331,7 +331,7 @@
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 @@
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 @@
* 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 @@
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 @@
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 @@
static int
sock_check (void *cls)
{
- return GNUNET_NETWORK_connection_check (cls);
+ return GNUNET_CONNECTION_check (cls);
}
@@ -933,7 +933,7 @@
static void
sock_destroy (void *cls)
{
- GNUNET_NETWORK_connection_destroy (cls);
+ GNUNET_CONNECTION_destroy (cls);
}
@@ -1067,7 +1067,7 @@
{
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 @@
* @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 *
Modified: gnunet/src/util/test_network.c
===================================================================
--- gnunet/src/util/test_network.c 2009-08-29 17:46:36 UTC (rev 8872)
+++ gnunet/src/util/test_network.c 2009-08-29 17:55:26 UTC (rev 8873)
@@ -88,7 +88,7 @@
#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 closes accepted socket\n");
#endif
*ok = 0;
- GNUNET_NETWORK_connection_destroy (asock);
+ GNUNET_CONNECTION_destroy (asock);
}
}
@@ -112,19 +112,19 @@
#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 @@
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
Modified: gnunet/src/util/test_network_addressing.c
===================================================================
--- gnunet/src/util/test_network_addressing.c 2009-08-29 17:46:36 UTC (rev
8872)
+++ gnunet/src/util/test_network_addressing.c 2009-08-29 17:55:26 UTC (rev
8873)
@@ -82,7 +82,7 @@
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 @@
else
{
*ok = 0;
- GNUNET_NETWORK_connection_destroy (asock);
+ GNUNET_CONNECTION_destroy (asock);
}
}
@@ -104,12 +104,12 @@
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 @@
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 @@
{
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,
Modified: gnunet/src/util/test_network_receive_cancel.c
===================================================================
--- gnunet/src/util/test_network_receive_cancel.c 2009-08-29 17:46:36 UTC
(rev 8872)
+++ gnunet/src/util/test_network_receive_cancel.c 2009-08-29 17:55:26 UTC
(rev 8873)
@@ -85,13 +85,13 @@
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 @@
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 @@
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,
Modified: gnunet/src/util/test_network_timeout.c
===================================================================
--- gnunet/src/util/test_network_timeout.c 2009-08-29 17:46:36 UTC (rev
8872)
+++ gnunet/src/util/test_network_timeout.c 2009-08-29 17:55:26 UTC (rev
8873)
@@ -74,8 +74,8 @@
#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 @@
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 @@
{
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));
Modified: gnunet/src/util/test_network_timeout_no_connect.c
===================================================================
--- gnunet/src/util/test_network_timeout_no_connect.c 2009-08-29 17:46:36 UTC
(rev 8872)
+++ gnunet/src/util/test_network_timeout_no_connect.c 2009-08-29 17:55:26 UTC
(rev 8873)
@@ -51,11 +51,11 @@
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));
Modified: gnunet/src/util/test_network_transmit_cancel.c
===================================================================
--- gnunet/src/util/test_network_transmit_cancel.c 2009-08-29 17:46:36 UTC
(rev 8872)
+++ gnunet/src/util/test_network_transmit_cancel.c 2009-08-29 17:55:26 UTC
(rev 8873)
@@ -48,15 +48,15 @@
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;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r8873 - in gnunet/src: core include transport util,
gnunet <=