r11931@catbus: nickm | 2007-02-24 15:28:34 -0500

 crank up the length of the maximum allowed control message.

svn:r9644

diff --git a/ChangeLog b/ChangeLog
index c9e8d80549b75f62e08541459c931ba7cae958c7..0033d006c6a519497020969ac36704fc812bc38d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,8 @@ Changes in version 0.1.2.8-alpha - 2007-??-??
       "INTERNAL".
     - Change reported stream target addresses to IP consistently when
       we finally get the IP from an exit node.
+    - Send log messages to the controller even if they happen to be very
+      long.
 
   o Minor bugfixes (other):
     - Display correct results when reporting which versions are

diff --git a/src/or/control.c b/src/or/control.c
index 766e2bce4bebe2a6a0a1e40fa115d08a241913d3..bfe6281570c478640a87a7490e581e30bf52445a 100644 (file)
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -729,9 +729,10 @@ static void
 send_control1_event_impl(uint16_t event, event_format_t which, int extended,
                          const char *format, va_list ap)
 {
-#define SEND_CONTROL1_EVENT_BUFFERSIZE 1024
+  /* This is just a little longer than the longest allowed log message */
+#define SEND_CONTROL1_EVENT_BUFFERSIZE 10064
   int r;
-  char buf[SEND_CONTROL1_EVENT_BUFFERSIZE]; /* XXXX Length */
+  char buf[SEND_CONTROL1_EVENT_BUFFERSIZE];
   size_t len;
   char *cp;