For SNAT, don't store the pre-fragment L2 header before actions are applied.

[sliver-openvswitch.git] / lib / util.c

diff --git a/lib/util.c b/lib/util.c
index 59c7806..abf005d 100644 (file)
--- a/lib/util.c
+++ b/lib/util.c
@@ -33,6 +33,7 @@
 
 #include <config.h>
 #include "util.h"
+#include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -40,10 +41,10 @@
 
 const char *program_name;
 
-static void
+void
 out_of_memory(void) 
 {
-    fatal(0, "virtual memory exhausted");
+    ofp_fatal(0, "virtual memory exhausted");
 }
 
 void *
@@ -100,41 +101,56 @@ xstrdup(const char *s)
 }
 
 char *
-xasprintf(const char *format, ...)
+xvasprintf(const char *format, va_list args)
 {
-    va_list args;
+    va_list args2;
     size_t needed;
     char *s;
 
-    va_start(args, format);
+    va_copy(args2, args);
     needed = vsnprintf(NULL, 0, format, args);
-    va_end(args);
 
     s = xmalloc(needed + 1);
 
-    va_start(args, format);
-    vsnprintf(s, needed + 1, format, args);
-    va_end(args);
+    vsnprintf(s, needed + 1, format, args2);
+    va_end(args2);
 
     return s;
 }
 
-void fatal(int err_no, const char *format, ...)
+void *
+x2nrealloc(void *p, size_t *n, size_t s)
+{
+    *n = *n == 0 ? 1 : 2 * *n;
+    return xrealloc(p, *n * s);
+}
+
+char *
+xasprintf(const char *format, ...)
 {
     va_list args;
+    char *s;
 
-    fprintf(stderr, "%s: ", program_name);
     va_start(args, format);
-    vfprintf(stderr, format, args);
+    s = xvasprintf(format, args);
     va_end(args);
-    if (err_no != 0)
-        fprintf(stderr, " (%s)", strerror(err_no));
-    putc('\n', stderr);
 
-    exit(EXIT_FAILURE);
+    return s;
 }
 
-void error(int err_no, const char *format, ...)
+void
+strlcpy(char *dst, const char *src, size_t size)
+{
+    if (size > 0) {
+        size_t n = strlen(src);
+        size_t n_copy = MIN(n, size - 1);
+        memcpy(dst, src, n_copy);
+        dst[n_copy] = '\0';
+    }
+}
+
+void
+ofp_fatal(int err_no, const char *format, ...)
 {
     va_list args;
 
@@ -145,10 +161,14 @@ void error(int err_no, const char *format, ...)
     if (err_no != 0)
         fprintf(stderr, " (%s)", strerror(err_no));
     putc('\n', stderr);
+
+    exit(EXIT_FAILURE);
 }
 
-void debug(int err_no, const char *format, ...)
+void
+ofp_error(int err_no, const char *format, ...)
 {
+    int save_errno = errno;
     va_list args;
 
     fprintf(stderr, "%s: ", program_name);
@@ -158,6 +178,8 @@ void debug(int err_no, const char *format, ...)
     if (err_no != 0)
         fprintf(stderr, " (%s)", strerror(err_no));
     putc('\n', stderr);
+
+    errno = save_errno;
 }
 
 /* Sets program_name based on 'argv0'.  Should be called at the beginning of
@@ -173,8 +195,8 @@ void set_program_name(const char *argv0)
  * byte in 'buf'.  If 'ascii' is true then the corresponding ASCII characters
  * are also rendered alongside. */
 void
-hex_dump(FILE *stream, const void *buf_, size_t size,
-         uintptr_t ofs, bool ascii)
+ofp_hex_dump(FILE *stream, const void *buf_, size_t size,
+             uintptr_t ofs, bool ascii)
 {
   const uint8_t *buf = buf_;
   const size_t per_line = 16; /* Maximum bytes per line. */