summaryrefslogtreecommitdiff
path: root/src/or/connection_or.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-11-28 11:39:53 +0000
committerRoger Dingledine <arma@torproject.org>2004-11-28 11:39:53 +0000
commit22727b4edc64b26aed850297dbf274bab7fd6c44 (patch)
tree1456f14c2cff195e87fc8080a741ae05eb2fbe48 /src/or/connection_or.c
parentf7c6ad065e2c433acb3fcccb1e9c7812c262579d (diff)
downloadtor-22727b4edc64b26aed850297dbf274bab7fd6c44.tar.gz
tor-22727b4edc64b26aed850297dbf274bab7fd6c44.zip
wrong is ok, and right is fine, but in between is apparently
totally unacceptable to me. svn:r3005
Diffstat (limited to 'src/or/connection_or.c')
-rw-r--r--src/or/connection_or.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 0facd1aa5d..719cf20c8d 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -208,7 +208,7 @@ connection_t *connection_or_connect(uint32_t addr, uint16_t port,
tor_assert(id_digest);
if (server_mode(get_options()) && (me=router_get_my_routerinfo()) &&
- !memcmp(me->identity_digest, id_digest,DIGEST_LEN)) {
+ !memcmp(me->identity_digest, id_digest,DIGEST_LEN)) {
log_fn(LOG_WARN,"Request to connect to myself! Failing.");
return NULL;
}
@@ -385,8 +385,8 @@ connection_tls_finish_handshake(connection_t *conn) {
router = router_get_by_nickname(nickname);
if (router && /* we know this nickname */
- router->is_verified && /* make sure it's the right guy */
- memcmp(digest_rcvd, router->identity_digest, DIGEST_LEN) != 0) {
+ router->is_verified && /* make sure it's the right guy */
+ memcmp(digest_rcvd, router->identity_digest, DIGEST_LEN) != 0) {
log_fn(LOG_WARN, "Identity key not as expected for router claiming to be '%s' (%s:%d) ", nickname, conn->address, conn->port);
return -1;
}
@@ -455,7 +455,7 @@ void connection_or_write_cell_to_buf(const cell_t *cell, connection_t *conn) {
* during periods of high load we won't read the entire megabyte from
* input before pushing any data out. */
if (conn->outbuf_flushlen-CELL_NETWORK_SIZE < MIN_TLS_FLUSHLEN &&
- conn->outbuf_flushlen >= MIN_TLS_FLUSHLEN) {
+ conn->outbuf_flushlen >= MIN_TLS_FLUSHLEN) {
int extra = conn->outbuf_flushlen - MIN_TLS_FLUSHLEN;
conn->outbuf_flushlen = MIN_TLS_FLUSHLEN;
if (connection_handle_write(conn) < 0) {