diff options
author | Nick Mathewson <nickm@torproject.org> | 2011-04-19 12:31:55 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2011-04-19 12:31:55 -0400 |
commit | f52cfbfc0091dd759b51e6d236a4e4fbea22ba26 (patch) | |
tree | fbbec7210487b186fa48e2bf7c38795cf1412cf4 /src/or/routerparse.c | |
parent | bba47a836c2fa0e55805c3871b5851b97a014bdb (diff) | |
parent | 0e554f93d677fefc649d103ed08ba298c27b3fed (diff) | |
download | tor-f52cfbfc0091dd759b51e6d236a4e4fbea22ba26.tar.gz tor-f52cfbfc0091dd759b51e6d236a4e4fbea22ba26.zip |
Merge remote-tracking branch 'origin/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 cc98cc0e70..052a52e614 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; } |