sqlite3: insert ipv6 addresses as null rather than garbage

Currently, the plug-in assumes that all IP addresses are 32-bit ipv4
addresses, so ipv6 addresses get truncated and inserted as garbage.
Insert nulls instead.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/output/sqlite3/ulogd_output_SQLITE3.c b/output/sqlite3/ulogd_output_SQLITE3.c
index 3a823892a2dd56282353669957dfeae259c82db5..6aeb7a3865e1b66d91e8ca4e632c4aae40a7e423 100644 (file)
--- a/output/sqlite3/ulogd_output_SQLITE3.c
+++ b/output/sqlite3/ulogd_output_SQLITE3.c
@@ -33,6 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <arpa/inet.h>
+#include <netinet/in.h>
 #include <ulogd/ulogd.h>
 #include <ulogd/conffile.h>
 #include <sqlite3.h>
@@ -178,7 +179,11 @@ sqlite3_interp(struct ulogd_pluginstance *pi)
                        break;
 
                case ULOGD_RET_IPADDR:
-                       ret = sqlite3_bind_int(priv->p_stmt, i, k_ret->u.value.ui32);
+                       if (k_ret->len == sizeof(struct in_addr))
+                               ret = sqlite3_bind_int(priv->p_stmt, i,
+                                                      k_ret->u.value.ui32);
+                       else
+                               ret = sqlite3_bind_null(priv->p_stmt, i);
                        break;
 
                case ULOGD_RET_UINT64: