summaryrefslogtreecommitdiff
path: root/src/or/routerparse.c
diff options
context:
space:
mode:
authorRobert Ransom <rransom.8774@gmail.com>2011-04-18 13:36:19 -0700
committerRobert Ransom <rransom.8774@gmail.com>2011-04-18 13:36:19 -0700
commit130db1bdebb7089d78db6d3e0f7497ac5ee71f73 (patch)
tree75da1c0b91bda0e3e166523d2489e57a20ca0c78 /src/or/routerparse.c
parent4cbbb92e7fc7c9c4d374b35211c216a5419e3da2 (diff)
parentadc31001c2f9923f8fcee2141d233200c95373cf (diff)
downloadtor-130db1bdebb7089d78db6d3e0f7497ac5ee71f73.tar.gz
tor-130db1bdebb7089d78db6d3e0f7497ac5ee71f73.zip
Merge branch 'bug2750-v3' into bug2948
Diffstat (limited to 'src/or/routerparse.c')
-rw-r--r--src/or/routerparse.c4
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;
}