Fix space and formatting issues

1 files changed, 135 insertions, 140 deletions

diff --git a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c
index 1b896fa3ba..51b456a8c7 100644
--- a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c
+++ b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c
@@ -23,19 +23,19 @@
 
 /** This hooks NAT-PMP into our multi-backend API. */
 static tor_fw_backend_t tor_natpmp_backend = {
-    "natpmp",
-    sizeof(struct natpmp_state_t),
-    tor_natpmp_init,
-    tor_natpmp_cleanup,
-    tor_natpmp_fetch_public_ip,
-    tor_natpmp_add_tcp_mapping
+  "natpmp",
+  sizeof(struct natpmp_state_t),
+  tor_natpmp_init,
+  tor_natpmp_cleanup,
+  tor_natpmp_fetch_public_ip,
+  tor_natpmp_add_tcp_mapping
 };
 
 /** Return the backend for NAT-PMP. */
 const tor_fw_backend_t *
 tor_fw_get_natpmp_backend(void)
 {
-    return &tor_natpmp_backend;
+  return &tor_natpmp_backend;
 }
 
 /** Initialize the NAT-PMP backend and store the results in
@@ -43,41 +43,41 @@ tor_fw_get_natpmp_backend(void)
 int
 tor_natpmp_init(tor_fw_options_t *tor_fw_options, void *backend_state)
 {
-    natpmp_state_t *state = (natpmp_state_t *) backend_state;
-    int r = 0;
-
-    memset(&(state->natpmp), 0, sizeof(natpmp_t));
-    memset(&(state->response), 0, sizeof(natpmpresp_t));
-    state->init = 0;
-    state->protocol = NATPMP_PROTOCOL_TCP;
-    state->lease = NATPMP_DEFAULT_LEASE;
-
-    if (tor_fw_options->verbose)
-        fprintf(stdout, "V: natpmp init...\n");
-
-    r = initnatpmp(&(state->natpmp));
-    if (r == 0) {
-        state->init = 1;
-        fprintf(stdout, "tor-fw-helper: natpmp initialized...\n");
-        return r;
-    } else {
-        fprintf(stderr, "tor-fw-helper: natpmp failed to initialize...\n");
-        return r;
-    }
+  natpmp_state_t *state = (natpmp_state_t *) backend_state;
+  int r = 0;
+
+  memset(&(state->natpmp), 0, sizeof(natpmp_t));
+  memset(&(state->response), 0, sizeof(natpmpresp_t));
+  state->init = 0;
+  state->protocol = NATPMP_PROTOCOL_TCP;
+  state->lease = NATPMP_DEFAULT_LEASE;
+
+  if (tor_fw_options->verbose)
+    fprintf(stdout, "V: natpmp init...\n");
+
+  r = initnatpmp(&(state->natpmp));
+  if (r == 0) {
+    state->init = 1;
+    fprintf(stdout, "tor-fw-helper: natpmp initialized...\n");
+    return r;
+  } else {
+    fprintf(stderr, "tor-fw-helper: natpmp failed to initialize...\n");
+    return r;
+  }
 }
 
 /** Tear down the NAT-PMP connection stored in <b>backend_state</b>.*/
 int
 tor_natpmp_cleanup(tor_fw_options_t *tor_fw_options, void *backend_state)
 {
-    natpmp_state_t *state = (natpmp_state_t *) backend_state;
-    int r = 0;
-    if (tor_fw_options->verbose)
-        fprintf(stdout, "V: natpmp cleanup...\n");
-    r = closenatpmp(&(state->natpmp));
-    if (tor_fw_options->verbose)
-        fprintf(stdout, "V: closing natpmp socket: %d\n", r);
-    return r;
+  natpmp_state_t *state = (natpmp_state_t *) backend_state;
+  int r = 0;
+  if (tor_fw_options->verbose)
+    fprintf(stdout, "V: natpmp cleanup...\n");
+  r = closenatpmp(&(state->natpmp));
+  if (tor_fw_options->verbose)
+    fprintf(stdout, "V: closing natpmp socket: %d\n", r);
+  return r;
 }
 
 /** Use select() to wait until we can read on fd. */
@@ -109,65 +109,63 @@ int
 tor_natpmp_add_tcp_mapping(tor_fw_options_t *tor_fw_options,
                            void *backend_state)
 {
-    natpmp_state_t *state = (natpmp_state_t *) backend_state;
-    int r = 0;
-    int x = 0;
-    int sav_errno;
+  natpmp_state_t *state = (natpmp_state_t *) backend_state;
+  int r = 0;
+  int x = 0;
+  int sav_errno;
+
+  struct timeval timeout;
+
+  if (tor_fw_options->verbose)
+    fprintf(stdout, "V: sending natpmp portmapping request...\n");
+  r = sendnewportmappingrequest(&(state->natpmp), state->protocol,
+                                tor_fw_options->internal_port,
+                                tor_fw_options->external_port,
+                                state->lease);
+  if (tor_fw_options->verbose)
+    fprintf(stdout, "tor-fw-helper: NAT-PMP sendnewportmappingrequest "
+            "returned %d (%s)\n", r, r==12?"SUCCESS":"FAILED");
+
+  do {
+    getnatpmprequesttimeout(&(state->natpmp), &timeout);
+    x = wait_until_fd_readable(state->natpmp.s, &timeout);
+    if (x == -1)
+      return -1;
 
-    struct timeval timeout;
-
-    if (tor_fw_options->verbose)
-        fprintf(stdout, "V: sending natpmp portmapping request...\n");
-    r = sendnewportmappingrequest(&(state->natpmp), state->protocol,
-                                  tor_fw_options->internal_port,
-                                  tor_fw_options->external_port,
-                                  state->lease);
     if (tor_fw_options->verbose)
-        fprintf(stdout, "tor-fw-helper: NAT-PMP sendnewportmappingrequest "
-                "returned %d (%s)\n", r, r==12?"SUCCESS":"FAILED");
-
-    do {
-        getnatpmprequesttimeout(&(state->natpmp), &timeout);
-        x = wait_until_fd_readable(state->natpmp.s, &timeout);
-        if (x == -1)
-          return -1;
-
-        if (tor_fw_options->verbose)
-            fprintf(stdout, "V: attempting to readnatpmpreponseorretry...\n");
-        r = readnatpmpresponseorretry(&(state->natpmp), &(state->response));
-        sav_errno = errno;
-
-        if (r<0 && r!=NATPMP_TRYAGAIN)
-        {
-            fprintf(stderr, "E: readnatpmpresponseorretry failed %d\n", r);
-            fprintf(stderr, "E: errno=%d '%s'\n", sav_errno,
-                    strerror(sav_errno));
-        }
-
-    } while ( r == NATPMP_TRYAGAIN );
-
-    if (r != 0)
-    {
-        /* XXX TODO: NATPMP_* should be formatted into useful error strings */
-        fprintf(stderr, "E: NAT-PMP It appears that something went wrong:"
-                " %d\n", r);
-        if (r == -51)
-            fprintf(stderr, "E: NAT-PMP It appears that the request was "
-                    "unauthorized\n");
-        return r;
+      fprintf(stdout, "V: attempting to readnatpmpreponseorretry...\n");
+    r = readnatpmpresponseorretry(&(state->natpmp), &(state->response));
+    sav_errno = errno;
+
+    if (r<0 && r!=NATPMP_TRYAGAIN) {
+      fprintf(stderr, "E: readnatpmpresponseorretry failed %d\n", r);
+      fprintf(stderr, "E: errno=%d '%s'\n", sav_errno,
+              strerror(sav_errno));
     }
 
-    if (r == NATPMP_SUCCESS) {
-        fprintf(stdout, "tor-fw-helper: NAT-PMP mapped public port %hu to"
-                " localport %hu liftime %u\n",
-                (state->response).pnu.newportmapping.mappedpublicport,
-                (state->response).pnu.newportmapping.privateport,
-                (state->response).pnu.newportmapping.lifetime);
-    }
-
-    tor_fw_options->nat_pmp_status = 1;
+  } while (r == NATPMP_TRYAGAIN);
 
+  if (r != 0) {
+    /* XXX TODO: NATPMP_* should be formatted into useful error strings */
+    fprintf(stderr, "E: NAT-PMP It appears that something went wrong:"
+            " %d\n", r);
+    if (r == -51)
+      fprintf(stderr, "E: NAT-PMP It appears that the request was "
+              "unauthorized\n");
     return r;
+  }
+
+  if (r == NATPMP_SUCCESS) {
+    fprintf(stdout, "tor-fw-helper: NAT-PMP mapped public port %hu to"
+            " localport %hu liftime %u\n",
+            (state->response).pnu.newportmapping.mappedpublicport,
+            (state->response).pnu.newportmapping.privateport,
+            (state->response).pnu.newportmapping.lifetime);
+  }
+
+  tor_fw_options->nat_pmp_status = 1;
+
+  return r;
 }
 
 /** Fetch our likely public IP from our upstream NAT-PMP enabled NAT device.
@@ -176,63 +174,60 @@ int
 tor_natpmp_fetch_public_ip(tor_fw_options_t *tor_fw_options,
                            void *backend_state)
 {
-    int r = 0;
-    int x = 0;
-    int sav_errno;
-    natpmp_state_t *state = (natpmp_state_t *) backend_state;
-
-    struct timeval timeout;
-
-    r = sendpublicaddressrequest(&(state->natpmp));
-    fprintf(stdout, "tor-fw-helper: NAT-PMP sendpublicaddressrequest returned"
-            " %d (%s)\n", r, r==2?"SUCCESS":"FAILED");
-
-    do {
-        getnatpmprequesttimeout(&(state->natpmp), &timeout);
-
-        x = wait_until_fd_readable(state->natpmp.s, &timeout);
-        if (x == -1)
-          return -1;
-
-        if (tor_fw_options->verbose)
-            fprintf(stdout, "V: NAT-PMP attempting to read reponse...\n");
-        r = readnatpmpresponseorretry(&(state->natpmp), &(state->response));
-        sav_errno = errno;
-
-        if (tor_fw_options->verbose)
-            fprintf(stdout, "V: NAT-PMP readnatpmpresponseorretry returned"
-                    " %d\n", r);
-
-        if ( r < 0 && r != NATPMP_TRYAGAIN)
-        {
-            fprintf(stderr, "E: NAT-PMP readnatpmpresponseorretry failed %d\n",
-                    r);
-            fprintf(stderr, "E: NAT-PMP errno=%d '%s'\n", sav_errno,
-                    strerror(sav_errno));
-        }
-
-    } while ( r == NATPMP_TRYAGAIN );
-
-    if (r != 0)
-    {
-        fprintf(stderr, "E: NAT-PMP It appears that something went wrong:"
-                " %d\n", r);
-        return r;
-    }
+  int r = 0;
+  int x = 0;
+  int sav_errno;
+  natpmp_state_t *state = (natpmp_state_t *) backend_state;
 
-    fprintf(stdout, "tor-fw-helper: ExternalIPAddress = %s\n",
-           inet_ntoa((state->response).pnu.publicaddress.addr));
-    tor_fw_options->public_ip_status = 1;
+  struct timeval timeout;
+
+  r = sendpublicaddressrequest(&(state->natpmp));
+  fprintf(stdout, "tor-fw-helper: NAT-PMP sendpublicaddressrequest returned"
+          " %d (%s)\n", r, r==2?"SUCCESS":"FAILED");
+
+  do {
+    getnatpmprequesttimeout(&(state->natpmp), &timeout);
+
+    x = wait_until_fd_readable(state->natpmp.s, &timeout);
+    if (x == -1)
+      return -1;
 
     if (tor_fw_options->verbose)
-    {
-        fprintf(stdout, "V: result = %u\n", r);
-        fprintf(stdout, "V: type = %u\n", (state->response).type);
-        fprintf(stdout, "V: resultcode = %u\n", (state->response).resultcode);
-        fprintf(stdout, "V: epoch = %u\n", (state->response).epoch);
+      fprintf(stdout, "V: NAT-PMP attempting to read reponse...\n");
+    r = readnatpmpresponseorretry(&(state->natpmp), &(state->response));
+    sav_errno = errno;
+
+    if (tor_fw_options->verbose)
+      fprintf(stdout, "V: NAT-PMP readnatpmpresponseorretry returned"
+              " %d\n", r);
+
+    if ( r < 0 && r != NATPMP_TRYAGAIN) {
+      fprintf(stderr, "E: NAT-PMP readnatpmpresponseorretry failed %d\n",
+              r);
+      fprintf(stderr, "E: NAT-PMP errno=%d '%s'\n", sav_errno,
+              strerror(sav_errno));
     }
 
+  } while (r == NATPMP_TRYAGAIN );
+
+  if (r != 0) {
+    fprintf(stderr, "E: NAT-PMP It appears that something went wrong:"
+            " %d\n", r);
     return r;
+  }
+
+  fprintf(stdout, "tor-fw-helper: ExternalIPAddress = %s\n",
+          inet_ntoa((state->response).pnu.publicaddress.addr));
+  tor_fw_options->public_ip_status = 1;
+
+  if (tor_fw_options->verbose) {
+    fprintf(stdout, "V: result = %u\n", r);
+    fprintf(stdout, "V: type = %u\n", (state->response).type);
+    fprintf(stdout, "V: resultcode = %u\n", (state->response).resultcode);
+    fprintf(stdout, "V: epoch = %u\n", (state->response).epoch);
+  }
+
+  return r;
 }
 #endif