diff options
Diffstat (limited to 'src/include/gnunet_connection_lib.h')
-rw-r--r-- | src/include/gnunet_connection_lib.h | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/src/include/gnunet_connection_lib.h b/src/include/gnunet_connection_lib.h index d5942236b..33afb0386 100644 --- a/src/include/gnunet_connection_lib.h +++ b/src/include/gnunet_connection_lib.h | |||
@@ -99,15 +99,11 @@ GNUNET_CONNECTION_persist_(struct GNUNET_CONNECTION_Handle *sock); | |||
99 | * socket should henceforth be no longer used directly. | 99 | * socket should henceforth be no longer used directly. |
100 | * GNUNET_socket_destroy will close it. | 100 | * GNUNET_socket_destroy will close it. |
101 | * | 101 | * |
102 | * @param sched scheduler to use | ||
103 | * @param osSocket existing socket to box | 102 | * @param osSocket existing socket to box |
104 | * @return the boxed socket handle | 103 | * @return the boxed socket handle |
105 | */ | 104 | */ |
106 | struct GNUNET_CONNECTION_Handle | 105 | struct GNUNET_CONNECTION_Handle |
107 | *GNUNET_CONNECTION_create_from_existing (struct | 106 | *GNUNET_CONNECTION_create_from_existing (struct |
108 | GNUNET_SCHEDULER_Handle | ||
109 | *sched, | ||
110 | struct | ||
111 | GNUNET_NETWORK_Handle | 107 | GNUNET_NETWORK_Handle |
112 | *osSocket); | 108 | *osSocket); |
113 | 109 | ||
@@ -116,17 +112,13 @@ struct GNUNET_CONNECTION_Handle | |||
116 | * Create a socket handle by accepting on a listen socket. This | 112 | * Create a socket handle by accepting on a listen socket. This |
117 | * function may block if the listen socket has no connection ready. | 113 | * function may block if the listen socket has no connection ready. |
118 | * | 114 | * |
119 | * @param sched scheduler to use | ||
120 | * @param access function to use to check if access is allowed | 115 | * @param access function to use to check if access is allowed |
121 | * @param access_cls closure for access | 116 | * @param access_cls closure for access |
122 | * @param lsock listen socket | 117 | * @param lsock listen socket |
123 | * @return the socket handle, NULL on error (for example, access refused) | 118 | * @return the socket handle, NULL on error (for example, access refused) |
124 | */ | 119 | */ |
125 | struct GNUNET_CONNECTION_Handle | 120 | struct GNUNET_CONNECTION_Handle |
126 | *GNUNET_CONNECTION_create_from_accept (struct | 121 | *GNUNET_CONNECTION_create_from_accept (GNUNET_CONNECTION_AccessCheck |
127 | GNUNET_SCHEDULER_Handle | ||
128 | *sched, | ||
129 | GNUNET_CONNECTION_AccessCheck | ||
130 | access, void *access_cls, | 122 | access, void *access_cls, |
131 | struct | 123 | struct |
132 | GNUNET_NETWORK_Handle | 124 | GNUNET_NETWORK_Handle |
@@ -138,15 +130,13 @@ struct GNUNET_CONNECTION_Handle | |||
138 | * This function returns immediately, even if the connection has not | 130 | * This function returns immediately, even if the connection has not |
139 | * yet been established. This function only creates TCP connections. | 131 | * yet been established. This function only creates TCP connections. |
140 | * | 132 | * |
141 | * @param sched scheduler to use | ||
142 | * @param cfg configuration to use | 133 | * @param cfg configuration to use |
143 | * @param hostname name of the host to connect to | 134 | * @param hostname name of the host to connect to |
144 | * @param port port to connect to | 135 | * @param port port to connect to |
145 | * @return the socket handle | 136 | * @return the socket handle |
146 | */ | 137 | */ |
147 | struct GNUNET_CONNECTION_Handle | 138 | struct GNUNET_CONNECTION_Handle |
148 | *GNUNET_CONNECTION_create_from_connect (struct GNUNET_SCHEDULER_Handle *sched, | 139 | *GNUNET_CONNECTION_create_from_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, |
149 | const struct GNUNET_CONFIGURATION_Handle *cfg, | ||
150 | const char *hostname, | 140 | const char *hostname, |
151 | uint16_t port); | 141 | uint16_t port); |
152 | 142 | ||
@@ -156,14 +146,12 @@ struct GNUNET_CONNECTION_Handle | |||
156 | * This function returns immediately, even if the connection has not | 146 | * This function returns immediately, even if the connection has not |
157 | * yet been established. This function only creates UNIX connections. | 147 | * yet been established. This function only creates UNIX connections. |
158 | * | 148 | * |
159 | * @param sched scheduler to use | ||
160 | * @param cfg configuration to use | 149 | * @param cfg configuration to use |
161 | * @param unixpath path to connect to) | 150 | * @param unixpath path to connect to) |
162 | * @return the socket handle, NULL on systems without UNIX support | 151 | * @return the socket handle, NULL on systems without UNIX support |
163 | */ | 152 | */ |
164 | struct GNUNET_CONNECTION_Handle * | 153 | struct GNUNET_CONNECTION_Handle * |
165 | GNUNET_CONNECTION_create_from_connect_to_unixpath (struct GNUNET_SCHEDULER_Handle *sched, | 154 | GNUNET_CONNECTION_create_from_connect_to_unixpath (const struct |
166 | const struct | ||
167 | GNUNET_CONFIGURATION_Handle *cfg, | 155 | GNUNET_CONFIGURATION_Handle *cfg, |
168 | const char *unixpath); | 156 | const char *unixpath); |
169 | 157 | ||
@@ -175,16 +163,13 @@ GNUNET_CONNECTION_create_from_connect_to_unixpath (struct GNUNET_SCHEDULER_Handl | |||
175 | * This function returns immediately, even if the connection has not | 163 | * This function returns immediately, even if the connection has not |
176 | * yet been established. This function only creates TCP connections. | 164 | * yet been established. This function only creates TCP connections. |
177 | * | 165 | * |
178 | * @param sched scheduler to use | ||
179 | * @param af_family address family to use | 166 | * @param af_family address family to use |
180 | * @param serv_addr server address | 167 | * @param serv_addr server address |
181 | * @param addrlen length of server address | 168 | * @param addrlen length of server address |
182 | * @return the socket handle | 169 | * @return the socket handle |
183 | */ | 170 | */ |
184 | struct GNUNET_CONNECTION_Handle | 171 | struct GNUNET_CONNECTION_Handle |
185 | *GNUNET_CONNECTION_create_from_sockaddr (struct | 172 | *GNUNET_CONNECTION_create_from_sockaddr (int af_family, |
186 | GNUNET_SCHEDULER_Handle | ||
187 | *sched, int af_family, | ||
188 | const struct sockaddr | 173 | const struct sockaddr |
189 | *serv_addr, | 174 | *serv_addr, |
190 | socklen_t addrlen); | 175 | socklen_t addrlen); |