diff options
| author | Nick Mathewson <nickm@torproject.org> | 2004-09-21 18:09:38 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2004-09-21 18:09:38 +0000 |
| commit | c20b24c952e4018ac738c633c2fc821bbc80958d (patch) | |
| tree | 7a69e85f696e615ba9cfa24990472649f6143d22 | |
| parent | d977677aa812befe8f8674d78a0b0bd26a74c451 (diff) | |
| download | tor-c20b24c952e4018ac738c633c2fc821bbc80958d.tar.gz tor-c20b24c952e4018ac738c633c2fc821bbc80958d.zip | |
clean up/bugfix deflate logic and log messages
svn:r2359
| -rw-r--r-- | src/or/directory.c | 8 | ||||
| -rw-r--r-- | src/or/dirserv.c | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index e27f61dd39..872f7b7cd7 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -581,7 +581,8 @@ directory_handle_command_get(connection_t *conn, char *headers, } if(!strcmp(url,"/") || !strcmp(url,"/dir.z")) { /* directory fetch */ - dlen = dirserv_get_directory(&cp, !strcmp(url,"/dir.z")); + int deflated = !strcmp(url,"/dir.z"); + dlen = dirserv_get_directory(&cp, deflated); if(dlen == 0) { log_fn(LOG_WARN,"My directory is empty. Closing."); @@ -589,12 +590,13 @@ directory_handle_command_get(connection_t *conn, char *headers, return 0; } - log_fn(LOG_DEBUG,"Dumping directory to client."); + log_fn(LOG_DEBUG,"Dumping %sdirectory to client.", + deflated?"deflated ":""); format_rfc1123_time(date, time(NULL)); snprintf(tmp, sizeof(tmp), "HTTP/1.0 200 OK\r\nDate: %s\r\nContent-Length: %d\r\nContent-Type: text/plain\r\nContent-Encoding: %s\r\n\r\n", date, (int)dlen, - strcmp(url,"/dir.z")?"identity":"deflate"); + deflated?"deflate":"identity"); connection_write_to_buf(tmp, strlen(tmp), conn); connection_write_to_buf(cp, strlen(cp), conn); return 0; diff --git a/src/or/dirserv.c b/src/or/dirserv.c index dc7804b3bb..0d9d433a10 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -678,8 +678,8 @@ size_t dirserv_get_directory(const char **directory, int deflate) } else { log(LOG_INFO,"Directory still clean, reusing."); } - *directory = deflate ? the_directory : the_directory_z; - return deflate ? the_directory_len : the_directory_z_len; + *directory = deflate ? the_directory_z : the_directory; + return deflate ? the_directory_z_len : the_directory_len; } /** |