This patch suppress a now unused option. Each database module

have now to be used with a defined IP storage type.

Signed-off-by: Eric Leblond <eric@inl.fr>

diff --git a/include/ulogd/db.h b/include/ulogd/db.h
index 62819f2fe8ef0aa1f40f71ea3c007be2f3eb98ff..b0b7295921f2ced0a6b867dee5f87850afd5b97b 100644 (file)
--- a/include/ulogd/db.h
+++ b/include/ulogd/db.h
@@ -36,10 +36,6 @@ struct db_instance {
                        .type = CONFIG_TYPE_INT,                \
                        .u.value = RECONNECT_DEFAULT,           \
                },                                              \
-               {                                               \
-                       .key = "ip_as_string",                  \
-                       .type = CONFIG_TYPE_INT,                \
-               },                                              \
                {                                               \
                        .key = "connect_timeout",               \
                        .type = CONFIG_TYPE_INT,                \
@@ -50,12 +46,11 @@ struct db_instance {
                        .options = CONFIG_OPT_MANDATORY,        \
                }
 
-#define DB_CE_NUM      5
+#define DB_CE_NUM      4
 #define table_ce(x)    (x->ces[0])
 #define reconnect_ce(x)        (x->ces[1])
-#define asstring_ce(x) (x->ces[2])
-#define timeout_ce(x)  (x->ces[3])
-#define procedure_ce(x)        (x->ces[4])
+#define timeout_ce(x)  (x->ces[2])
+#define procedure_ce(x)        (x->ces[3])
 
 void ulogd_db_signal(struct ulogd_pluginstance *upi, int signal);
 int ulogd_db_start(struct ulogd_pluginstance *upi);

diff --git a/util/db.c b/util/db.c
index b9ca8db24f0eee96d68ff16c5fb7ce6ea23fe7a1..3cfe05737cac651a3fa6933bb0e56ade0bc6bebf 100644 (file)
--- a/util/db.c
+++ b/util/db.c
@@ -265,17 +265,6 @@ static int __interp_db(struct ulogd_pluginstance *upi)
                        sprintf(di->stmt_ins, "%u,", res->u.value.ui16);
                        break;
                case ULOGD_RET_IPADDR:
-                       if (asstring_ce(upi->config_kset).u.value) {
-                               memset(&addr, 0, sizeof(addr));
-                               addr.s_addr = ntohl(res->u.value.ui32);
-                               *(di->stmt_ins++) = '\'';
-                               tmpstr = inet_ntoa(addr);
-                               di->driver->escape_string(upi, di->stmt_ins,
-                                                         tmpstr, strlen(tmpstr));
-                               di->stmt_ins = di->stmt + strlen(di->stmt);
-                               sprintf(di->stmt_ins, "',");
-                               break;
-                       }
                        /* fallthrough when logging IP as u_int32_t */
                case ULOGD_RET_UINT32:
                        sprintf(di->stmt_ins, "%u,", res->u.value.ui32);