Fix space and formatting issues (0e9d969b) · Commits · Legacy / gitolite / user / hiviah / rpm-tor

src/tools/tor-fw-helper/tor-fw-helper-natpmp.c

+5 −10

Changes for src/tools/tor-fw-helper/tor-fw-helper-natpmp.c: 5 added lines, 10 removed lines.
Original line number	Diff line number	Diff line
		@@ -137,8 +137,7 @@ tor_natpmp_add_tcp_mapping(tor_fw_options_t *tor_fw_options,
		r = readnatpmpresponseorretry(&(state->natpmp), &(state->response));
		sav_errno = errno;

		if (r<0 && r!=NATPMP_TRYAGAIN)
		{
		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));
		@@ -146,8 +145,7 @@ tor_natpmp_add_tcp_mapping(tor_fw_options_t *tor_fw_options,

		} while (r == NATPMP_TRYAGAIN);

		if (r != 0)
		{
		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);
		@@ -203,8 +201,7 @@ tor_natpmp_fetch_public_ip(tor_fw_options_t *tor_fw_options,
		fprintf(stdout, "V: NAT-PMP readnatpmpresponseorretry returned"
		" %d\n", r);

		if ( r < 0 && r != NATPMP_TRYAGAIN)
		{
		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,
		@@ -213,8 +210,7 @@ tor_natpmp_fetch_public_ip(tor_fw_options_t *tor_fw_options,

		} while (r == NATPMP_TRYAGAIN );

		if (r != 0)
		{
		if (r != 0) {
		fprintf(stderr, "E: NAT-PMP It appears that something went wrong:"
		" %d\n", r);
		return r;
		@@ -224,8 +220,7 @@ tor_natpmp_fetch_public_ip(tor_fw_options_t *tor_fw_options,
		inet_ntoa((state->response).pnu.publicaddress.addr));
		tor_fw_options->public_ip_status = 1;

		if (tor_fw_options->verbose)
		{
		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);

src/tools/tor-fw-helper/tor-fw-helper-upnp.c

+2 −1

Changes for src/tools/tor-fw-helper/tor-fw-helper-upnp.c: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -138,8 +138,9 @@ 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);

src/tools/tor-fw-helper/tor-fw-helper.c

+28 −44

Changes for src/tools/tor-fw-helper/tor-fw-helper.c: 28 added lines, 44 removed lines.
Original line number	Diff line number	Diff line
		@@ -41,12 +41,9 @@ typedef struct backends_t {
		void *backend_state[MAX_BACKENDS];
		} backends_t;

		int
		init_backends(tor_fw_options_t options, backends_t backends);

		/** Initalize each backend helper with the user input stored in <b>options</b>
		* and put the results in the <b>backends</b> struct. */
		int
		static int
		init_backends(tor_fw_options_t options, backends_t backends)
		{
		int n_available = 0;
		@@ -154,16 +151,15 @@ tor_fw_fetch_public_ip(tor_fw_options_t *tor_fw_options,
		fprintf(stdout, "V: tor_fw_fetch_public_ip\n");

		for (i=0; i<backends->n_backends; ++i) {
		if (tor_fw_options->verbose)
		{
		if (tor_fw_options->verbose) {
		fprintf(stdout, "V: running backend_state now: %i\n", i);
		fprintf(stdout, "V: size of backend state: %u\n",
		(int)(backends->backend_ops)[i].state_len);
		fprintf(stdout, "V: backend state name: %s\n",
		(char *)(backends->backend_ops)[i].name);
		}
		r = ((backends->backend_ops)[i].fetch_public_ip(tor_fw_options,
		(backends->backend_state)[i]));
		r = backends->backend_ops[i].fetch_public_ip(tor_fw_options,
		backends->backend_state[i]);
		fprintf(stdout, "tor-fw-helper: tor_fw_fetch_public_ip backend %s "
		" returned: %i\n", (char *)(backends->backend_ops)[i].name, r);
		}
		@@ -182,18 +178,17 @@ tor_fw_add_or_port(tor_fw_options_t *tor_fw_options,
		fprintf(stdout, "V: tor_fw_add_or_port\n");

		for (i=0; i<backends->n_backends; ++i) {
		if (tor_fw_options->verbose)
		{
		if (tor_fw_options->verbose) {
		fprintf(stdout, "V: running backend_state now: %i\n", i);
		fprintf(stdout, "V: size of backend state: %u\n",
		(int)(backends->backend_ops)[i].state_len);
		fprintf(stdout, "V: backend state name: %s\n",
		(char *)(backends->backend_ops)[i].name);
		(const char *) backends->backend_ops[i].name);
		}
		r = ((backends->backend_ops)[i].add_tcp_mapping(tor_fw_options,
		(backends->backend_state)[i]));
		r = backends->backend_ops[i].add_tcp_mapping(tor_fw_options,
		backends->backend_state[i]);
		fprintf(stdout, "tor-fw-helper: tor_fw_add_or_port backend %s "
		"returned: %i\n", (char *)(backends->backend_ops)[i].name, r);
		"returned: %i\n", (const char *) backends->backend_ops[i].name, r);
		}
		}

		@@ -210,18 +205,17 @@ tor_fw_add_dir_port(tor_fw_options_t *tor_fw_options,
		fprintf(stdout, "V: tor_fw_add_dir_port\n");

		for (i=0; i<backends->n_backends; ++i) {
		if (tor_fw_options->verbose)
		{
		if (tor_fw_options->verbose) {
		fprintf(stdout, "V: running backend_state now: %i\n", i);
		fprintf(stdout, "V: size of backend state: %u\n",
		(int)(backends->backend_ops)[i].state_len);
		fprintf(stdout, "V: backend state name: %s\n",
		(char *)(backends->backend_ops)[i].name);
		}
		r=((backends->backend_ops)[i].add_tcp_mapping(tor_fw_options,
		(backends->backend_state)[i]));
		r = backends->backend_ops[i].add_tcp_mapping(tor_fw_options,
		backends->backend_state[i]);
		fprintf(stdout, "tor-fw-helper: tor_fw_add_dir_port backend %s "
		"returned: %i\n", (char *)(backends->backend_ops)[i].name, r);
		"returned: %i\n", (const char *)backends->backend_ops[i].name, r);
		}
		}

		@@ -231,11 +225,12 @@ main(int argc, char **argv)
		int r = 0;
		int c = 0;

		tor_fw_options_t tor_fw_options = {0,0,0,0,0,0,0,0,0,0,0,0,0};
		tor_fw_options_t tor_fw_options;
		backends_t backend_state;

		while (1)
		{
		memset(&tor_fw_options, 0, sizeof(tor_fw_options));

		while (1) {
		int option_index = 0;
		static struct option long_options[] =
		{
		@@ -255,8 +250,7 @@ main(int argc, char **argv)
		if (c == -1)
		break;

		switch (c)
		{
		switch (c) {
		case 'v': tor_fw_options.verbose = 1; break;
		case 'h': tor_fw_options.help = 1; usage(); exit(1); break;
		case 'i': sscanf(optarg, "%hu", &tor_fw_options.private_or_port);
		@@ -274,8 +268,7 @@ main(int argc, char **argv)
		}
		}

		if (tor_fw_options.verbose)
		{
		if (tor_fw_options.verbose) {
		fprintf(stderr, "V: tor-fw-helper version %s\n"
		"V: We were called with the following arguments:\n"
		"V: verbose = %d, help = %d, pub or port = %u, "
		@@ -296,8 +289,7 @@ main(int argc, char **argv)
		Given a private ORPort, we can ask for a mapping that matches the port
		externally.
		*/
		if (!tor_fw_options.private_or_port && !tor_fw_options.fetch_public_ip)
		{
		if (!tor_fw_options.private_or_port && !tor_fw_options.fetch_public_ip) {
		fprintf(stderr, "E: We require an ORPort or fetch_public_ip"
		" request!\n");
		usage();
		@@ -305,16 +297,14 @@ main(int argc, char **argv)
		} else {
		/* When we only have one ORPort, internal/external are
		set to be the same.*/
		if (!tor_fw_options.public_or_port && tor_fw_options.private_or_port)
		{
		if (!tor_fw_options.public_or_port && tor_fw_options.private_or_port) {
		if (tor_fw_options.verbose)
		fprintf(stdout, "V: We're setting public_or_port = "
		"private_or_port.\n");
		tor_fw_options.public_or_port = tor_fw_options.private_or_port;
		}
		}
		if (!tor_fw_options.private_dir_port)
		{
		if (!tor_fw_options.private_dir_port) {
		if (tor_fw_options.verbose)
		fprintf(stdout, "V: We have no DirPort; no hole punching for "
		"DirPorts\n");
		@@ -322,8 +312,7 @@ main(int argc, char **argv)
		} else {
		/* When we only have one DirPort, internal/external are
		set to be the same.*/
		if (!tor_fw_options.public_dir_port && tor_fw_options.private_dir_port)
		{
		if (!tor_fw_options.public_dir_port && tor_fw_options.private_dir_port) {
		if (tor_fw_options.verbose)
		fprintf(stdout, "V: We're setting public_or_port = "
		"private_or_port.\n");
		@@ -332,8 +321,7 @@ main(int argc, char **argv)
		}
		}

		if (tor_fw_options.verbose)
		{
		if (tor_fw_options.verbose) {
		fprintf(stdout, "V: pub or port = %u, priv or port = %u\n"
		"V: pub dir port = %u, priv dir port = %u\n",
		tor_fw_options.private_or_port, tor_fw_options.public_or_port,
		@@ -346,20 +334,17 @@ main(int argc, char **argv)
		if (r)
		printf("tor-fw-helper: %i NAT traversal helper(s) loaded\n", r);

		if (tor_fw_options.fetch_public_ip)
		{
		if (tor_fw_options.fetch_public_ip) {
		tor_fw_fetch_public_ip(&tor_fw_options, &backend_state);
		}

		if (tor_fw_options.private_or_port)
		{
		if (tor_fw_options.private_or_port) {
		tor_fw_options.internal_port = tor_fw_options.private_or_port;
		tor_fw_options.external_port = tor_fw_options.private_or_port;
		tor_fw_add_or_port(&tor_fw_options, &backend_state);
		}

		if (tor_fw_options.private_dir_port)
		{
		if (tor_fw_options.private_dir_port) {
		tor_fw_options.internal_port = tor_fw_options.private_dir_port;
		tor_fw_options.external_port = tor_fw_options.private_dir_port;
		tor_fw_add_dir_port(&tor_fw_options, &backend_state);
		@@ -367,8 +352,7 @@ main(int argc, char **argv)

		r = (((tor_fw_options.nat_pmp_status \| tor_fw_options.upnp_status)
		\|tor_fw_options.public_ip_status));
		if (r > 0)
		{
		if (r > 0) {
		fprintf(stdout, "tor-fw-helper: SUCCESS\n");
		} else {
		fprintf(stderr, "tor-fw-helper: FAILURE\n");

src/common/util.c

+3 −3

File changed.

Contains only whitespace changes.

src/tools/tor-fw-helper/tor-fw-helper-natpmp.h

+7 −7

File changed.

Contains only whitespace changes.

src/tools/tor-fw-helper/tor-fw-helper.h

+19 −19

File changed.

Contains only whitespace changes.