Use v2.6 CI containers and nightly for the devcontainer

Signed-off-by: DL6ER <dl6er@dl6er.de>

src/database/aliasclients.c

@@ -8,15 +8,15 @@
 *  This file is copyright under the latest version of the EUPL.
 *  Please see LICENSE file for your rights under this license. */
 
-#include "../FTL.h"
+#include "FTL.h"
 #include "aliasclients.h"
 #include "common.h"
 // global counters variable
-#include "../shmem.h"
+#include "shmem.h"
 // global config variable
-#include "../config/config.h"
+#include "config/config.h"
 // logging routines
-#include "../log.h"
+#include "log.h"
 // getAliasclientIDfromIP()
 #include "network-table.h"
 

src/database/aliasclients.h

@@ -11,7 +11,7 @@
 #define ALIASCLIENTS_TABLE_H
 
 // type clientsData
-#include "../datastructure.h"
+#include "datastructure.h"
 
 
 bool create_aliasclients_table(sqlite3 *db);

src/database/gravity-db.c

@@ -8,29 +8,29 @@
 *  This file is copyright under the latest version of the EUPL.
 *  Please see LICENSE file for your rights under this license. */
 
-#include "../FTL.h"
+#include "FTL.h"
 #include "sqlite3.h"
 #include "gravity-db.h"
 // struct config
-#include "../config/config.h"
+#include "config/config.h"
 // logging routines
-#include "../log.h"
+#include "log.h"
 // getstr()
-#include "../shmem.h"
+#include "shmem.h"
 // SQLite3 prepared statement vectors
-#include "../vector.h"
+#include "vector.h"
 // log_subnet_warning()
 // logg_inaccessible_adlist
 #include "message-table.h"
 // getMACfromIP()
 #include "network-table.h"
 // struct DNSCacheData
-#include "../datastructure.h"
+#include "datastructure.h"
 // reset_aliasclient()
 #include "aliasclients.h"
 
 // Definition of struct regexData
-#include "../regex_r.h"
+#include "regex_r.h"
 
 // Prefix of interface names in the client table
 #define INTERFACE_SEP ":"

src/database/network-table.c

@@ -8,21 +8,21 @@
 *  This file is copyright under the latest version of the EUPL.
 *  Please see LICENSE file for your rights under this license. */
 
-#include "../FTL.h"
+#include "FTL.h"
 #include "network-table.h"
 #include "common.h"
-#include "../shmem.h"
-#include "../log.h"
+#include "shmem.h"
+#include "log.h"
 // timer_elapsed_msec()
-#include "../timers.h"
-#include "../config/config.h"
-#include "../datastructure.h"
+#include "timers.h"
+#include "config/config.h"
+#include "datastructure.h"
 // struct config
-#include "../config/config.h"
+#include "config/config.h"
 // resolve_this_name()
-#include "../resolve.h"
+#include "resolve.h"
 // killed
-#include "../signals.h"
+#include "signals.h"
 
 // Private prototypes
 static char *getMACVendor(const char *hwaddr) __attribute__ ((malloc));

src/database/query-table.c

@@ -1120,13 +1120,13 @@ void DB_read_queries(void)
 		   (buffer = (const char *)sqlite3_column_text(stmt, 6)) != NULL)
 		{
 			// Get IP address and port of upstream destination
-			char serv_addr[INET6_ADDRSTRLEN + 1] = { 0 };
+			char serv_addr[INET6_ADDRSTRLEN + 16] = { 0 };
 			unsigned int serv_port = 53;
 			// We limit the number of bytes written into the serv_addr buffer
 			// to prevent buffer overflows. If there is no port available in
 			// the database, we skip extracting them and use the default port
 			sscanf(buffer, "%"xstr(INET6_ADDRSTRLEN)"[^#]#%u", serv_addr, &serv_port);
-			serv_addr[INET6_ADDRSTRLEN-1] = '\0';
+			serv_addr[INET6_ADDRSTRLEN + 15] = '\0';
 			upstreamID = findUpstreamID(serv_addr, (in_port_t)serv_port);
 		}
 

src/database/sqlite3-ext.c

@@ -22,9 +22,9 @@
 // free()
 #include <stdlib.h>
 // logging routines
-#include "../log.h"
+#include "log.h"
 // struct config
-#include "../config/config.h"
+#include "config/config.h"
 
 // isMAC()
 #include "network-table.h"