diff options
Diffstat (limited to 'src/nat/upnp-commands.h')
-rw-r--r-- | src/nat/upnp-commands.h | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/nat/upnp-commands.h b/src/nat/upnp-commands.h index 8e7510dbf..4f3cdc33c 100644 --- a/src/nat/upnp-commands.h +++ b/src/nat/upnp-commands.h | |||
@@ -94,7 +94,6 @@ typedef void (*UPNP_command_cb_) (char *response, size_t received, void *cls); | |||
94 | /** | 94 | /** |
95 | * Send UPnP command to the device identified by url and service. | 95 | * Send UPnP command to the device identified by url and service. |
96 | * | 96 | * |
97 | * @param sched scheduler to use for network tasks | ||
98 | * @param url control URL of the device | 97 | * @param url control URL of the device |
99 | * @param service type of the service corresponding to the command | 98 | * @param service type of the service corresponding to the command |
100 | * @param action action to send | 99 | * @param action action to send |
@@ -102,8 +101,7 @@ typedef void (*UPNP_command_cb_) (char *response, size_t received, void *cls); | |||
102 | * @param caller_cb user callback to trigger when done | 101 | * @param caller_cb user callback to trigger when done |
103 | * @param caller_cls closure to pass to caller_cb | 102 | * @param caller_cls closure to pass to caller_cb |
104 | */ | 103 | */ |
105 | void UPNP_command_ (struct GNUNET_SCHEDULER_Handle *sched, | 104 | void UPNP_command_ (const char *url, const char *service, |
106 | const char *url, const char *service, | ||
107 | const char *action, struct UPNP_Arg_ *args, | 105 | const char *action, struct UPNP_Arg_ *args, |
108 | char *buffer, size_t buf_size, | 106 | char *buffer, size_t buf_size, |
109 | UPNP_command_cb_ caller_cb, void *caller_cls); | 107 | UPNP_command_cb_ caller_cb, void *caller_cls); |
@@ -127,15 +125,13 @@ typedef void (*UPNP_get_external_ip_address_cb_) (int error, | |||
127 | * Get the IP address associated with the WAN connection of the device. | 125 | * Get the IP address associated with the WAN connection of the device. |
128 | * See UPNP_get_external_ip_address_cb_. | 126 | * See UPNP_get_external_ip_address_cb_. |
129 | * | 127 | * |
130 | * @param sched the scheduler to use for networking | ||
131 | * @param control_url the control URL corresponding to service_type on the device | 128 | * @param control_url the control URL corresponding to service_type on the device |
132 | * @param service_type service type to call the command on | 129 | * @param service_type service type to call the command on |
133 | * @param caller_cb function to call when done | 130 | * @param caller_cb function to call when done |
134 | * @param cls closure passed to caller_cb | 131 | * @param cls closure passed to caller_cb |
135 | */ | 132 | */ |
136 | void | 133 | void |
137 | UPNP_get_external_ip_address_ (struct GNUNET_SCHEDULER_Handle *sched, | 134 | UPNP_get_external_ip_address_ (const char *control_url, |
138 | const char *control_url, | ||
139 | const char *service_type, | 135 | const char *service_type, |
140 | UPNP_get_external_ip_address_cb_ caller_cb, | 136 | UPNP_get_external_ip_address_cb_ caller_cb, |
141 | void *caller_cls); | 137 | void *caller_cls); |
@@ -185,7 +181,6 @@ typedef void (*UPNP_port_mapping_cb_) (int error, | |||
185 | * Request opening a port on the IGD device. | 181 | * Request opening a port on the IGD device. |
186 | * (remote_host is usually NULL because IGDs don't support it.) | 182 | * (remote_host is usually NULL because IGDs don't support it.) |
187 | * | 183 | * |
188 | * @param sched the scheduler to use for networking | ||
189 | * @param control_url the control URL corresponding to service_type on the device | 184 | * @param control_url the control URL corresponding to service_type on the device |
190 | * @param service_type service type to call the command on | 185 | * @param service_type service type to call the command on |
191 | * @param ext_port port that should be opened on the WAN side | 186 | * @param ext_port port that should be opened on the WAN side |
@@ -197,8 +192,7 @@ typedef void (*UPNP_port_mapping_cb_) (int error, | |||
197 | * @param cls closure passed to caller_cb | 192 | * @param cls closure passed to caller_cb |
198 | */ | 193 | */ |
199 | void | 194 | void |
200 | UPNP_add_port_mapping_ (struct GNUNET_SCHEDULER_Handle *sched, | 195 | UPNP_add_port_mapping_ (const char *control_url, const char *service_type, |
201 | const char *control_url, const char *service_type, | ||
202 | const char *ext_port, | 196 | const char *ext_port, |
203 | const char *in_port, | 197 | const char *in_port, |
204 | const char *in_client, | 198 | const char *in_client, |
@@ -212,7 +206,6 @@ UPNP_add_port_mapping_ (struct GNUNET_SCHEDULER_Handle *sched, | |||
212 | * used when opening the port. | 206 | * used when opening the port. |
213 | * (remote_host is usually NULL because IGDs don't support it.) | 207 | * (remote_host is usually NULL because IGDs don't support it.) |
214 | * | 208 | * |
215 | * @param sched the scheduler to use for networking | ||
216 | * @param control_url the control URL the command was called on | 209 | * @param control_url the control URL the command was called on |
217 | * @param service_type service the command was called on | 210 | * @param service_type service the command was called on |
218 | * @param in_port port on the gateway on the LAN side which was requested | 211 | * @param in_port port on the gateway on the LAN side which was requested |
@@ -223,8 +216,7 @@ UPNP_add_port_mapping_ (struct GNUNET_SCHEDULER_Handle *sched, | |||
223 | * @param cls closure passed to caller_cb | 216 | * @param cls closure passed to caller_cb |
224 | */ | 217 | */ |
225 | void | 218 | void |
226 | UPNP_delete_port_mapping_ (struct GNUNET_SCHEDULER_Handle *sched, | 219 | UPNP_delete_port_mapping_ (const char *control_url, const char *service_type, |
227 | const char *control_url, const char *service_type, | ||
228 | const char *ext_port, const char *proto, | 220 | const char *ext_port, const char *proto, |
229 | const char *remote_host, | 221 | const char *remote_host, |
230 | UPNP_port_mapping_cb_ caller_cb, void *caller_cls); | 222 | UPNP_port_mapping_cb_ caller_cb, void *caller_cls); |
@@ -259,7 +251,6 @@ typedef void (*UPNP_get_specific_port_mapping_entry_cb_) (int error, | |||
259 | * Check that a port mapping set up with UPNP_add_port_mapping_() | 251 | * Check that a port mapping set up with UPNP_add_port_mapping_() |
260 | * is alive. | 252 | * is alive. |
261 | * | 253 | * |
262 | * @param sched the scheduler to use for networking | ||
263 | * @param control_url the control URL the command was called on | 254 | * @param control_url the control URL the command was called on |
264 | * @param service_type service the command was called on | 255 | * @param service_type service the command was called on |
265 | * @param in_port port on the gateway on the LAN side which was requested | 256 | * @param in_port port on the gateway on the LAN side which was requested |
@@ -270,8 +261,7 @@ typedef void (*UPNP_get_specific_port_mapping_entry_cb_) (int error, | |||
270 | * @param cls closure passed to caller_cb | 261 | * @param cls closure passed to caller_cb |
271 | */ | 262 | */ |
272 | void | 263 | void |
273 | UPNP_get_specific_port_mapping_entry_ (struct GNUNET_SCHEDULER_Handle *sched, | 264 | UPNP_get_specific_port_mapping_entry_ (const char *control_url, |
274 | const char *control_url, | ||
275 | const char *service_type, | 265 | const char *service_type, |
276 | const char *ext_port, | 266 | const char *ext_port, |
277 | const char *proto, | 267 | const char *proto, |