Merge pull request #2179 from pi-hole/update/dnsmasq

Update dnsmasq to 2.91rc2

.gitignore

@@ -2,7 +2,7 @@
 pihole-FTL*
 
 # Versioning files (generated by Makefile)
-version.h
+version.c
 version~
 
 # CMake files generated during compilation

CMakeLists.txt

@@ -16,6 +16,6 @@ set(CMAKE_C_STANDARD 17)
 
 project(PIHOLE_FTL C)
 
-set(DNSMASQ_VERSION pi-hole-v2.91test10)
+set(DNSMASQ_VERSION pi-hole-v2.91rc2)
 
 add_subdirectory(src)

src/CMakeLists.txt

@@ -264,11 +264,10 @@ set(sources
         timers.h
         vector.c
         vector.h
+        version.c
         version.h
         )
 
-set_source_files_properties(version.h PROPERTIES GENERATED TRUE)
-
 add_custom_target(
         gen_version ALL
         COMMAND ${CMAKE_COMMAND} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -P ${CMAKE_CURRENT_SOURCE_DIR}/gen_version.cmake

src/api/info.c

@@ -823,9 +823,9 @@ int get_version_obj(struct ftl_conn *api, cJSON *version)
 	fclose(fp);
 
 	// Add remaining properties to ftl object
-	JSON_REF_STR_IN_OBJECT(ftl_local, "branch", GIT_BRANCH);
+	JSON_REF_STR_IN_OBJECT(ftl_local, "branch", git_branch());
 	JSON_REF_STR_IN_OBJECT(ftl_local, "version", get_FTL_version());
-	JSON_REF_STR_IN_OBJECT(ftl_local, "date", GIT_DATE);
+	JSON_REF_STR_IN_OBJECT(ftl_local, "date", git_date());
 
 	cJSON *core = JSON_NEW_OBJECT();
 	JSON_ADD_NULL_IF_NOT_EXISTS(core_local, "branch");

src/args.c

@@ -810,10 +810,10 @@ void parse_args(int argc, char *argv[])
 			       yellow, bold, normal);
 			printf("Version:         %s%s%s%s\n",
 			       green, bold, get_FTL_version(), normal);
-			printf("Branch:          " GIT_BRANCH "\n");
-			printf("Commit:          " GIT_HASH " (" GIT_DATE ")\n");
-			printf("Architecture:    " FTL_ARCH "\n");
-			printf("Compiler:        " FTL_CC "\n");
+			printf("Branch:          %s\n", git_branch());
+			printf("Commit:          %s (%s)",git_hash(), git_date());
+			printf("Architecture:    %s\n", ftl_arch());
+			printf("Compiler:        %s\n", ftl_cc());
 #if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
 			printf("GLIBC version:   %d.%d\n\n", __GLIBC__, __GLIBC_MINOR__);
 #else
@@ -920,20 +920,20 @@ void parse_args(int argc, char *argv[])
 		if(strcmp(argv[i], "-t") == 0 ||
 		   strcmp(argv[i], "tag") == 0)
 		{
-			printf("%s\n",GIT_TAG);
+			printf("%s\n", git_tag());
 			exit(EXIT_SUCCESS);
 		}
 
 		if(strcmp(argv[i], "-b") == 0 ||
 		   strcmp(argv[i], "branch") == 0)
 		{
-			printf("%s\n",GIT_BRANCH);
+			printf("%s\n", git_branch());
 			exit(EXIT_SUCCESS);
 		}
 
 		if(strcmp(argv[i], "--hash") == 0)
 		{
-			printf("%s\n",GIT_HASH);
+			printf("%s\n", git_hash());
 			exit(EXIT_SUCCESS);
 		}
 

src/database/message-table.c

@@ -1597,7 +1597,7 @@ void log_verify_message(const char *expected, const char *actual)
 	log_crit("%s", buf);
 
 	// Log to database
-	add_message(VERIFY_MESSAGE, buf, expected, actual, GIT_HASH, FTL_ARCH);
+	add_message(VERIFY_MESSAGE, buf, expected, actual, git_hash(), ftl_arch());
 
 }
 

src/database/query-table.c

@@ -1230,7 +1230,7 @@ void DB_read_queries(void)
 		if(type < 100)
 		{
 			// Mapped query type
-			if(type >= TYPE_A && type < TYPE_MAX)
+			if(type >= TYPE_NONE && type < TYPE_MAX)
 				query->type = type;
 			else
 			{

src/dnsmasq/dnsmasq.h

@@ -282,7 +282,8 @@ struct event_desc {
 #define OPT_CACHE_RR       71
 #define OPT_LOCALHOST_SERVICE  72
 #define OPT_LOG_PROTO      73
-#define OPT_LAST           74
+#define OPT_NO_0x20        74
+#define OPT_LAST           75
 
 #define OPTION_BITS (sizeof(unsigned int)*8)
 #define OPTION_SIZE ( (OPT_LAST/OPTION_BITS)+((OPT_LAST%OPTION_BITS)!=0) )
@@ -788,12 +789,13 @@ struct dyndir {
 #define FREC_DO_QUESTION       64
 #define FREC_HAS_PHEADER      128
 #define FREC_GONE_TO_TCP      256
+#define FREC_ANSWER           512
 
 struct frec {
   struct frec_src {
     union mysockaddr source;
     union all_addr dest;
-    unsigned int iface, log_id;
+    unsigned int iface, log_id, encode_bitmap, *encode_bigmap;
     int fd;
     unsigned short orig_id, udp_pkt_size;
     struct frec_src *next;
@@ -804,7 +806,6 @@ struct frec {
   int forwardall, flags;
   time_t time;
   u32 forward_timestamp;
-  unsigned int encode_bitmap;
   int forward_delay;
   struct blockdata *stash; /* saved query or saved reply, whilst we validate */
   size_t stash_len;