Merge pull request #747 from robertdavidgraham/integration

ISAKMP parser

src/main.c

@@ -1816,6 +1816,8 @@ int main(int argc, char *argv[])
          */
         {
             int x = 0;
+            extern int proto_isakmp_selftest(void);
+
             x += massip_selftest();
             x += ranges6_selftest();
             x += dedup_selftest();
@@ -1830,6 +1832,7 @@ int main(int argc, char *argv[])
             x += siphash24_selftest();
             x += ntp_selftest();
             x += snmp_selftest();
+            x += proto_isakmp_selftest();
             x += templ_payloads_selftest();
             x += blackrock_selftest();
             x += rawsock_selftest();

src/out-binary.c

@@ -104,7 +104,7 @@ binary_out_status_ipv6(struct Output *out, FILE *fp, time_t timestamp,
     int status, ipaddress ip, unsigned ip_proto, unsigned port, unsigned reason, unsigned ttl)
 {
     unsigned char buf[256+1];
-    size_t max = sizeof(buf-1);
+    size_t max = sizeof(buf)-1;
     size_t offset = 0;
     size_t bytes_written;
 

src/proto-banout.c

@@ -16,6 +16,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdarg.h>
 
 /***************************************************************************
  ***************************************************************************/
@@ -284,6 +285,41 @@ banout_expand(struct BannerOutput *banout, struct BannerOutput *p)
     return n;
 }
 
+
+
+
+
+
+/***************************************************************************
+ ***************************************************************************/
+static void
+banout_vprintf(struct BannerOutput *banout, unsigned proto,
+               const char *fmt, va_list marker) {
+    char str[10];
+    int len;
+
+    len = vsnprintf(str, sizeof(str), fmt, marker);
+    if (len > sizeof(str)-1) {
+        char *tmp = malloc(len+1);
+        vsnprintf(tmp, len+1, fmt, marker);
+        banout_append(banout, proto, tmp, len);
+        free(tmp);
+    } else {
+        banout_append(banout, proto, str, len);
+    }
+}
+
+/***************************************************************************
+ ***************************************************************************/
+void
+banout_printf(struct BannerOutput *banout, unsigned proto, const char *fmt, ...) {
+    va_list marker;
+
+    va_start(marker, fmt);
+    banout_vprintf(banout, proto, fmt, marker);
+    va_end(marker);
+}
+
 /***************************************************************************
  ***************************************************************************/
 void

src/proto-banout.h

@@ -59,6 +59,9 @@ void
 banout_append(struct BannerOutput *banout, unsigned proto, const void *px, size_t length);
 #define AUTO_LEN ((size_t)~0)
 
+void
+banout_printf(struct BannerOutput *banout, unsigned proto, const char *fmt, ...);
+
 /**
  * Append a single character to the banner.
  */