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

#if-out the fw-helper code in util.c when building on windows

Browse Source
This commit is contained in:
Nick Mathewson 2010-09-30 12:58:48 -04:00
parent 1779fee27a
commit 2835dcf69f
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/util.c
View File

@ -2944,6 +2944,11 @@ static int
tor_spawn_background(const char *const filename, int *stdout_read, tor_spawn_background(const char *const filename, int *stdout_read,
int *stderr_read, const char **argv) int *stderr_read, const char **argv)
{ {
#ifdef MS_WINDOWS
(void) filename; (void) stdout_read; (void) stderr_read; (void) argv;
log_warn(LD_BUG, "not yet implemented on Windows.");
return -1;
#else
pid_t pid; pid_t pid;
int stdout_pipe[2]; int stdout_pipe[2];
int stderr_pipe[2]; int stderr_pipe[2];
@ -3098,6 +3103,7 @@ tor_spawn_background(const char *const filename, int *stdout_read,
} }
return pid; return pid;
#endif
} }
/** Read from stream, and send lines to log at the specified log level. /** Read from stream, and send lines to log at the specified log level.
@ -3179,7 +3185,13 @@ void
tor_check_port_forwarding(const char *filename, int dir_port, int or_port, tor_check_port_forwarding(const char *filename, int dir_port, int or_port,
time_t now) time_t now)
{ {
#ifdef MS_WINDOWS
(void) filename; (void) dir_port; (void) or_port; (void) now;
(void) tor_spawn_background;
(void) log_from_pipe;
log_warn(LD_GENERAL, "Sorry, port forwarding is not yet supported "
"on windows.");
#else
/* When fw-helper succeeds, how long do we wait until running it again */ /* When fw-helper succeeds, how long do we wait until running it again */
#define TIME_TO_EXEC_FWHELPER_SUCCESS 300 #define TIME_TO_EXEC_FWHELPER_SUCCESS 300
/* When fw-helper fails, how long do we wait until running it again */ /* When fw-helper fails, how long do we wait until running it again */
@ -3272,6 +3284,7 @@ tor_check_port_forwarding(const char *filename, int dir_port, int or_port,
child_pid = -1; child_pid = -1;
} }
} }
#endif
} }