diff options
author | Nils Durner <durner@gnunet.org> | 2009-08-29 22:06:43 +0000 |
---|---|---|
committer | Nils Durner <durner@gnunet.org> | 2009-08-29 22:06:43 +0000 |
commit | cabc8ba699f76cab751b97014d9375ec74612448 (patch) | |
tree | 368ad5a5343a73b2e9ccd862f31efebfd4106f65 /src | |
parent | deaec843661af71fbea06125f79375e70c967345 (diff) | |
download | gnunet-cabc8ba699f76cab751b97014d9375ec74612448.tar.gz gnunet-cabc8ba699f76cab751b97014d9375ec74612448.zip |
naming
Diffstat (limited to 'src')
-rw-r--r-- | src/include/gnunet_connection_lib.h | 4 | ||||
-rw-r--r-- | src/include/gnunet_network_lib.h | 40 | ||||
-rw-r--r-- | src/include/gnunet_scheduler_lib.h | 4 | ||||
-rw-r--r-- | src/transport/plugin_transport_udp.c | 6 | ||||
-rw-r--r-- | src/upnp/upnp.c | 4 | ||||
-rw-r--r-- | src/upnp/upnp_init.c | 2 | ||||
-rw-r--r-- | src/util/connection.c | 12 | ||||
-rw-r--r-- | src/util/network.c | 44 | ||||
-rw-r--r-- | src/util/scheduler.c | 4 | ||||
-rw-r--r-- | src/util/server.c | 8 | ||||
-rw-r--r-- | src/util/service.c | 2 | ||||
-rw-r--r-- | src/util/test_connection.c | 6 | ||||
-rw-r--r-- | src/util/test_connection_addressing.c | 6 | ||||
-rw-r--r-- | src/util/test_connection_receive_cancel.c | 6 | ||||
-rw-r--r-- | src/util/test_connection_timeout.c | 6 | ||||
-rw-r--r-- | src/util/test_service.c | 2 |
16 files changed, 78 insertions, 78 deletions
diff --git a/src/include/gnunet_connection_lib.h b/src/include/gnunet_connection_lib.h index 9a0d1cfbe..1a3ef4b54 100644 --- a/src/include/gnunet_connection_lib.h +++ b/src/include/gnunet_connection_lib.h | |||
@@ -99,7 +99,7 @@ struct GNUNET_CONNECTION_Handle | |||
99 | GNUNET_SCHEDULER_Handle | 99 | GNUNET_SCHEDULER_Handle |
100 | *sched, | 100 | *sched, |
101 | struct | 101 | struct |
102 | GNUNET_NETWORK_Descriptor | 102 | GNUNET_NETWORK_Handle |
103 | *osSocket, size_t maxbuf); | 103 | *osSocket, size_t maxbuf); |
104 | 104 | ||
105 | 105 | ||
@@ -122,7 +122,7 @@ struct GNUNET_CONNECTION_Handle | |||
122 | GNUNET_CONNECTION_AccessCheck | 122 | GNUNET_CONNECTION_AccessCheck |
123 | access, void *access_cls, | 123 | access, void *access_cls, |
124 | struct | 124 | struct |
125 | GNUNET_NETWORK_Descriptor | 125 | GNUNET_NETWORK_Handle |
126 | *lsock, size_t maxbuf); | 126 | *lsock, size_t maxbuf); |
127 | 127 | ||
128 | 128 | ||
diff --git a/src/include/gnunet_network_lib.h b/src/include/gnunet_network_lib.h index 726114758..b475ff4f0 100644 --- a/src/include/gnunet_network_lib.h +++ b/src/include/gnunet_network_lib.h | |||
@@ -40,7 +40,7 @@ extern "C" | |||
40 | /** | 40 | /** |
41 | * @brief handle to a socket | 41 | * @brief handle to a socket |
42 | */ | 42 | */ |
43 | struct GNUNET_NETWORK_Descriptor; | 43 | struct GNUNET_NETWORK_Handle; |
44 | 44 | ||
45 | /** | 45 | /** |
46 | * @brief collection of IO descriptors | 46 | * @brief collection of IO descriptors |
@@ -52,33 +52,33 @@ struct GNUNET_NETWORK_FDSet; | |||
52 | #include "gnunet_time_lib.h" | 52 | #include "gnunet_time_lib.h" |
53 | 53 | ||
54 | 54 | ||
55 | struct GNUNET_NETWORK_Descriptor * | 55 | struct GNUNET_NETWORK_Handle * |
56 | GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Descriptor *desc, | 56 | GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc, |
57 | struct sockaddr *address, | 57 | struct sockaddr *address, |
58 | socklen_t *address_len); | 58 | socklen_t *address_len); |
59 | 59 | ||
60 | int | 60 | int |
61 | GNUNET_NETWORK_socket_set_inheritable (const struct GNUNET_NETWORK_Descriptor | 61 | GNUNET_NETWORK_socket_set_inheritable (const struct GNUNET_NETWORK_Handle |
62 | *desc); | 62 | *desc); |
63 | 63 | ||
64 | 64 | ||
65 | int GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Descriptor *desc, | 65 | int GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc, |
66 | const struct sockaddr *address, socklen_t address_len); | 66 | const struct sockaddr *address, socklen_t address_len); |
67 | 67 | ||
68 | int GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Descriptor *desc); | 68 | int GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Handle *desc); |
69 | 69 | ||
70 | int GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Descriptor *desc, | 70 | int GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Handle *desc, |
71 | const struct sockaddr *address, socklen_t address_len); | 71 | const struct sockaddr *address, socklen_t address_len); |
72 | 72 | ||
73 | int GNUNET_NETWORK_socket_getsockopt(const struct GNUNET_NETWORK_Descriptor *desc, int level, int optname, | 73 | int GNUNET_NETWORK_socket_getsockopt(const struct GNUNET_NETWORK_Handle *desc, int level, int optname, |
74 | void *optval, socklen_t *optlen); | 74 | void *optval, socklen_t *optlen); |
75 | 75 | ||
76 | int GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Descriptor *desc, int backlog); | 76 | int GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Handle *desc, int backlog); |
77 | 77 | ||
78 | ssize_t GNUNET_NETWORK_socket_read (const struct GNUNET_NETWORK_Descriptor *desc, void *buf, | 78 | ssize_t GNUNET_NETWORK_socket_read (const struct GNUNET_NETWORK_Handle *desc, void *buf, |
79 | size_t nbyte); | 79 | size_t nbyte); |
80 | 80 | ||
81 | ssize_t GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Descriptor *desc, void *buffer, | 81 | ssize_t GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Handle *desc, void *buffer, |
82 | size_t length, int flags); | 82 | size_t length, int flags); |
83 | 83 | ||
84 | int GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds, | 84 | int GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds, |
@@ -90,34 +90,34 @@ int GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds, | |||
90 | * | 90 | * |
91 | * @return GNUNET_OK on success, GNUNET_SYSERR on error | 91 | * @return GNUNET_OK on success, GNUNET_SYSERR on error |
92 | */ | 92 | */ |
93 | int GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Descriptor *fd, int doBlock); | 93 | int GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Handle *fd, int doBlock); |
94 | 94 | ||
95 | ssize_t GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Descriptor *desc, | 95 | ssize_t GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Handle *desc, |
96 | const void *buffer, size_t length, int flags); | 96 | const void *buffer, size_t length, int flags); |
97 | 97 | ||
98 | ssize_t GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Descriptor *desc, | 98 | ssize_t GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Handle *desc, |
99 | const void *message, size_t length, int flags, | 99 | const void *message, size_t length, int flags, |
100 | const struct sockaddr *dest_addr, | 100 | const struct sockaddr *dest_addr, |
101 | socklen_t dest_len); | 101 | socklen_t dest_len); |
102 | 102 | ||
103 | int GNUNET_NETWORK_socket_setsockopt(struct GNUNET_NETWORK_Descriptor *fd, int level, int option_name, | 103 | int GNUNET_NETWORK_socket_setsockopt(struct GNUNET_NETWORK_Handle *fd, int level, int option_name, |
104 | const void *option_value, socklen_t option_len); | 104 | const void *option_value, socklen_t option_len); |
105 | 105 | ||
106 | int GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Descriptor *desc, int how); | 106 | int GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Handle *desc, int how); |
107 | 107 | ||
108 | struct GNUNET_NETWORK_Descriptor *GNUNET_NETWORK_socket_socket (int domain, int type, int protocol); | 108 | struct GNUNET_NETWORK_Handle *GNUNET_NETWORK_socket_socket (int domain, int type, int protocol); |
109 | 109 | ||
110 | ssize_t GNUNET_NETWORK_socket_write (const struct GNUNET_NETWORK_Descriptor *desc, | 110 | ssize_t GNUNET_NETWORK_socket_write (const struct GNUNET_NETWORK_Handle *desc, |
111 | const void *buf, size_t nbyte); | 111 | const void *buf, size_t nbyte); |
112 | 112 | ||
113 | 113 | ||
114 | void GNUNET_NETWORK_fdset_zero(struct GNUNET_NETWORK_FDSet *fds); | 114 | void GNUNET_NETWORK_fdset_zero(struct GNUNET_NETWORK_FDSet *fds); |
115 | 115 | ||
116 | void GNUNET_NETWORK_fdset_set(struct GNUNET_NETWORK_FDSet *fds, | 116 | void GNUNET_NETWORK_fdset_set(struct GNUNET_NETWORK_FDSet *fds, |
117 | const struct GNUNET_NETWORK_Descriptor *desc); | 117 | const struct GNUNET_NETWORK_Handle *desc); |
118 | 118 | ||
119 | int GNUNET_NETWORK_fdset_isset(const struct GNUNET_NETWORK_FDSet *fds, | 119 | int GNUNET_NETWORK_fdset_isset(const struct GNUNET_NETWORK_FDSet *fds, |
120 | const struct GNUNET_NETWORK_Descriptor *desc); | 120 | const struct GNUNET_NETWORK_Handle *desc); |
121 | 121 | ||
122 | void GNUNET_NETWORK_fdset_add (struct GNUNET_NETWORK_FDSet *dst, | 122 | void GNUNET_NETWORK_fdset_add (struct GNUNET_NETWORK_FDSet *dst, |
123 | const struct GNUNET_NETWORK_FDSet *src); | 123 | const struct GNUNET_NETWORK_FDSet *src); |
diff --git a/src/include/gnunet_scheduler_lib.h b/src/include/gnunet_scheduler_lib.h index 0ace207ec..4390a8277 100644 --- a/src/include/gnunet_scheduler_lib.h +++ b/src/include/gnunet_scheduler_lib.h | |||
@@ -350,7 +350,7 @@ GNUNET_SCHEDULER_add_read_net (struct GNUNET_SCHEDULER_Handle *sched, | |||
350 | enum GNUNET_SCHEDULER_Priority prio, | 350 | enum GNUNET_SCHEDULER_Priority prio, |
351 | GNUNET_SCHEDULER_TaskIdentifier prerequisite_task, | 351 | GNUNET_SCHEDULER_TaskIdentifier prerequisite_task, |
352 | struct GNUNET_TIME_Relative delay, | 352 | struct GNUNET_TIME_Relative delay, |
353 | struct GNUNET_NETWORK_Descriptor *rfd, GNUNET_SCHEDULER_Task main, void *cls); | 353 | struct GNUNET_NETWORK_Handle *rfd, GNUNET_SCHEDULER_Task main, void *cls); |
354 | 354 | ||
355 | 355 | ||
356 | /** | 356 | /** |
@@ -383,7 +383,7 @@ GNUNET_SCHEDULER_add_write_net (struct GNUNET_SCHEDULER_Handle *sched, | |||
383 | enum GNUNET_SCHEDULER_Priority prio, | 383 | enum GNUNET_SCHEDULER_Priority prio, |
384 | GNUNET_SCHEDULER_TaskIdentifier prerequisite_task, | 384 | GNUNET_SCHEDULER_TaskIdentifier prerequisite_task, |
385 | struct GNUNET_TIME_Relative delay, | 385 | struct GNUNET_TIME_Relative delay, |
386 | struct GNUNET_NETWORK_Descriptor *wfd, GNUNET_SCHEDULER_Task main, void *cls); | 386 | struct GNUNET_NETWORK_Handle *wfd, GNUNET_SCHEDULER_Task main, void *cls); |
387 | 387 | ||
388 | 388 | ||
389 | /** | 389 | /** |
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c index c84b2bae7..ce8a2f89c 100644 --- a/src/transport/plugin_transport_udp.c +++ b/src/transport/plugin_transport_udp.c | |||
@@ -267,10 +267,10 @@ udp_test_would_try (GNUNET_TSession * tsession, unsigned int size, | |||
267 | * Create a UDP socket. If possible, use IPv6, otherwise | 267 | * Create a UDP socket. If possible, use IPv6, otherwise |
268 | * try IPv4. Update available_protocols accordingly. | 268 | * try IPv4. Update available_protocols accordingly. |
269 | */ | 269 | */ |
270 | static struct GNUNET_NETWORK_Descriptor * | 270 | static struct GNUNET_NETWORK_Handle * |
271 | udp_create_socket () | 271 | udp_create_socket () |
272 | { | 272 | { |
273 | struct GNUNET_NETWORK_Descriptor *desc; | 273 | struct GNUNET_NETWORK_Handle *desc; |
274 | 274 | ||
275 | available_protocols = VERSION_AVAILABLE_NONE; | 275 | available_protocols = VERSION_AVAILABLE_NONE; |
276 | desc = NULL; | 276 | desc = NULL; |
@@ -416,7 +416,7 @@ udp_transport_server_start () | |||
416 | struct sockaddr_in6 serverAddrv6; | 416 | struct sockaddr_in6 serverAddrv6; |
417 | struct sockaddr *serverAddr; | 417 | struct sockaddr *serverAddr; |
418 | socklen_t addrlen; | 418 | socklen_t addrlen; |
419 | GNUNET_NETWORK_Descriptor *desc; | 419 | GNUNET_NETWORK_Handle *desc; |
420 | const int on = 1; | 420 | const int on = 1; |
421 | unsigned short port; | 421 | unsigned short port; |
422 | 422 | ||
diff --git a/src/upnp/upnp.c b/src/upnp/upnp.c index afc815b1f..8b4937cea 100644 --- a/src/upnp/upnp.c +++ b/src/upnp/upnp.c | |||
@@ -104,7 +104,7 @@ typedef struct | |||
104 | char *full_url; | 104 | char *full_url; |
105 | char *buf; | 105 | char *buf; |
106 | unsigned int buf_len; | 106 | unsigned int buf_len; |
107 | struct GNUNET_NETWORK_Descriptor *sock; | 107 | struct GNUNET_NETWORK_Handle *sock; |
108 | } UPnPDiscoveryData; | 108 | } UPnPDiscoveryData; |
109 | 109 | ||
110 | static GaimUPnPControlInfo control_info = { | 110 | static GaimUPnPControlInfo control_info = { |
@@ -543,7 +543,7 @@ gaim_upnp_parse_description (char *proxy, UPnPDiscoveryData * dd) | |||
543 | } | 543 | } |
544 | 544 | ||
545 | int | 545 | int |
546 | gaim_upnp_discover (struct GNUNET_CONFIGURATION_Handle *cfg, struct GNUNET_NETWORK_Descriptor *sock) | 546 | gaim_upnp_discover (struct GNUNET_CONFIGURATION_Handle *cfg, struct GNUNET_NETWORK_Handle *sock) |
547 | { | 547 | { |
548 | char *proxy; | 548 | char *proxy; |
549 | socklen_t avail; | 549 | socklen_t avail; |
diff --git a/src/upnp/upnp_init.c b/src/upnp/upnp_init.c index 8390494e5..b0eb77c32 100644 --- a/src/upnp/upnp_init.c +++ b/src/upnp/upnp_init.c | |||
@@ -50,7 +50,7 @@ static unsigned int maps_size; | |||
50 | 50 | ||
51 | static struct GNUNET_ThreadHandle *discovery; | 51 | static struct GNUNET_ThreadHandle *discovery; |
52 | 52 | ||
53 | static struct GNUNET_NETWORK_Descriptor *discovery_socket; | 53 | static struct GNUNET_NETWORK_Handle *discovery_socket; |
54 | 54 | ||
55 | /** | 55 | /** |
56 | * Obtain the public/external IP address. | 56 | * Obtain the public/external IP address. |
diff --git a/src/util/connection.c b/src/util/connection.c index eeb99f03c..9ae72b2dc 100644 --- a/src/util/connection.c +++ b/src/util/connection.c | |||
@@ -174,7 +174,7 @@ struct GNUNET_CONNECTION_Handle | |||
174 | /** | 174 | /** |
175 | * Underlying OS's socket, set to NULL after fatal errors. | 175 | * Underlying OS's socket, set to NULL after fatal errors. |
176 | */ | 176 | */ |
177 | struct GNUNET_NETWORK_Descriptor *sock; | 177 | struct GNUNET_NETWORK_Handle *sock; |
178 | 178 | ||
179 | /** | 179 | /** |
180 | * Port to connect to. | 180 | * Port to connect to. |
@@ -219,7 +219,7 @@ struct GNUNET_CONNECTION_Handle | |||
219 | */ | 219 | */ |
220 | struct GNUNET_CONNECTION_Handle * | 220 | struct GNUNET_CONNECTION_Handle * |
221 | GNUNET_CONNECTION_create_from_existing (struct GNUNET_SCHEDULER_Handle | 221 | GNUNET_CONNECTION_create_from_existing (struct GNUNET_SCHEDULER_Handle |
222 | *sched, struct GNUNET_NETWORK_Descriptor *osSocket, | 222 | *sched, struct GNUNET_NETWORK_Handle *osSocket, |
223 | size_t maxbuf) | 223 | size_t maxbuf) |
224 | { | 224 | { |
225 | struct GNUNET_CONNECTION_Handle *ret; | 225 | struct GNUNET_CONNECTION_Handle *ret; |
@@ -248,13 +248,13 @@ struct GNUNET_CONNECTION_Handle * | |||
248 | GNUNET_CONNECTION_create_from_accept (struct GNUNET_SCHEDULER_Handle | 248 | GNUNET_CONNECTION_create_from_accept (struct GNUNET_SCHEDULER_Handle |
249 | *sched, | 249 | *sched, |
250 | GNUNET_CONNECTION_AccessCheck access, | 250 | GNUNET_CONNECTION_AccessCheck access, |
251 | void *access_cls, struct GNUNET_NETWORK_Descriptor *lsock, | 251 | void *access_cls, struct GNUNET_NETWORK_Handle *lsock, |
252 | size_t maxbuf) | 252 | size_t maxbuf) |
253 | { | 253 | { |
254 | struct GNUNET_CONNECTION_Handle *ret; | 254 | struct GNUNET_CONNECTION_Handle *ret; |
255 | char addr[32]; | 255 | char addr[32]; |
256 | socklen_t addrlen; | 256 | socklen_t addrlen; |
257 | struct GNUNET_NETWORK_Descriptor *sock; | 257 | struct GNUNET_NETWORK_Handle *sock; |
258 | int aret; | 258 | int aret; |
259 | struct sockaddr_in *v4; | 259 | struct sockaddr_in *v4; |
260 | struct sockaddr_in6 *v6; | 260 | struct sockaddr_in6 *v6; |
@@ -389,7 +389,7 @@ try_lookup (struct GNUNET_CONNECTION_Handle *sock) | |||
389 | static int | 389 | static int |
390 | try_connect (struct GNUNET_CONNECTION_Handle *sock) | 390 | try_connect (struct GNUNET_CONNECTION_Handle *sock) |
391 | { | 391 | { |
392 | struct GNUNET_NETWORK_Descriptor *s; | 392 | struct GNUNET_NETWORK_Handle *s; |
393 | 393 | ||
394 | if (sock->addr != NULL) | 394 | if (sock->addr != NULL) |
395 | { | 395 | { |
@@ -598,7 +598,7 @@ GNUNET_CONNECTION_create_from_sockaddr (struct GNUNET_SCHEDULER_Handle | |||
598 | const struct sockaddr *serv_addr, | 598 | const struct sockaddr *serv_addr, |
599 | socklen_t addrlen, size_t maxbuf) | 599 | socklen_t addrlen, size_t maxbuf) |
600 | { | 600 | { |
601 | struct GNUNET_NETWORK_Descriptor *s; | 601 | struct GNUNET_NETWORK_Handle *s; |
602 | struct GNUNET_CONNECTION_Handle *ret; | 602 | struct GNUNET_CONNECTION_Handle *ret; |
603 | 603 | ||
604 | s = GNUNET_NETWORK_socket_socket (af_family, SOCK_STREAM, 0); | 604 | s = GNUNET_NETWORK_socket_socket (af_family, SOCK_STREAM, 0); |
diff --git a/src/util/network.c b/src/util/network.c index 9c50d6fcd..ebf329102 100644 --- a/src/util/network.c +++ b/src/util/network.c | |||
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | #define DEBUG_SOCK GNUNET_NO | 32 | #define DEBUG_SOCK GNUNET_NO |
33 | 33 | ||
34 | struct GNUNET_NETWORK_Descriptor | 34 | struct GNUNET_NETWORK_Handle |
35 | { | 35 | { |
36 | int fd; | 36 | int fd; |
37 | }; | 37 | }; |
@@ -51,14 +51,14 @@ struct GNUNET_NETWORK_FDSet | |||
51 | #define FD_COPY(s, d) (memcpy ((d), (s), sizeof (fd_set))) | 51 | #define FD_COPY(s, d) (memcpy ((d), (s), sizeof (fd_set))) |
52 | #endif | 52 | #endif |
53 | 53 | ||
54 | struct GNUNET_NETWORK_Descriptor * | 54 | struct GNUNET_NETWORK_Handle * |
55 | GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Descriptor *desc, | 55 | GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc, |
56 | struct sockaddr *address, | 56 | struct sockaddr *address, |
57 | socklen_t * address_len) | 57 | socklen_t * address_len) |
58 | { | 58 | { |
59 | struct GNUNET_NETWORK_Descriptor *ret; | 59 | struct GNUNET_NETWORK_Handle *ret; |
60 | 60 | ||
61 | ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Descriptor)); | 61 | ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle)); |
62 | ret->fd = accept (desc->fd, address, address_len); | 62 | ret->fd = accept (desc->fd, address, address_len); |
63 | #ifdef MINGW | 63 | #ifdef MINGW |
64 | if (INVALID_SOCKET == ret->fd) | 64 | if (INVALID_SOCKET == ret->fd) |
@@ -68,7 +68,7 @@ GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Descriptor *desc, | |||
68 | } | 68 | } |
69 | 69 | ||
70 | int | 70 | int |
71 | GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Descriptor *desc, | 71 | GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc, |
72 | const struct sockaddr *address, | 72 | const struct sockaddr *address, |
73 | socklen_t address_len) | 73 | socklen_t address_len) |
74 | { | 74 | { |
@@ -88,7 +88,7 @@ GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Descriptor *desc, | |||
88 | * @return GNUNET_OK on success, GNUNET_SYSERR on error | 88 | * @return GNUNET_OK on success, GNUNET_SYSERR on error |
89 | */ | 89 | */ |
90 | int | 90 | int |
91 | GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Descriptor *fd, | 91 | GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Handle *fd, |
92 | int doBlock) | 92 | int doBlock) |
93 | { | 93 | { |
94 | #if MINGW | 94 | #if MINGW |
@@ -124,7 +124,7 @@ GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Descriptor *fd, | |||
124 | } | 124 | } |
125 | 125 | ||
126 | int | 126 | int |
127 | GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Descriptor *desc) | 127 | GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Handle *desc) |
128 | { | 128 | { |
129 | int ret; | 129 | int ret; |
130 | #ifdef MINGW | 130 | #ifdef MINGW |
@@ -145,7 +145,7 @@ GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Descriptor *desc) | |||
145 | } | 145 | } |
146 | 146 | ||
147 | int | 147 | int |
148 | GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Descriptor *desc, | 148 | GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Handle *desc, |
149 | const struct sockaddr *address, | 149 | const struct sockaddr *address, |
150 | socklen_t address_len) | 150 | socklen_t address_len) |
151 | { | 151 | { |
@@ -160,7 +160,7 @@ GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Descriptor *desc, | |||
160 | } | 160 | } |
161 | 161 | ||
162 | int | 162 | int |
163 | GNUNET_NETWORK_socket_getsockopt (const struct GNUNET_NETWORK_Descriptor *desc, | 163 | GNUNET_NETWORK_socket_getsockopt (const struct GNUNET_NETWORK_Handle *desc, |
164 | int level, int optname, void *optval, | 164 | int level, int optname, void *optval, |
165 | socklen_t * optlen) | 165 | socklen_t * optlen) |
166 | { | 166 | { |
@@ -177,7 +177,7 @@ GNUNET_NETWORK_socket_getsockopt (const struct GNUNET_NETWORK_Descriptor *desc, | |||
177 | } | 177 | } |
178 | 178 | ||
179 | int | 179 | int |
180 | GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Descriptor *desc, | 180 | GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Handle *desc, |
181 | int backlog) | 181 | int backlog) |
182 | { | 182 | { |
183 | int ret; | 183 | int ret; |
@@ -192,7 +192,7 @@ GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Descriptor *desc, | |||
192 | } | 192 | } |
193 | 193 | ||
194 | ssize_t | 194 | ssize_t |
195 | GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Descriptor * desc, | 195 | GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Handle * desc, |
196 | void *buffer, size_t length, int flags) | 196 | void *buffer, size_t length, int flags) |
197 | { | 197 | { |
198 | int ret; | 198 | int ret; |
@@ -207,7 +207,7 @@ GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Descriptor * desc, | |||
207 | } | 207 | } |
208 | 208 | ||
209 | ssize_t | 209 | ssize_t |
210 | GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Descriptor * desc, | 210 | GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Handle * desc, |
211 | const void *buffer, size_t length, int flags) | 211 | const void *buffer, size_t length, int flags) |
212 | { | 212 | { |
213 | int ret; | 213 | int ret; |
@@ -222,7 +222,7 @@ GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Descriptor * desc, | |||
222 | } | 222 | } |
223 | 223 | ||
224 | ssize_t | 224 | ssize_t |
225 | GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Descriptor * desc, | 225 | GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Handle * desc, |
226 | const void *message, size_t length, int flags, | 226 | const void *message, size_t length, int flags, |
227 | const struct sockaddr * dest_addr, | 227 | const struct sockaddr * dest_addr, |
228 | socklen_t dest_len) | 228 | socklen_t dest_len) |
@@ -239,7 +239,7 @@ GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Descriptor * desc, | |||
239 | } | 239 | } |
240 | 240 | ||
241 | int | 241 | int |
242 | GNUNET_NETWORK_socket_setsockopt (struct GNUNET_NETWORK_Descriptor *fd, | 242 | GNUNET_NETWORK_socket_setsockopt (struct GNUNET_NETWORK_Handle *fd, |
243 | int level, int option_name, | 243 | int level, int option_name, |
244 | const void *option_value, | 244 | const void *option_value, |
245 | socklen_t option_len) | 245 | socklen_t option_len) |
@@ -255,12 +255,12 @@ GNUNET_NETWORK_socket_setsockopt (struct GNUNET_NETWORK_Descriptor *fd, | |||
255 | return ret; | 255 | return ret; |
256 | } | 256 | } |
257 | 257 | ||
258 | struct GNUNET_NETWORK_Descriptor * | 258 | struct GNUNET_NETWORK_Handle * |
259 | GNUNET_NETWORK_socket_socket (int domain, int type, int protocol) | 259 | GNUNET_NETWORK_socket_socket (int domain, int type, int protocol) |
260 | { | 260 | { |
261 | struct GNUNET_NETWORK_Descriptor *ret; | 261 | struct GNUNET_NETWORK_Handle *ret; |
262 | 262 | ||
263 | ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Descriptor)); | 263 | ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle)); |
264 | ret->fd = socket (domain, type, protocol); | 264 | ret->fd = socket (domain, type, protocol); |
265 | #ifdef MINGW | 265 | #ifdef MINGW |
266 | if (INVALID_SOCKET == ret->fd) | 266 | if (INVALID_SOCKET == ret->fd) |
@@ -277,7 +277,7 @@ GNUNET_NETWORK_socket_socket (int domain, int type, int protocol) | |||
277 | } | 277 | } |
278 | 278 | ||
279 | int | 279 | int |
280 | GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Descriptor *desc, | 280 | GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Handle *desc, |
281 | int how) | 281 | int how) |
282 | { | 282 | { |
283 | int ret; | 283 | int ret; |
@@ -292,7 +292,7 @@ GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Descriptor *desc, | |||
292 | } | 292 | } |
293 | 293 | ||
294 | int | 294 | int |
295 | GNUNET_NETWORK_socket_set_inheritable (const struct GNUNET_NETWORK_Descriptor | 295 | GNUNET_NETWORK_socket_set_inheritable (const struct GNUNET_NETWORK_Handle |
296 | *desc) | 296 | *desc) |
297 | { | 297 | { |
298 | #ifdef MINGW | 298 | #ifdef MINGW |
@@ -320,7 +320,7 @@ GNUNET_NETWORK_fdset_zero (struct GNUNET_NETWORK_FDSet *fds) | |||
320 | 320 | ||
321 | void | 321 | void |
322 | GNUNET_NETWORK_fdset_set (struct GNUNET_NETWORK_FDSet *fds, | 322 | GNUNET_NETWORK_fdset_set (struct GNUNET_NETWORK_FDSet *fds, |
323 | const struct GNUNET_NETWORK_Descriptor *desc) | 323 | const struct GNUNET_NETWORK_Handle *desc) |
324 | { | 324 | { |
325 | FD_SET (desc->fd, &fds->sds); | 325 | FD_SET (desc->fd, &fds->sds); |
326 | 326 | ||
@@ -330,7 +330,7 @@ GNUNET_NETWORK_fdset_set (struct GNUNET_NETWORK_FDSet *fds, | |||
330 | 330 | ||
331 | int | 331 | int |
332 | GNUNET_NETWORK_fdset_isset (const struct GNUNET_NETWORK_FDSet *fds, | 332 | GNUNET_NETWORK_fdset_isset (const struct GNUNET_NETWORK_FDSet *fds, |
333 | const struct GNUNET_NETWORK_Descriptor *desc) | 333 | const struct GNUNET_NETWORK_Handle *desc) |
334 | { | 334 | { |
335 | return FD_ISSET (desc->fd, &fds->sds); | 335 | return FD_ISSET (desc->fd, &fds->sds); |
336 | } | 336 | } |
diff --git a/src/util/scheduler.c b/src/util/scheduler.c index 69a5a83e1..5643a25d0 100644 --- a/src/util/scheduler.c +++ b/src/util/scheduler.c | |||
@@ -739,7 +739,7 @@ GNUNET_SCHEDULER_add_read_net (struct GNUNET_SCHEDULER_Handle * sched, | |||
739 | enum GNUNET_SCHEDULER_Priority prio, | 739 | enum GNUNET_SCHEDULER_Priority prio, |
740 | GNUNET_SCHEDULER_TaskIdentifier prerequisite_task, | 740 | GNUNET_SCHEDULER_TaskIdentifier prerequisite_task, |
741 | struct GNUNET_TIME_Relative delay, | 741 | struct GNUNET_TIME_Relative delay, |
742 | struct GNUNET_NETWORK_Descriptor *rfd, GNUNET_SCHEDULER_Task main, void *cls) | 742 | struct GNUNET_NETWORK_Handle *rfd, GNUNET_SCHEDULER_Task main, void *cls) |
743 | { | 743 | { |
744 | struct GNUNET_NETWORK_FDSet *rs; | 744 | struct GNUNET_NETWORK_FDSet *rs; |
745 | GNUNET_SCHEDULER_TaskIdentifier ret; | 745 | GNUNET_SCHEDULER_TaskIdentifier ret; |
@@ -785,7 +785,7 @@ GNUNET_SCHEDULER_add_write_net (struct GNUNET_SCHEDULER_Handle * sched, | |||
785 | enum GNUNET_SCHEDULER_Priority prio, | 785 | enum GNUNET_SCHEDULER_Priority prio, |
786 | GNUNET_SCHEDULER_TaskIdentifier prerequisite_task, | 786 | GNUNET_SCHEDULER_TaskIdentifier prerequisite_task, |
787 | struct GNUNET_TIME_Relative delay, | 787 | struct GNUNET_TIME_Relative delay, |
788 | struct GNUNET_NETWORK_Descriptor *wfd, GNUNET_SCHEDULER_Task main, void *cls) | 788 | struct GNUNET_NETWORK_Handle *wfd, GNUNET_SCHEDULER_Task main, void *cls) |
789 | { | 789 | { |
790 | struct GNUNET_NETWORK_FDSet *ws; | 790 | struct GNUNET_NETWORK_FDSet *ws; |
791 | GNUNET_SCHEDULER_TaskIdentifier ret; | 791 | GNUNET_SCHEDULER_TaskIdentifier ret; |
diff --git a/src/util/server.c b/src/util/server.c index c05247a63..ca084e622 100644 --- a/src/util/server.c +++ b/src/util/server.c | |||
@@ -131,7 +131,7 @@ struct GNUNET_SERVER_Handle | |||
131 | * Socket used to listen for new connections. Set to | 131 | * Socket used to listen for new connections. Set to |
132 | * "-1" by GNUNET_SERVER_destroy to initiate shutdown. | 132 | * "-1" by GNUNET_SERVER_destroy to initiate shutdown. |
133 | */ | 133 | */ |
134 | struct GNUNET_NETWORK_Descriptor *listen_socket; | 134 | struct GNUNET_NETWORK_Handle *listen_socket; |
135 | 135 | ||
136 | /** | 136 | /** |
137 | * Set to GNUNET_YES if we are shutting down. | 137 | * Set to GNUNET_YES if we are shutting down. |
@@ -368,11 +368,11 @@ process_listen_socket (void *cls, | |||
368 | * | 368 | * |
369 | * @return NULL on error, otherwise the listen socket | 369 | * @return NULL on error, otherwise the listen socket |
370 | */ | 370 | */ |
371 | static struct GNUNET_NETWORK_Descriptor * | 371 | static struct GNUNET_NETWORK_Handle * |
372 | open_listen_socket (const struct sockaddr *serverAddr, socklen_t socklen) | 372 | open_listen_socket (const struct sockaddr *serverAddr, socklen_t socklen) |
373 | { | 373 | { |
374 | const static int on = 1; | 374 | const static int on = 1; |
375 | struct GNUNET_NETWORK_Descriptor *sock; | 375 | struct GNUNET_NETWORK_Handle *sock; |
376 | uint16_t port; | 376 | uint16_t port; |
377 | 377 | ||
378 | switch (serverAddr->sa_family) | 378 | switch (serverAddr->sa_family) |
@@ -454,7 +454,7 @@ GNUNET_SERVER_create (struct GNUNET_SCHEDULER_Handle *sched, | |||
454 | idle_timeout, int require_found) | 454 | idle_timeout, int require_found) |
455 | { | 455 | { |
456 | struct GNUNET_SERVER_Handle *ret; | 456 | struct GNUNET_SERVER_Handle *ret; |
457 | struct GNUNET_NETWORK_Descriptor *lsock; | 457 | struct GNUNET_NETWORK_Handle *lsock; |
458 | struct GNUNET_NETWORK_FDSet *r; | 458 | struct GNUNET_NETWORK_FDSet *r; |
459 | 459 | ||
460 | lsock = NULL; | 460 | lsock = NULL; |
diff --git a/src/util/service.c b/src/util/service.c index 782c70fe9..1f363788e 100644 --- a/src/util/service.c +++ b/src/util/service.c | |||
@@ -813,7 +813,7 @@ setup_service (struct GNUNET_SERVICE_Context *sctx) | |||
813 | 813 | ||
814 | if (!disablev6) | 814 | if (!disablev6) |
815 | { | 815 | { |
816 | struct GNUNET_NETWORK_Descriptor *desc; | 816 | struct GNUNET_NETWORK_Handle *desc; |
817 | 817 | ||
818 | /* probe IPv6 support */ | 818 | /* probe IPv6 support */ |
819 | desc = GNUNET_NETWORK_socket_socket (PF_INET6, SOCK_STREAM, 0); | 819 | desc = GNUNET_NETWORK_socket_socket (PF_INET6, SOCK_STREAM, 0); |
diff --git a/src/util/test_connection.c b/src/util/test_connection.c index 770b34e8c..dfa6d70b4 100644 --- a/src/util/test_connection.c +++ b/src/util/test_connection.c | |||
@@ -40,7 +40,7 @@ static struct GNUNET_CONNECTION_Handle *lsock; | |||
40 | 40 | ||
41 | static size_t sofar; | 41 | static size_t sofar; |
42 | 42 | ||
43 | static struct GNUNET_NETWORK_Descriptor *ls; | 43 | static struct GNUNET_NETWORK_Handle *ls; |
44 | 44 | ||
45 | 45 | ||
46 | 46 | ||
@@ -49,12 +49,12 @@ static struct GNUNET_NETWORK_Descriptor *ls; | |||
49 | * | 49 | * |
50 | * @return -1 on error, otherwise the listen socket | 50 | * @return -1 on error, otherwise the listen socket |
51 | */ | 51 | */ |
52 | static struct GNUNET_NETWORK_Descriptor * | 52 | static struct GNUNET_NETWORK_Handle * |
53 | open_listen_socket () | 53 | open_listen_socket () |
54 | { | 54 | { |
55 | const static int on = 1; | 55 | const static int on = 1; |
56 | struct sockaddr_in sa; | 56 | struct sockaddr_in sa; |
57 | struct GNUNET_NETWORK_Descriptor *desc; | 57 | struct GNUNET_NETWORK_Handle *desc; |
58 | 58 | ||
59 | memset (&sa, 0, sizeof (sa)); | 59 | memset (&sa, 0, sizeof (sa)); |
60 | sa.sin_port = htons (PORT); | 60 | sa.sin_port = htons (PORT); |
diff --git a/src/util/test_connection_addressing.c b/src/util/test_connection_addressing.c index de11560d3..17ef4d11a 100644 --- a/src/util/test_connection_addressing.c +++ b/src/util/test_connection_addressing.c | |||
@@ -40,7 +40,7 @@ static struct GNUNET_CONNECTION_Handle *lsock; | |||
40 | 40 | ||
41 | static size_t sofar; | 41 | static size_t sofar; |
42 | 42 | ||
43 | static struct GNUNET_NETWORK_Descriptor *ls; | 43 | static struct GNUNET_NETWORK_Handle *ls; |
44 | 44 | ||
45 | 45 | ||
46 | 46 | ||
@@ -49,12 +49,12 @@ static struct GNUNET_NETWORK_Descriptor *ls; | |||
49 | * | 49 | * |
50 | * @return NULL on error, otherwise the listen socket | 50 | * @return NULL on error, otherwise the listen socket |
51 | */ | 51 | */ |
52 | static struct GNUNET_NETWORK_Descriptor * | 52 | static struct GNUNET_NETWORK_Handle * |
53 | open_listen_socket () | 53 | open_listen_socket () |
54 | { | 54 | { |
55 | const static int on = 1; | 55 | const static int on = 1; |
56 | struct sockaddr_in sa; | 56 | struct sockaddr_in sa; |
57 | struct GNUNET_NETWORK_Descriptor *desc; | 57 | struct GNUNET_NETWORK_Handle *desc; |
58 | 58 | ||
59 | memset (&sa, 0, sizeof (sa)); | 59 | memset (&sa, 0, sizeof (sa)); |
60 | sa.sin_port = htons (PORT); | 60 | sa.sin_port = htons (PORT); |
diff --git a/src/util/test_connection_receive_cancel.c b/src/util/test_connection_receive_cancel.c index eb9d906ff..aa1340e02 100644 --- a/src/util/test_connection_receive_cancel.c +++ b/src/util/test_connection_receive_cancel.c | |||
@@ -38,7 +38,7 @@ static struct GNUNET_CONNECTION_Handle *asock; | |||
38 | 38 | ||
39 | static struct GNUNET_CONNECTION_Handle *lsock; | 39 | static struct GNUNET_CONNECTION_Handle *lsock; |
40 | 40 | ||
41 | static struct GNUNET_NETWORK_Descriptor *ls; | 41 | static struct GNUNET_NETWORK_Handle *ls; |
42 | 42 | ||
43 | static GNUNET_SCHEDULER_TaskIdentifier receive_task; | 43 | static GNUNET_SCHEDULER_TaskIdentifier receive_task; |
44 | 44 | ||
@@ -50,12 +50,12 @@ static GNUNET_SCHEDULER_TaskIdentifier receive_task; | |||
50 | * | 50 | * |
51 | * @return NULL on error, otherwise the listen socket | 51 | * @return NULL on error, otherwise the listen socket |
52 | */ | 52 | */ |
53 | static struct GNUNET_NETWORK_Descriptor * | 53 | static struct GNUNET_NETWORK_Handle * |
54 | open_listen_socket () | 54 | open_listen_socket () |
55 | { | 55 | { |
56 | const static int on = 1; | 56 | const static int on = 1; |
57 | struct sockaddr_in sa; | 57 | struct sockaddr_in sa; |
58 | struct GNUNET_NETWORK_Descriptor *desc; | 58 | struct GNUNET_NETWORK_Handle *desc; |
59 | 59 | ||
60 | memset (&sa, 0, sizeof (sa)); | 60 | memset (&sa, 0, sizeof (sa)); |
61 | sa.sin_port = htons (PORT); | 61 | sa.sin_port = htons (PORT); |
diff --git a/src/util/test_connection_timeout.c b/src/util/test_connection_timeout.c index 289bb102a..2580ae30a 100644 --- a/src/util/test_connection_timeout.c +++ b/src/util/test_connection_timeout.c | |||
@@ -35,7 +35,7 @@ static struct GNUNET_CONNECTION_Handle *csock; | |||
35 | 35 | ||
36 | static struct GNUNET_CONNECTION_Handle *lsock; | 36 | static struct GNUNET_CONNECTION_Handle *lsock; |
37 | 37 | ||
38 | static struct GNUNET_NETWORK_Descriptor *ls; | 38 | static struct GNUNET_NETWORK_Handle *ls; |
39 | 39 | ||
40 | 40 | ||
41 | /** | 41 | /** |
@@ -43,12 +43,12 @@ static struct GNUNET_NETWORK_Descriptor *ls; | |||
43 | * | 43 | * |
44 | * @return NULL on error, otherwise the listen socket | 44 | * @return NULL on error, otherwise the listen socket |
45 | */ | 45 | */ |
46 | static struct GNUNET_NETWORK_Descriptor * | 46 | static struct GNUNET_NETWORK_Handle * |
47 | open_listen_socket () | 47 | open_listen_socket () |
48 | { | 48 | { |
49 | const static int on = 1; | 49 | const static int on = 1; |
50 | struct sockaddr_in sa; | 50 | struct sockaddr_in sa; |
51 | struct GNUNET_NETWORK_Descriptor *desc; | 51 | struct GNUNET_NETWORK_Handle *desc; |
52 | 52 | ||
53 | memset (&sa, 0, sizeof (sa)); | 53 | memset (&sa, 0, sizeof (sa)); |
54 | sa.sin_port = htons (PORT); | 54 | sa.sin_port = htons (PORT); |
diff --git a/src/util/test_service.c b/src/util/test_service.c index 8e351deb3..e0cfe28ac 100644 --- a/src/util/test_service.c +++ b/src/util/test_service.c | |||
@@ -300,7 +300,7 @@ int | |||
300 | main (int argc, char *argv[]) | 300 | main (int argc, char *argv[]) |
301 | { | 301 | { |
302 | int ret = 0; | 302 | int ret = 0; |
303 | struct GNUNET_NETWORK_Descriptor *s; | 303 | struct GNUNET_NETWORK_Handle *s; |
304 | 304 | ||
305 | GNUNET_log_setup ("test-service", | 305 | GNUNET_log_setup ("test-service", |
306 | #if VERBOSE | 306 | #if VERBOSE |