Consider address family in update

With IPv6, there are two address families for one device. Consider
address family when handling update messages.

Author: kristrev

metadata_writer_inventory_conn.c

@@ -80,7 +80,8 @@ static int32_t md_inventory_execute_insert_update(struct md_writer_sqlite *mws,
         sqlite3_bind_int(stmt, 11, mce->connectivity) ||
         sqlite3_bind_int(stmt, 13, mce->quality) ||
         sqlite3_bind_int(stmt, 14, mce->interface_type) ||
-        sqlite3_bind_text(stmt, 16, mce->network_address, strlen(mce->network_address), SQLITE_STATIC)){
+        sqlite3_bind_int(stmt, 16, mce->network_address_family) ||
+        sqlite3_bind_text(stmt, 17, mce->network_address, strlen(mce->network_address), SQLITE_STATIC)){
         META_PRINT_SYSLOG(mws->parent, LOG_ERR, "Failed to bind values to INSERT query\n");
         return SQLITE_ERROR;
     }
@@ -201,18 +202,19 @@ static int32_t md_inventory_update_event(struct md_writer_sqlite *mws,
         sqlite3_bind_int(stmt, 5, mce->quality) ||
         sqlite3_bind_int(stmt, 7, mce->l3_session_id) ||
         sqlite3_bind_int(stmt, 8, mce->l4_session_id) ||
-        sqlite3_bind_text(stmt, 9, mce->network_address, strlen(mce->network_address), SQLITE_STATIC)) {
+        sqlite3_bind_int(stmt, 9, mce->network_address_family) ||
+        sqlite3_bind_text(stmt, 10, mce->network_address, strlen(mce->network_address), SQLITE_STATIC)) {
         META_PRINT_SYSLOG(mws->parent, LOG_ERR, "Failed to bind values to UPDATE query\n");
         return SQLITE_ERROR;
     }
 
     if (mws->api_version == 2 && mce->interface_type == INTERFACE_MODEM) {
-        if (sqlite3_bind_text(stmt, 10, mce->imei, strlen(mce->imei), SQLITE_STATIC)) {
+        if (sqlite3_bind_text(stmt, 11, mce->imei, strlen(mce->imei), SQLITE_STATIC)) {
             META_PRINT_SYSLOG(mws->parent, LOG_ERR, "Failed to bind IMEI\n");
             return SQLITE_ERROR;
         }
     } else {
-        if (sqlite3_bind_text(stmt, 10, mce->interface_id, strlen(mce->interface_id), SQLITE_STATIC)) {
+        if (sqlite3_bind_text(stmt, 11, mce->interface_id, strlen(mce->interface_id), SQLITE_STATIC)) {
             META_PRINT_SYSLOG(mws->parent, LOG_ERR, "Failed to bind interface id\n");
             return SQLITE_ERROR;
         }
@@ -349,7 +351,8 @@ static int16_t md_inventory_get_last_update(struct md_writer_sqlite *mws,
 
     if (sqlite3_bind_int(stmt, 1, mce->l3_session_id) ||
         sqlite3_bind_int(stmt, 2, mce->l4_session_id) ||
-        sqlite3_bind_text(stmt, 4, mce->network_address, strlen(mce->network_address), SQLITE_STATIC)) {
+        sqlite3_bind_int(stmt, 4, mce->network_address_family) ||
+        sqlite3_bind_text(stmt, 5, mce->network_address, strlen(mce->network_address), SQLITE_STATIC)) {
         META_PRINT_SYSLOG(mws->parent, LOG_ERR, "Failed to bind values to SELECT query\n");
         return retval;
     }

metadata_writer_sqlite.h

@@ -76,12 +76,13 @@
                             "Quality INTEGER," \
                             "InterfaceType INTEGER NOT NULL," \
                             "InterfaceId TEXT NOT NULL," \
+                            "NetworkAddressFamily INTEGER NOT NULL," \
                             "NetworkAddress TEXT NOT NULL," \
                             "NetworkProvider INT," \
                             "EventValueStr TEXT, " \
                             "PRIMARY KEY(SessionId,SessionIdMultip,"\
                             "L3SessionId,L4SessionId,InterfaceId,"\
-                            "NetworkAddress))"
+                            "NetworkAddressFamily,NetworkAddress))"
 
 #define CREATE_GPS_SQL      "CREATE TABLE IF NOT EXISTS GpsUpdate(" \
                             "NodeId INTEGER NOT NULL," \
@@ -137,8 +138,8 @@
 #define INSERT_UPDATE       "INSERT INTO NetworkUpdates(NodeId,SessionId,"\
                             "SessionIdMultip,Timestamp,Sequence,L3SessionId,"\
                             "L4SessionId,EventType,EventParam,HasIp,Connectivity,ConnectionMode,Quality"\
-                            ",InterfaceType,InterfaceId,NetworkAddress,NetworkProvider,EventValueStr) " \
-                            "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"
+                            ",InterfaceType,InterfaceId,NetworkAddressFamily,NetworkAddress,NetworkProvider,EventValueStr) " \
+                            "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"
 
 #define INSERT_GPS_EVENT    "INSERT INTO GpsUpdate(NodeId,BootCount" \
                             ",BootMultiplier,Timestamp" \
@@ -163,6 +164,7 @@
                             " FROM NetworkUpdates WHERE "\
                             "L3SessionId=? AND "\
                             "L4SessionId=? AND InterfaceId=? AND "\
+                            "NetworkAddressFamily=? AND "\
                             "NetworkAddress=? ORDER BY Timestamp DESC LIMIT 1;"
 
 //The reason NetworkAddress is used here, is that we first identify by L3/L4
@@ -178,7 +180,8 @@
                             "Quality=?,EventValueStr=? " \
                             "WHERE "\
                             "L3SessionId=? AND L4SessionId=? " \
-                            "AND NetworkAddress=? AND InterfaceId=?"
+                            "AND NetworkAddressFamily=? AND "\
+                            "NetworkAddress=? AND InterfaceId=?"
 
 #define UPDATE_USAGE        "UPDATE DataUse SET " \
                             "RxData = RxData + ?, TxData = TxData + ? " \