summaryrefslogtreecommitdiff
path: root/src/or/onion.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2004-11-28 09:05:49 +0000
committerNick Mathewson <nickm@torproject.org>2004-11-28 09:05:49 +0000
commit6f5dbefa7efe0c0c86928777b8821b3fdc91cf45 (patch)
treee92106bd8cac85684983daf62d952a9d8e6b8f18 /src/or/onion.c
parent67dc7baa59e2b38a6720d843b54257ca0dd9e722 (diff)
downloadtor-6f5dbefa7efe0c0c86928777b8821b3fdc91cf45.tar.gz
tor-6f5dbefa7efe0c0c86928777b8821b3fdc91cf45.zip
Normalize space: add one between every control keyword and control clause.
svn:r3003
Diffstat (limited to 'src/or/onion.c')
-rw-r--r--src/or/onion.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/or/onion.c b/src/or/onion.c
index b940bd5390..a5abf3a9a9 100644
--- a/src/or/onion.c
+++ b/src/or/onion.c
@@ -32,7 +32,7 @@ int onion_pending_add(circuit_t *circ) {
tmp = tor_malloc_zero(sizeof(struct onion_queue_t));
tmp->circ = circ;
- if(!ol_tail) {
+ if (!ol_tail) {
tor_assert(!ol_list);
tor_assert(!ol_length);
ol_list = tmp;
@@ -44,7 +44,7 @@ int onion_pending_add(circuit_t *circ) {
tor_assert(ol_list);
tor_assert(!ol_tail->next);
- if(ol_length >= get_options()->MaxOnionsPending) {
+ if (ol_length >= get_options()->MaxOnionsPending) {
log_fn(LOG_WARN,"Already have %d onions queued. Closing.", ol_length);
tor_free(tmp);
return -1;
@@ -62,7 +62,7 @@ int onion_pending_add(circuit_t *circ) {
circuit_t *onion_next_task(void) {
circuit_t *circ;
- if(!ol_list)
+ if (!ol_list)
return NULL; /* no onions pending, we're done */
tor_assert(ol_list->circ);
@@ -79,28 +79,28 @@ circuit_t *onion_next_task(void) {
void onion_pending_remove(circuit_t *circ) {
struct onion_queue_t *tmpo, *victim;
- if(!ol_list)
+ if (!ol_list)
return; /* nothing here. */
/* first check to see if it's the first entry */
tmpo = ol_list;
- if(tmpo->circ == circ) {
+ if (tmpo->circ == circ) {
/* it's the first one. remove it from the list. */
ol_list = tmpo->next;
- if(!ol_list)
+ if (!ol_list)
ol_tail = NULL;
ol_length--;
victim = tmpo;
} else { /* we need to hunt through the rest of the list */
- for( ;tmpo->next && tmpo->next->circ != circ; tmpo=tmpo->next) ;
- if(!tmpo->next) {
+ for ( ;tmpo->next && tmpo->next->circ != circ; tmpo=tmpo->next) ;
+ if (!tmpo->next) {
log_fn(LOG_DEBUG,"circ (p_circ_id %d) not in list, probably at cpuworker.",circ->p_circ_id);
return;
}
/* now we know tmpo->next->circ == circ */
victim = tmpo->next;
tmpo->next = victim->next;
- if(ol_tail == victim)
+ if (ol_tail == victim)
ol_tail = tmpo;
ol_length--;
}
@@ -295,7 +295,7 @@ onion_skin_client_handshake(crypto_dh_env_t *handshake_state,
if (len < 0)
return -1;
- if(memcmp(key_material, handshake_reply+DH_KEY_LEN, 20)) {
+ if (memcmp(key_material, handshake_reply+DH_KEY_LEN, 20)) {
/* H(K) does *not* match. Something fishy. */
tor_free(key_material);
log_fn(LOG_WARN,"Digest DOES NOT MATCH on onion handshake. Bug or attack.");