remove endtimestamp from interval statistics

code_boost/src/cxx/statistics_db.cpp

@@ -665,7 +665,6 @@ void statistics_db::writeStatisticsInterval(const std::unordered_map<std::string
             db->exec("CREATE TABLE " + table_name + " ("
                     "last_pkt_timestamp TEXT,"
                     "first_pkt_timestamp TEXT,"
-                    "endTimestamp TEXT,"
                     "pkts_count INTEGER,"
                     "pkt_rate REAL,"
                     "kBytes REAL,"
@@ -781,58 +780,57 @@ void statistics_db::writeStatisticsInterval(const std::unordered_map<std::string
                 }
             }
 
-            SQLite::Statement query(*db, "INSERT INTO " + table_name + " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+            SQLite::Statement query(*db, "INSERT INTO " + table_name + " VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
             for (auto it = intervalStatistics.begin(); it != intervalStatistics.end(); ++it) {
                 const entry_intervalStat &e = it->second;
 
                 query.bindNoCopy(1, it->first);
                 query.bind(2, e.start);
-                query.bind(3, e.end);
-                query.bind(4, (int)e.pkts_count);
-                query.bind(5, e.pkt_rate);
-                query.bind(6, e.kbytes);
-                query.bind(7, e.kbyte_rate);
-                query.bind(8, e.ip_src_entropy);
-                query.bind(9, e.ip_dst_entropy);
-                query.bind(10, e.ip_src_cum_entropy);
-                query.bind(11, e.ip_dst_cum_entropy);
-                query.bind(12, e.payload_count);
-                query.bind(13, e.incorrect_tcp_checksum_count);
-                query.bind(14, e.correct_tcp_checksum_count);
-                query.bind(15, e.novel_ip_count);
-                query.bind(16, e.novel_port_count);
-                query.bind(17, e.novel_ttl_count);
-                query.bind(18, e.novel_win_size_count);
-                query.bind(19, e.novel_tos_count);
-                query.bind(20, e.novel_mss_count);
-                query.bind(21, e.port_entropies[0]);
-                query.bind(22, e.ttl_entropies[0]);
-                query.bind(23, e.win_size_entropies[0]);
-                query.bind(24, e.tos_entropies[0]);
-                query.bind(25, e.mss_entropies[0]);
-                query.bind(26, e.port_entropies[1]);
-                query.bind(27, e.ttl_entropies[1]);
-                query.bind(28, e.win_size_entropies[1]);
-                query.bind(29, e.tos_entropies[1]);
-                query.bind(30, e.mss_entropies[1]);
-                query.bind(31, e.port_entropies[0]/port_entropy);
-                query.bind(32, e.ttl_entropies[0]/ttl_entropy);
-                query.bind(33, e.win_size_entropies[0]/win_size_entropy);
-                query.bind(34, e.tos_entropies[0]/tos_entropy);
-                query.bind(35, e.mss_entropies[0]/mss_entropy);
-                query.bind(36, e.port_entropies[1]/port_novel_entropy);
-                query.bind(37, e.ttl_entropies[1]/ttl_novel_entropy);
-                query.bind(38, e.win_size_entropies[1]/win_size_novel_entropy);
-                query.bind(39, e.tos_entropies[1]/tos_novel_entropy);
-                query.bind(40, e.mss_entropies[1]/mss_novel_entropy);
-                query.bind(41, e.ip_src_entropy/ip_src_entropy);
-                query.bind(42, e.ip_dst_entropy/ip_dst_entropy);
-                query.bind(43, e.ip_src_cum_entropy/ip_src_cum_entropy);
-                query.bind(44, e.ip_dst_cum_entropy/ip_dst_cum_entropy);
-                query.bind(45, e.ip_src_novel_entropy);
-                query.bind(46, e.ip_dst_novel_entropy);
-                query.bind(47, e.ip_src_novel_entropy/ip_src_novel_entropy);
-                query.bind(48, e.ip_dst_novel_entropy/ip_dst_novel_entropy);
+                query.bind(3, (int)e.pkts_count);
+                query.bind(4, e.pkt_rate);
+                query.bind(5, e.kbytes);
+                query.bind(6, e.kbyte_rate);
+                query.bind(7, e.ip_src_entropy);
+                query.bind(8, e.ip_dst_entropy);
+                query.bind(9, e.ip_src_cum_entropy);
+                query.bind(10, e.ip_dst_cum_entropy);
+                query.bind(11, e.payload_count);
+                query.bind(12, e.incorrect_tcp_checksum_count);
+                query.bind(13, e.correct_tcp_checksum_count);
+                query.bind(14, e.novel_ip_count);
+                query.bind(15, e.novel_port_count);
+                query.bind(16, e.novel_ttl_count);
+                query.bind(17, e.novel_win_size_count);
+                query.bind(18, e.novel_tos_count);
+                query.bind(19, e.novel_mss_count);
+                query.bind(20, e.port_entropies[0]);
+                query.bind(21, e.ttl_entropies[0]);
+                query.bind(22, e.win_size_entropies[0]);
+                query.bind(23, e.tos_entropies[0]);
+                query.bind(24, e.mss_entropies[0]);
+                query.bind(25, e.port_entropies[1]);
+                query.bind(26, e.ttl_entropies[1]);
+                query.bind(27, e.win_size_entropies[1]);
+                query.bind(28, e.tos_entropies[1]);
+                query.bind(29, e.mss_entropies[1]);
+                query.bind(30, e.port_entropies[0]/port_entropy);
+                query.bind(31, e.ttl_entropies[0]/ttl_entropy);
+                query.bind(32, e.win_size_entropies[0]/win_size_entropy);
+                query.bind(33, e.tos_entropies[0]/tos_entropy);
+                query.bind(34, e.mss_entropies[0]/mss_entropy);
+                query.bind(35, e.port_entropies[1]/port_novel_entropy);
+                query.bind(36, e.ttl_entropies[1]/ttl_novel_entropy);
+                query.bind(37, e.win_size_entropies[1]/win_size_novel_entropy);
+                query.bind(38, e.tos_entropies[1]/tos_novel_entropy);
+                query.bind(39, e.mss_entropies[1]/mss_novel_entropy);
+                query.bind(40, e.ip_src_entropy/ip_src_entropy);
+                query.bind(41, e.ip_dst_entropy/ip_dst_entropy);
+                query.bind(42, e.ip_src_cum_entropy/ip_src_cum_entropy);
+                query.bind(43, e.ip_dst_cum_entropy/ip_dst_cum_entropy);
+                query.bind(44, e.ip_src_novel_entropy);
+                query.bind(45, e.ip_dst_novel_entropy);
+                query.bind(46, e.ip_src_novel_entropy/ip_src_novel_entropy);
+                query.bind(47, e.ip_dst_novel_entropy/ip_dst_novel_entropy);
                 query.exec();
                 query.reset();
 

code_boost/src/cxx/statistics_db.h

@@ -25,7 +25,7 @@ public:
     /*
      * Database version: Increment number on every change in the C++ code!
      */
-    static const int DB_VERSION = 24;
+    static const int DB_VERSION = 25;
 
     /*
      * Methods to read from database