diff options
| author | Roger Dingledine <arma@torproject.org> | 2005-01-28 08:53:47 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2005-01-28 08:53:47 +0000 |
| commit | b2fbd834f0c339ce2102af424e68c85aa566153e (patch) | |
| tree | 3c7994e1298d0b9786cb4a644b401107c399f28b /src/or/or.h | |
| parent | d7cee9dbf430ddbf24095287984b305659db9670 (diff) | |
| download | tor-b2fbd834f0c339ce2102af424e68c85aa566153e.tar.gz tor-b2fbd834f0c339ce2102af424e68c85aa566153e.zip | |
forward-port the dns and maxconn fixes
svn:r3448
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/or.h b/src/or/or.h index 55d492a543..bdc880df69 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -130,7 +130,7 @@ /** Upper bound on maximum simultaneous connections; can be lowered by * config file. */ -#define MAXCONNECTIONS 10000 +#define MAXCONNECTIONS 15000 #define DEFAULT_BANDWIDTH_OP (1024 * 1000) #define MAX_NICKNAME_LEN 19 @@ -401,7 +401,8 @@ typedef enum { #define END_STREAM_REASON_DESTROY 5 #define END_STREAM_REASON_DONE 6 #define END_STREAM_REASON_TIMEOUT 7 -#define _MAX_END_STREAM_REASON 7 +#define END_STREAM_REASON_RESOURCELIMIT 8 +#define _MAX_END_STREAM_REASON 8 #define RESOLVED_TYPE_IPV4 4 #define RESOLVED_TYPE_IPV6 6 |