aboutsummaryrefslogtreecommitdiff
path: root/src/tools/tor-fw-helper/tor-fw-helper-upnp.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-09-30 15:21:37 -0400
committerNick Mathewson <nickm@torproject.org>2010-09-30 15:55:42 -0400
commit0e9d969bb2bb4bb9a5f7db1db824c729d7142cbc (patch)
tree0d4b17893ba8b6d653bcc71f56ceb417cbaa4096 /src/tools/tor-fw-helper/tor-fw-helper-upnp.c
parent2835dcf69f5bafd634a1b65fa28c08d4f1ce3306 (diff)
downloadtor-0e9d969bb2bb4bb9a5f7db1db824c729d7142cbc.tar
tor-0e9d969bb2bb4bb9a5f7db1db824c729d7142cbc.tar.gz
Fix space and formatting issues
Diffstat (limited to 'src/tools/tor-fw-helper/tor-fw-helper-upnp.c')
-rw-r--r--src/tools/tor-fw-helper/tor-fw-helper-upnp.c35
1 files changed, 18 insertions, 17 deletions
diff --git a/src/tools/tor-fw-helper/tor-fw-helper-upnp.c b/src/tools/tor-fw-helper/tor-fw-helper-upnp.c
index 7cf6be916..b3b80d698 100644
--- a/src/tools/tor-fw-helper/tor-fw-helper-upnp.c
+++ b/src/tools/tor-fw-helper/tor-fw-helper-upnp.c
@@ -40,19 +40,19 @@
/** This hooks miniupnpc into our multi-backend API. */
static tor_fw_backend_t tor_miniupnp_backend = {
- "miniupnp",
- sizeof(struct miniupnpc_state_t),
- tor_upnp_init,
- tor_upnp_cleanup,
- tor_upnp_fetch_public_ip,
- tor_upnp_add_tcp_mapping
+ "miniupnp",
+ sizeof(struct miniupnpc_state_t),
+ tor_upnp_init,
+ tor_upnp_cleanup,
+ tor_upnp_fetch_public_ip,
+ tor_upnp_add_tcp_mapping
};
/** Return the backend for miniupnp. */
const tor_fw_backend_t *
tor_fw_get_miniupnp_backend(void)
{
- return &tor_miniupnp_backend;
+ return &tor_miniupnp_backend;
}
/** Initialize the UPnP backend and store the results in
@@ -64,7 +64,7 @@ tor_upnp_init(tor_fw_options_t *options, void *backend_state)
This leaks the user agent from the client to the router - perhaps we don't
want to do that? eg:
- User-Agent: Ubuntu/10.04, UPnP/1.0, MiniUPnPc/1.4
+ User-Agent: Ubuntu/10.04, UPnP/1.0, MiniUPnPc/1.4
*/
miniupnpc_state_t *state = (miniupnpc_state_t *) backend_state;
@@ -112,7 +112,7 @@ tor_upnp_cleanup(tor_fw_options_t *options, void *backend_state)
}
/** Fetch our likely public IP from our upstream UPnP IGD enabled NAT device.
-* Use the connection context stored in <b>backend_state</b>. */
+ * Use the connection context stored in <b>backend_state</b>. */
int
tor_upnp_fetch_public_ip(tor_fw_options_t *options, void *backend_state)
{
@@ -138,12 +138,13 @@ tor_upnp_fetch_public_ip(tor_fw_options_t *options, void *backend_state)
externalIPAddress); tor_upnp_cleanup(options, state);
options->public_ip_status = 1;
return UPNP_ERR_SUCCESS;
- } else
+ } else {
goto err;
+ }
- err:
- tor_upnp_cleanup(options, state);
- return UPNP_ERR_GETEXTERNALIP;
+ err:
+ tor_upnp_cleanup(options, state);
+ return UPNP_ERR_GETEXTERNALIP;
}
/** Add a TCP port mapping for a single port stored in <b>tor_fw_options</b>
@@ -163,13 +164,13 @@ tor_upnp_add_tcp_mapping(tor_fw_options_t *options, void *backend_state)
}
if (options->verbose)
- fprintf(stdout, "V: internal port: %d, external port: %d\n",
- (int)options->internal_port, (int)options->external_port);
+ fprintf(stdout, "V: internal port: %d, external port: %d\n",
+ (int)options->internal_port, (int)options->external_port);
tor_snprintf(internal_port_str, sizeof(internal_port_str),
- "%d", (int)options->internal_port);
+ "%d", (int)options->internal_port);
tor_snprintf(external_port_str, sizeof(external_port_str),
- "%d", (int)options->external_port);
+ "%d", (int)options->external_port);
r = UPNP_AddPortMapping(state->urls.controlURL,
state->data.first.servicetype,