nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug5099_nm' into maint-0.2.3

Browse Source
This commit is contained in:
Nick Mathewson 2012-06-23 15:10:57 -04:00
commit d0243e82cf
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug5099 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes:
- Improve log message issued when a managed proxy fails to
launch. Fixes bug 5099; bugfix on 0.2.3.6-alpha.

14
src/or/transports.c
View File

@ -697,7 +697,19 @@ handle_proxy_line(const char *line, managed_proxy_t *mp)
return; return;
} else if (!strcmpstart(line, SPAWN_ERROR_MESSAGE)) { } else if (!strcmpstart(line, SPAWN_ERROR_MESSAGE)) {
log_warn(LD_GENERAL, "Could not launch managed proxy executable!"); /* managed proxy launch failed: parse error message to learn why. */
int retval, child_state, saved_errno;
retval = tor_sscanf(line, SPAWN_ERROR_MESSAGE "%x/%x",
&child_state, &saved_errno);
if (retval == 2) {
log_warn(LD_GENERAL,
"Could not launch managed proxy executable at '%s' ('%s').",
mp->argv[0], strerror(saved_errno));
} else { /* failed to parse error message */
log_warn(LD_GENERAL,"Could not launch managed proxy executable at '%s'.",
mp->argv[0]);
}
mp->conf_state = PT_PROTO_FAILED_LAUNCH; mp->conf_state = PT_PROTO_FAILED_LAUNCH;
return; return;
} }