Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
David Goulet
Tor
Commits
97dad670
Commit
97dad670
authored
Mar 14, 2005
by
Nick Mathewson
🥄
Browse files
Renormalize whitespace
svn:r3757
parent
fd150459
Changes
11
Show whitespace changes
Inline
Side-by-side
src/common/compat.c
View file @
97dad670
...
...
@@ -767,7 +767,6 @@ void tor_gettimeofday(struct timeval *timeval) {
return
;
}
#if defined(TOR_IS_MULTITHREADED) && !defined(MS_WINDOWS)
#define TIME_FNS_NEED_LOCKS
#endif
...
...
src/common/compat.h
View file @
97dad670
...
...
@@ -206,7 +206,6 @@ char *get_user_homedir(const char *username);
int
spawn_func
(
int
(
*
func
)(
void
*
),
void
*
data
);
void
spawn_exit
(
void
);
#if defined(MS_WINDOWS)
#define USE_WIN32_THREADS
#define TOR_IS_MULTITHREADED 1
...
...
@@ -230,10 +229,8 @@ unsigned long tor_get_thread_id(void);
#define tor_mutex_new() ((tor_mutex_t*)tor_malloc(sizeof(int)))
#define tor_mutex_acquire(m) do { } while (0)
#define tor_mutex_release(m) do { } while (0)
#define tor_mutex_free(m) do { tor_free(m); } while(0)
#define tor_mutex_free(m) do { tor_free(m); } while
(0)
#define tor_get_thread_id() (1UL)
#endif
#endif
src/or/buffers.c
View file @
97dad670
...
...
@@ -645,7 +645,6 @@ int fetch_from_buf_socks(buf_t *buf, socks_request_t *req) {
}
}
#define CONTROL_CMD_FRAGMENTHEADER 0x0010
#define CONTROL_CMD_FRAGMENT 0x0011
/** If there is a complete control message waiting on buf, then store
...
...
@@ -759,4 +758,3 @@ void assert_buf_ok(buf_t *buf)
tor_assert
(
buf
->
mem
);
tor_assert
(
buf
->
datalen
<=
buf
->
len
);
}
src/or/circuitbuild.c
View file @
97dad670
...
...
@@ -1355,4 +1355,3 @@ onion_extend_cpath(crypt_path_t **head_ptr, cpath_build_state_t
*
router_out
=
choice
;
return
0
;
}
src/or/circuituse.c
View file @
97dad670
...
...
@@ -548,7 +548,7 @@ circuit_testing_opened(circuit_t *circ) {
/* For now, we only use testing circuits to see if our ORPort is
reachable. So, if this circuit ends at us, remember that. */
routerinfo_t
*
exit
=
router_get_by_digest
(
circ
->
build_state
->
chosen_exit_digest
);
if
(
exit
&&
router_is_me
(
exit
))
{
if
(
exit
&&
router_is_me
(
exit
))
{
log_fn
(
LOG_NOTICE
,
"Your ORPort is reachable from the outside. Excellent."
);
router_orport_found_reachable
();
}
...
...
@@ -1009,7 +1009,6 @@ connection_ap_handshake_attach_chosen_circuit(connection_t *conn,
return
1
;
}
/** Try to find a safe live circuit for CONN_TYPE_AP connection conn. If
* we don't find one: if conn cannot be handled by any known nodes,
* warn and return -1 (conn needs to die);
...
...
@@ -1133,4 +1132,3 @@ int connection_ap_handshake_attach_circuit(connection_t *conn) {
return
0
;
}
}
src/or/connection.c
View file @
97dad670
...
...
@@ -1243,7 +1243,6 @@ connection_t *connection_get_by_identity_digest(const char *digest, int type)
return
best
;
}
/** Return the connection with id <b>id</b> if it is not already
* marked for close.
*/
...
...
@@ -1266,7 +1265,6 @@ connection_get_by_global_id(uint32_t id) {
return
NULL
;
}
/** Return a connection of type <b>type</b> that is not marked for
* close.
*/
...
...
@@ -1675,4 +1673,3 @@ void assert_connection_ok(connection_t *conn, time_t now)
tor_assert
(
0
);
}
}
src/or/connection_edge.c
View file @
97dad670
...
...
@@ -172,7 +172,6 @@ connection_edge_end_errno(connection_t *conn, crypt_path_t *cpath_layer)
return
connection_edge_end
(
conn
,
reason
,
cpath_layer
);
}
/** Connection <b>conn</b> has finished writing and has no bytes left on
* its outbuf.
*
...
...
@@ -358,7 +357,6 @@ connection_ap_detach_retriable(connection_t *conn, circuit_t *circ)
}
}
/** A client-side struct to remember requests to rewrite addresses
* to new addresses. These structs make up a tree, with addressmap
* below as its root.
...
...
src/or/connection_or.c
View file @
97dad670
...
...
@@ -107,7 +107,7 @@ int connection_or_process_inbuf(connection_t *conn) {
tor_assert
(
conn
);
tor_assert
(
conn
->
type
==
CONN_TYPE_OR
);
switch
(
conn
->
state
)
{
switch
(
conn
->
state
)
{
case
OR_CONN_STATE_PROXY_READING
:
return
connection_or_read_proxy_response
(
conn
);
case
OR_CONN_STATE_OPEN
:
...
...
@@ -131,7 +131,7 @@ int connection_or_finished_flushing(connection_t *conn) {
assert_connection_ok
(
conn
,
0
);
switch
(
conn
->
state
)
{
switch
(
conn
->
state
)
{
case
OR_CONN_STATE_PROXY_FLUSHING
:
log_fn
(
LOG_DEBUG
,
"finished sending CONNECT to proxy."
);
conn
->
state
=
OR_CONN_STATE_PROXY_READING
;
...
...
src/or/control.c
View file @
97dad670
...
...
@@ -669,7 +669,6 @@ static int handle_control_attachstream(connection_t *conn, uint32_t len,
return
0
;
}
if
(
!
(
circ
=
circuit_get_by_global_id
(
circ_id
)))
{
send_control_error
(
conn
,
ERR_NO_CIRC
,
"No circuit found with given ID"
);
return
0
;
...
...
src/or/dns.c
View file @
97dad670
...
...
@@ -101,7 +101,7 @@ void dns_init(void) {
static
void
_free_cached_resolve
(
struct
cached_resolve
*
r
)
{
while
(
r
->
pending_connections
)
{
while
(
r
->
pending_connections
)
{
struct
pending_connection_t
*
victim
=
r
->
pending_connections
;
r
->
pending_connections
=
victim
->
next
;
tor_free
(
victim
);
...
...
src/or/main.c
View file @
97dad670
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment