nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some bugs that did not allow compilation on Windows.

Browse Source
This commit is contained in:
George Kadianakis 2012-08-21 20:56:30 +03:00
parent 44fe717524
commit b9551fd074
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/util.c
View File

@ -4381,17 +4381,17 @@ tor_get_lines_from_handle(HANDLE *handle,
char stdout_buf[600] = {0}; char stdout_buf[600] = {0};
smartlist_t *lines = NULL; smartlist_t *lines = NULL;
tor_assert(stream_status); tor_assert(stream_status_out);
*stream_status = IO_STREAM_TERM; *stream_status_out = IO_STREAM_TERM;
pos = tor_read_all_handle(handle, stdout_buf, sizeof(stdout_buf) - 1, NULL); pos = tor_read_all_handle(handle, stdout_buf, sizeof(stdout_buf) - 1, NULL);
if (pos < 0) { if (pos < 0) {
*stream_status = IO_STREAM_TERM; *stream_status_out = IO_STREAM_TERM;
return NULL; return NULL;
} }
if (pos == 0) { if (pos == 0) {
*stream_status = IO_STREAM_EAGAIN; *stream_status_out = IO_STREAM_EAGAIN;
return NULL; return NULL;
} }
@ -4408,7 +4408,7 @@ tor_get_lines_from_handle(HANDLE *handle,
SMARTLIST_FOREACH(lines, char *, line, SMARTLIST_FOREACH(lines, char *, line,
SMARTLIST_REPLACE_CURRENT(lines, line, tor_strdup(line))); SMARTLIST_REPLACE_CURRENT(lines, line, tor_strdup(line)));
*stream_status = IO_STREAM_OKAY; *stream_status_out = IO_STREAM_OKAY;
return lines; return lines;
} }
@ -4461,8 +4461,8 @@ log_from_handle(HANDLE *pipe, int severity)
#else #else
/** Return a smartlist containing lines outputted from /** Return a smartlist containing lines outputted from
* <b>handle</b>. Return NULL on error, and set <b>stream_status</b> * <b>handle</b>. Return NULL on error, and set
* appropriately. */ * <b>stream_status_out</b> appropriately. */
smartlist_t * smartlist_t *
tor_get_lines_from_handle(FILE *handle, enum stream_status *stream_status_out) tor_get_lines_from_handle(FILE *handle, enum stream_status *stream_status_out)
{ {

20
src/tools/tor-fw-helper/tor-fw-helper.c
View File

@ -353,28 +353,18 @@ parse_port(const char *arg)
/** Report a failure of epic proportions: We didn't manage to /** Report a failure of epic proportions: We didn't manage to
* initialize any port forwarding backends. */ * initialize any port forwarding backends. */
static void static void
report_full_fail(const smartlist_t *ports_to_forward, backends_t *backends) report_full_fail(const smartlist_t *ports_to_forward)
{ {
char *list_of_backends_str = NULL;
char *fail_msg = NULL;
if (!ports_to_forward) if (!ports_to_forward)
return; return;
list_of_backends_str = get_list_of_backends_string(backends);
tor_asprintf(&fail_msg,
"Port forwarding backends (%s) could not be initialized.",
list_of_backends_str);
SMARTLIST_FOREACH_BEGIN(ports_to_forward, SMARTLIST_FOREACH_BEGIN(ports_to_forward,
const port_to_forward_t *, port_to_forward) { const port_to_forward_t *, port_to_forward) {
tor_fw_helper_report_port_fw_fail(port_to_forward->internal_port, tor_fw_helper_report_port_fw_fail(port_to_forward->internal_port,
port_to_forward->external_port, port_to_forward->external_port,
fail_msg); "All backends (NAT-PMP, UPnP) failed "
"to initialize!"); /* XXX hardcoded */
} SMARTLIST_FOREACH_END(port_to_forward); } SMARTLIST_FOREACH_END(port_to_forward);
tor_free(list_of_backends_str);
tor_free(fail_msg);
} }
int int
@ -481,8 +471,8 @@ main(int argc, char **argv)
r = init_backends(&tor_fw_options, &backend_state); r = init_backends(&tor_fw_options, &backend_state);
if (!r) { // all backends failed: if (!r) { // all backends failed:
// report our failure // report our failure
report_full_fail(tor_fw_options.ports_to_forward, &backend_state); report_full_fail(tor_fw_options.ports_to_forward);
fprintf(stderr, "V: tor-fw-helper: All backends failed.\n"); fprintf(stderr, "tor-fw-helper: All backends failed.\n");
exit(1); exit(1);
} else { // some backends succeeded: } else { // some backends succeeded:
fprintf(stderr, "tor-fw-helper: %i NAT traversal helper(s) loaded\n", r); fprintf(stderr, "tor-fw-helper: %i NAT traversal helper(s) loaded\n", r);