From 702c4f3bbfb1b7ce91c534e02e97b76f292b799a Mon Sep 17 00:00:00 2001 From: ZiMing Mo Date: Wed, 25 May 2022 18:16:14 +0800 Subject: [PATCH] dnsmasq: refresh patches Signed-off-by: ZiMing Mo --- .../dnsmasq/patches/910-mini-ttl.patch | 34 ++++++------- .../patches/911-dnsmasq-filter-aaaa.patch | 48 ++----------------- 2 files changed, 21 insertions(+), 61 deletions(-) diff --git a/package/network/services/dnsmasq/patches/910-mini-ttl.patch b/package/network/services/dnsmasq/patches/910-mini-ttl.patch index ac7d17ad06..91750b3a93 100644 --- a/package/network/services/dnsmasq/patches/910-mini-ttl.patch +++ b/package/network/services/dnsmasq/patches/910-mini-ttl.patch @@ -1,6 +1,6 @@ --- a/src/dnsmasq.h +++ b/src/dnsmasq.h -@@ -1116,7 +1116,7 @@ extern struct daemon { +@@ -1139,7 +1139,7 @@ extern struct daemon { int max_logs; /* queue limit */ int cachesize, ftabsize; int port, query_port, min_port, max_port; @@ -11,15 +11,15 @@ u32 umbrella_asset; --- a/src/option.c +++ b/src/option.c -@@ -174,6 +174,7 @@ struct myoption { - #define LOPT_CMARK_ALST_EN 365 - #define LOPT_CMARK_ALST 366 - #define LOPT_QUIET_TFTP 367 -+#define LOPT_MINTTL 368 - - #ifdef HAVE_GETOPT_LONG - static const struct option opts[] = -@@ -292,6 +293,7 @@ static const struct myoption opts[] = +@@ -105,6 +105,7 @@ struct myoption { + #define LOPT_TAG_IF 294 + #define LOPT_PROXY 295 + #define LOPT_GEN_NAMES 296 ++#define LOPT_MINTTL 375 + #define LOPT_MAXTTL 297 + #define LOPT_NO_REBIND 298 + #define LOPT_LOC_REBND 299 +@@ -302,6 +303,7 @@ static const struct myoption opts[] = { "dhcp-name-match", 1, 0, LOPT_NAME_MATCH }, { "dhcp-broadcast", 2, 0, LOPT_BROADCAST }, { "neg-ttl", 1, 0, LOPT_NEGTTL }, @@ -27,7 +27,7 @@ { "max-ttl", 1, 0, LOPT_MAXTTL }, { "min-cache-ttl", 1, 0, LOPT_MINCTTL }, { "max-cache-ttl", 1, 0, LOPT_MAXCTTL }, -@@ -425,6 +427,7 @@ static struct { +@@ -440,6 +442,7 @@ static struct { { 't', ARG_ONE, "", gettext_noop("Specify default target in an MX record."), NULL }, { 'T', ARG_ONE, "", gettext_noop("Specify time-to-live in seconds for replies from /etc/hosts."), NULL }, { LOPT_NEGTTL, ARG_ONE, "", gettext_noop("Specify time-to-live in seconds for negative caching."), NULL }, @@ -35,7 +35,7 @@ { LOPT_MAXTTL, ARG_ONE, "", gettext_noop("Specify time-to-live in seconds for maximum TTL to send to clients."), NULL }, { LOPT_MAXCTTL, ARG_ONE, "", gettext_noop("Specify time-to-live ceiling for cache."), NULL }, { LOPT_MINCTTL, ARG_ONE, "", gettext_noop("Specify time-to-live floor for cache."), NULL }, -@@ -3047,6 +3050,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma +@@ -3182,6 +3185,7 @@ static int one_opt(int option, char *arg case 'T': /* --local-ttl */ case LOPT_NEGTTL: /* --neg-ttl */ @@ -43,7 +43,7 @@ case LOPT_MAXTTL: /* --max-ttl */ case LOPT_MINCTTL: /* --min-cache-ttl */ case LOPT_MAXCTTL: /* --max-cache-ttl */ -@@ -3058,6 +3062,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma +@@ -3193,6 +3197,8 @@ static int one_opt(int option, char *arg ret_err(gen_err); else if (option == LOPT_NEGTTL) daemon->neg_ttl = (unsigned long)ttl; @@ -54,7 +54,7 @@ else if (option == LOPT_MINCTTL) --- a/src/rfc1035.c +++ b/src/rfc1035.c -@@ -607,6 +607,7 @@ int extract_addresses(struct dns_header *header, size_t qlen, char *name, time_t +@@ -681,6 +681,7 @@ int extract_addresses(struct dns_header for (j = 0; j < ntohs(header->ancount); j++) { int secflag = 0; @@ -62,7 +62,7 @@ if (!(res = extract_name(header, qlen, &p1, name, 0, 10))) return 0; /* bad packet */ -@@ -615,6 +616,14 @@ int extract_addresses(struct dns_header *header, size_t qlen, char *name, time_t +@@ -689,6 +690,14 @@ int extract_addresses(struct dns_header GETLONG(attl, p1); if ((daemon->max_ttl != 0) && (attl > daemon->max_ttl) && !is_sign) @@ -77,7 +77,7 @@ { (p1) -= 4; PUTLONG(daemon->max_ttl, p1); -@@ -722,6 +731,7 @@ int extract_addresses(struct dns_header *header, size_t qlen, char *name, time_t +@@ -796,6 +805,7 @@ int extract_addresses(struct dns_header for (j = 0; j < ntohs(header->ancount); j++) { int secflag = 0; @@ -85,7 +85,7 @@ if (!(res = extract_name(header, qlen, &p1, name, 0, 10))) return 0; /* bad packet */ -@@ -730,6 +740,14 @@ int extract_addresses(struct dns_header *header, size_t qlen, char *name, time_t +@@ -804,6 +814,14 @@ int extract_addresses(struct dns_header GETSHORT(aqclass, p1); GETLONG(attl, p1); if ((daemon->max_ttl != 0) && (attl > daemon->max_ttl) && !is_sign) diff --git a/package/network/services/dnsmasq/patches/911-dnsmasq-filter-aaaa.patch b/package/network/services/dnsmasq/patches/911-dnsmasq-filter-aaaa.patch index 82ba913d9f..7e9263e9a7 100644 --- a/package/network/services/dnsmasq/patches/911-dnsmasq-filter-aaaa.patch +++ b/package/network/services/dnsmasq/patches/911-dnsmasq-filter-aaaa.patch @@ -4,52 +4,12 @@ Date: Tue, 20 Sep 2016 11:52:08 +0800 Subject: [PATCH] add filter-aaaa option --- - src/dnsmasq.h | 3 ++- - src/option.c | 3 +++ - src/rfc1035.c | 9 +++++++++ - 3 files changed, 14 insertions(+), 1 deletion(-) + src/rfc1035.c | 10 ++++++++++ + 1 files changed, 104 insertions(+) ---- a/src/dnsmasq.h -+++ b/src/dnsmasq.h -@@ -275,7 +275,8 @@ struct event_desc { - #define OPT_UMBRELLA_DEVID 64 - #define OPT_CMARK_ALST_EN 65 - #define OPT_QUIET_TFTP 66 --#define OPT_LAST 67 -+#define OPT_FILTER_AAAA 67 -+#define OPT_LAST 68 - - #define OPTION_BITS (sizeof(unsigned int)*8) - #define OPTION_SIZE ( (OPT_LAST/OPTION_BITS)+((OPT_LAST%OPTION_BITS)!=0) ) ---- a/src/option.c -+++ b/src/option.c -@@ -175,6 +175,7 @@ struct myoption { - #define LOPT_CMARK_ALST 366 - #define LOPT_QUIET_TFTP 367 - #define LOPT_MINTTL 368 -+#define LOPT_FILTER_AAAA 369 - - #ifdef HAVE_GETOPT_LONG - static const struct option opts[] = -@@ -355,6 +356,7 @@ static const struct myoption opts[] = - { "log-debug", 0, 0, LOPT_LOG_DEBUG }, - { "umbrella", 2, 0, LOPT_UMBRELLA }, - { "quiet-tftp", 0, 0, LOPT_QUIET_TFTP }, -+ { "filter-aaaa", 0, 0, LOPT_FILTER_AAAA }, - { NULL, 0, 0, 0 } - }; - -@@ -542,6 +544,7 @@ static struct { - { LOPT_SCRIPT_TIME, OPT_LEASE_RENEW, NULL, gettext_noop("Call dhcp-script when lease expiry changes."), NULL }, - { LOPT_UMBRELLA, ARG_ONE, "[=]", gettext_noop("Send Cisco Umbrella identifiers including remote IP."), NULL }, - { LOPT_QUIET_TFTP, OPT_QUIET_TFTP, NULL, gettext_noop("Do not log routine TFTP."), NULL }, -+ { LOPT_FILTER_AAAA, OPT_FILTER_AAAA, NULL, gettext_noop("Filter all AAAA requests."), NULL }, - { 0, 0, NULL, NULL, NULL } - }; - --- a/src/rfc1035.c +++ b/src/rfc1035.c -@@ -2005,6 +2005,16 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen, +@@ -2111,6 +2111,16 @@ size_t answer_request(struct dns_header } } @@ -59,7 +19,7 @@ Subject: [PATCH] add filter-aaaa option + /* return a null reply */ + ans = 1; + if (!dryrun) -+ log_query(F_CONFIG | F_IPV6 | F_NEG, name, &addr, NULL); ++ log_query(F_CONFIG | F_IPV6 | F_NEG, name, &addr, NULL, 0); + break; + } +