diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-19 12:31:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-19 12:31:42 -0400 |
| commit | 0e554f93d677fefc649d103ed08ba298c27b3fed (patch) | |
| tree | 75da1c0b91bda0e3e166523d2489e57a20ca0c78 /src/or/routerparse.c | |
| parent | bc532bb13ff158f4c61ce04c7fd2bd0401ebe5a9 (diff) | |
| parent | dfc9c6a0f9c0488e437dfbf1181041ca0e194f1d (diff) | |
| download | tor-0e554f93d677fefc649d103ed08ba298c27b3fed.tar.gz tor-0e554f93d677fefc649d103ed08ba298c27b3fed.zip | |
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
Diffstat (limited to 'src/or/routerparse.c')
| -rw-r--r-- | src/or/routerparse.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 95e174e550..8456a0a02d 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4639,8 +4639,10 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out, eos = eos + 1; /* Check length. */ if (strlen(desc) > REND_DESC_MAX_SIZE) { + /* XXX023 If we are parsing this descriptor as a server, this + * should be a protocol warning. */ log_warn(LD_REND, "Descriptor length is %i which exceeds " - "maximum rendezvous descriptor size of %i kilobytes.", + "maximum rendezvous descriptor size of %i bytes.", (int)strlen(desc), REND_DESC_MAX_SIZE); goto err; } |