Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
The Tor Project
Core
Tor
Commits
2835dcf6
Commit
2835dcf6
authored
14 years ago
by
Nick Mathewson
Browse files
Options
Downloads
Patches
Plain Diff
#if-out the fw-helper code in util.c when building on windows
parent
1779fee2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/common/util.c
+14
-1
14 additions, 1 deletion
src/common/util.c
with
14 additions
and
1 deletion
src/common/util.c
+
14
−
1
View file @
2835dcf6
...
...
@@ -2944,6 +2944,11 @@ static int
tor_spawn_background
(
const
char
*
const
filename
,
int
*
stdout_read
,
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
;
int
stdout_pipe
[
2
];
int
stderr_pipe
[
2
];
...
...
@@ -3098,6 +3103,7 @@ tor_spawn_background(const char *const filename, int *stdout_read,
}
return
pid
;
#endif
}
/** 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
,
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 */
#define TIME_TO_EXEC_FWHELPER_SUCCESS 300
/* 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
;
}
}
#endif
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment