sqlite: Add NetworkAddressFamily to usage table

Will export usage per address family

Author: kristrev

metadata_writer_inventory_conn.c

@@ -250,27 +250,28 @@ static int32_t md_inventory_execute_insert_usage(struct md_writer_sqlite *mws,
     //interface_id variable, so some special handling is needed for now
     if (mce->imei) {
         if (sqlite3_bind_text(stmt, 1, mce->imei, strlen(mce->imei), SQLITE_STATIC) ||
-            sqlite3_bind_text(stmt, 5, mce->imsi, strlen(mce->imsi), SQLITE_STATIC)) {
+            sqlite3_bind_text(stmt, 6, mce->imsi, strlen(mce->imsi), SQLITE_STATIC)) {
             META_PRINT_SYSLOG(mws->parent, LOG_ERR, "Failed to bind IMEI/IMSI\n");
             return SQLITE_ERROR;
         }
 
-        interface_id_idx = 4;
+        interface_id_idx = 5;
     } else {
-        if (sqlite3_bind_text(stmt, 4, no_iccid_str, strlen(no_iccid_str), SQLITE_STATIC) ||
-            sqlite3_bind_text(stmt, 5, no_iccid_str, strlen(no_iccid_str), SQLITE_STATIC)) {
+        if (sqlite3_bind_text(stmt, 5, no_iccid_str, strlen(no_iccid_str), SQLITE_STATIC) ||
+            sqlite3_bind_text(stmt, 6, no_iccid_str, strlen(no_iccid_str), SQLITE_STATIC)) {
             META_PRINT_SYSLOG(mws->parent, LOG_ERR, "Failed to bind empty IMEI/IMSI\n");
             return SQLITE_ERROR;
         }
     }
 
     if (sqlite3_bind_text(stmt, interface_id_idx, mce->interface_id,
             strlen(mce->interface_id), SQLITE_STATIC) ||
-        sqlite3_bind_int(stmt, 2, mce->event_type) ||
-        sqlite3_bind_int(stmt, 3, mce->event_param) ||
-        sqlite3_bind_int64(stmt, 6, date_start) ||
-        sqlite3_bind_int64(stmt, 7, mce->rx_bytes) ||
-        sqlite3_bind_int64(stmt, 8, mce->tx_bytes)) {
+        sqlite3_bind_int(stmt, 2, mce->network_address_family) ||
+        sqlite3_bind_int(stmt, 3, mce->event_type) ||
+        sqlite3_bind_int(stmt, 4, mce->event_param) ||
+        sqlite3_bind_int64(stmt, 7, date_start) ||
+        sqlite3_bind_int64(stmt, 8, mce->rx_bytes) ||
+        sqlite3_bind_int64(stmt, 9, mce->tx_bytes)) {
         META_PRINT_SYSLOG(mws->parent, LOG_ERR, "Failed to bind values to INSERT usage query\n");
         return SQLITE_ERROR;
     }

metadata_writer_sqlite.h

@@ -108,14 +108,15 @@
 
 #define CREATE_USAGE_SQL    "CREATE TABLE IF NOT EXISTS DataUse(" \
                             "DeviceId TEXT NOT NULL," \
+                            "NetworkAddressFamily INTEGER NOT NULL," \
                             "EventType INTEGER NOT NULL," \
                             "EventParam INTEGER NOT NULL," \
                             "SimCardIccid TEXT NOT NULL," \
                             "SimCardImsi TEXT NOT NULL," \
                             "Timestamp INTEGER NOT NULL," \
                             "RxData INTEGER NOT NULL,"\
                             "TxData INTEGER NOT NULL," \
-                            "PRIMARY KEY(DeviceId,SimCardIccid,SimCardImsi,Timestamp))"
+                            "PRIMARY KEY(DeviceId,NetworkAddressFamily,SimCardIccid,SimCardImsi,Timestamp))"
 
 #define CREATE_REBOOT_SQL   "CREATE TABLE IF NOT EXISTS RebootEvent(" \
                             "NodeId INTEGER NOT NULL," \
@@ -151,10 +152,10 @@
                              ",Sequence,Boottime) " \
                              "VALUES (?,?,?,?)"
 
-#define INSERT_USAGE        "INSERT INTO DataUse(DeviceId,EventType,EventParam" \
+#define INSERT_USAGE        "INSERT INTO DataUse(DeviceId,NetworkAddressFamily,EventType,EventParam" \
                             ",SimCardIccid" \
                             ",SimCardImsi,Timestamp,RxData,TxData) " \
-                            "VALUES (?,?,?,?,?,?,?,?)"
+                            "VALUES (?,?,?,?,?,?,?,?,?)"
 
 #define INSERT_REBOOT_EVENT "INSERT INTO RebootEvent(NodeId, BootCount," \
                             "BootMultiplier, Timestamp, Sequence, EventType, DeviceId)"\