mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

Whitespace, doc fixes

Browse Source
This commit is contained in:
Nick Mathewson 2014-04-03 16:41:54 -04:00
parent f680d0fdd2
commit db8259c230
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/or/config.c
View File

@ -1089,7 +1089,8 @@ options_act_reversible(const or_options_t *old_options, char **msg)
#if defined(HAVE_NET_IF_H) && defined(HAVE_NET_PFVAR_H) #if defined(HAVE_NET_IF_H) && defined(HAVE_NET_PFVAR_H)
/* Open /dev/pf before dropping privileges. */ /* Open /dev/pf before dropping privileges. */
if (options->TransPort_set && options->TransProxyType_parsed == TPT_DEFAULT) { if (options->TransPort_set &&
options->TransProxyType_parsed == TPT_DEFAULT) {
if (get_pf_socket() < 0) { if (get_pf_socket() < 0) {
*msg = tor_strdup("Unable to open /dev/pf for transparent proxy."); *msg = tor_strdup("Unable to open /dev/pf for transparent proxy.");
goto rollback; goto rollback;

5
src/or/connection_edge.c
View File

@ -1391,7 +1391,9 @@ get_pf_socket(void)
} }
#endif #endif
static int /** Try fill in the address of <b>req</b> from the socket configured
* with <b>conn</b>. */
static int
destination_from_socket(entry_connection_t *conn, socks_request_t *req) destination_from_socket(entry_connection_t *conn, socks_request_t *req)
{ {
struct sockaddr_storage orig_dst; struct sockaddr_storage orig_dst;
@ -1506,7 +1508,6 @@ destination_from_pf(entry_connection_t *conn, socks_request_t *req)
return 0; return 0;
} }
/** Fetch the original destination address and port from a /** Fetch the original destination address and port from a
* system-specific interface and put them into a * system-specific interface and put them into a
* socks_request_t as if they came from a socks request. * socks_request_t as if they came from a socks request.