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/include/gnunet_network_lib.h | |
parent | deaec843661af71fbea06125f79375e70c967345 (diff) | |
download | gnunet-cabc8ba699f76cab751b97014d9375ec74612448.tar.gz gnunet-cabc8ba699f76cab751b97014d9375ec74612448.zip |
naming
Diffstat (limited to 'src/include/gnunet_network_lib.h')
-rw-r--r-- | src/include/gnunet_network_lib.h | 40 |
1 files changed, 20 insertions, 20 deletions
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); |