dnsmasq: v2.86: refresh patches

zgc · Jun 26, 2021 · bd251a0 · bd251a0
1 parent b5e53f7
commit bd251a0
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 29 deletions.
diff --git a/package/network/services/dnsmasq/patches/910-mini-ttl.patch b/package/network/services/dnsmasq/patches/910-mini-ttl.patch
@@ -1,49 +1,49 @@
 --- a/src/dnsmasq.h
 +++ b/src/dnsmasq.h
-@@ -1059,7 +1059,7 @@ extern struct daemon {
+@@ -1100,7 +1100,7 @@ extern struct daemon {
    int max_logs;  /* queue limit */
    int cachesize, ftabsize;
    int port, query_port, min_port, max_port;
 -  unsigned long local_ttl, neg_ttl, max_ttl, min_cache_ttl, max_cache_ttl, auth_ttl, dhcp_ttl, use_dhcp_ttl;
 +  unsigned long local_ttl, neg_ttl, min_ttl, max_ttl, min_cache_ttl, max_cache_ttl, auth_ttl, dhcp_ttl, use_dhcp_ttl;
    char *dns_client_id;
-   struct hostsfile *addn_hosts;
-   struct dhcp_context *dhcp, *dhcp6;
+   u32 umbrella_org;
+   u32 umbrella_asset;
 --- a/src/option.c
 +++ b/src/option.c
-@@ -170,6 +170,7 @@ struct myoption {
- #define LOPT_PXE_VENDOR    361
- #define LOPT_DYNHOST       362
- #define LOPT_LOG_DEBUG     363
-+#define LOPT_MINTTL        364
+@@ -173,6 +173,7 @@ struct myoption {
+ #define LOPT_UMBRELLA	   364
+ #define LOPT_CMARK_ALST_EN 365
+ #define LOPT_CMARK_ALST    366
++#define LOPT_MINTTL        367
 
  #ifdef HAVE_GETOPT_LONG
  static const struct option opts[] =  
-@@ -288,6 +289,7 @@ static const struct myoption opts[] =
+@@ -291,6 +292,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 },
 +    { "min-ttl", 1, 0, LOPT_MINTTL },
      { "max-ttl", 1, 0, LOPT_MAXTTL },
      { "min-cache-ttl", 1, 0, LOPT_MINCTTL },
      { "max-cache-ttl", 1, 0, LOPT_MAXCTTL },
-@@ -417,6 +419,7 @@ static struct {
+@@ -423,6 +425,7 @@ static struct {
    { 't', ARG_ONE, "<host_name>", gettext_noop("Specify default target in an MX record."), NULL },
    { 'T', ARG_ONE, "<integer>", gettext_noop("Specify time-to-live in seconds for replies from /etc/hosts."), NULL },
    { LOPT_NEGTTL, ARG_ONE, "<integer>", gettext_noop("Specify time-to-live in seconds for negative caching."), NULL },
 +  { LOPT_MINTTL, ARG_ONE, "<integer>", gettext_noop("Specify time-to-live in seconds for minimum TTL to send to clients."), NULL },
    { LOPT_MAXTTL, ARG_ONE, "<integer>", gettext_noop("Specify time-to-live in seconds for maximum TTL to send to clients."), NULL },
    { LOPT_MAXCTTL, ARG_ONE, "<integer>", gettext_noop("Specify time-to-live ceiling for cache."), NULL },
    { LOPT_MINCTTL, ARG_ONE, "<integer>", gettext_noop("Specify time-to-live floor for cache."), NULL },
-@@ -2835,6 +2838,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
+@@ -3101,6 +3104,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
 
      case 'T':         /* --local-ttl */
      case LOPT_NEGTTL: /* --neg-ttl */
 +    case LOPT_MINTTL: /* --min-ttl */
      case LOPT_MAXTTL: /* --max-ttl */
      case LOPT_MINCTTL: /* --min-cache-ttl */
      case LOPT_MAXCTTL: /* --max-cache-ttl */
-@@ -2846,6 +2850,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
+@@ -3112,6 +3116,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
  	  ret_err(gen_err);
  	else if (option == LOPT_NEGTTL)
  	  daemon->neg_ttl = (unsigned long)ttl;

diff --git a/package/network/services/dnsmasq/patches/911-dnsmasq-filter-aaaa.patch b/package/network/services/dnsmasq/patches/911-dnsmasq-filter-aaaa.patch
@@ -11,45 +11,45 @@ Subject: [PATCH] add filter-aaaa option
 
 --- a/src/dnsmasq.h
 +++ b/src/dnsmasq.h
-@@ -270,7 +270,8 @@ struct event_desc {
- #define OPT_SINGLE_PORT    60
- #define OPT_LEASE_RENEW    61
- #define OPT_LOG_DEBUG      62
--#define OPT_LAST           63
-+#define OPT_FILTER_AAAA    63
-+#define OPT_LAST           64
+@@ -273,7 +273,8 @@ struct event_desc {
+ #define OPT_UMBRELLA       63
+ #define OPT_UMBRELLA_DEVID 64
+ #define OPT_CMARK_ALST_EN  65
+-#define OPT_LAST           66
++#define OPT_FILTER_AAAA    66
++#define OPT_LAST           67
 
  #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
-@@ -171,6 +171,7 @@ struct myoption {
- #define LOPT_DYNHOST       362
- #define LOPT_LOG_DEBUG     363
- #define LOPT_MINTTL        364
-+#define LOPT_FILTER_AAAA   365
+@@ -174,6 +174,7 @@ struct myoption {
+ #define LOPT_CMARK_ALST_EN 365
+ #define LOPT_CMARK_ALST    366
+ #define LOPT_MINTTL        367
++#define LOPT_FILTER_AAAA   368
 
  #ifdef HAVE_GETOPT_LONG
  static const struct option opts[] =  
-@@ -347,6 +348,7 @@ static const struct myoption opts[] =
-     { "dhcp-ignore-clid", 0, 0,  LOPT_IGNORE_CLID },
+@@ -353,6 +354,7 @@ static const struct myoption opts[] =
      { "dynamic-host", 1, 0, LOPT_DYNHOST },
      { "log-debug", 0, 0, LOPT_LOG_DEBUG },
+ 	{ "umbrella", 2, 0, LOPT_UMBRELLA },
 +    { "filter-aaaa", 0, 0, LOPT_FILTER_AAAA },
      { NULL, 0, 0, 0 }
    };
 
-@@ -530,6 +532,7 @@ static struct {
-   { LOPT_DUMPFILE, ARG_ONE, "<path>", gettext_noop("Path to debug packet dump file"), NULL },
+@@ -539,6 +541,7 @@ static struct {
    { LOPT_DUMPMASK, ARG_ONE, "<hex>", gettext_noop("Mask which packets to dump"), NULL },
    { LOPT_SCRIPT_TIME, OPT_LEASE_RENEW, NULL, gettext_noop("Call dhcp-script when lease expiry changes."), NULL },
+   { LOPT_UMBRELLA, ARG_ONE, "[=<optspec>]", gettext_noop("Send Cisco Umbrella identifiers including remote IP."), 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
-@@ -1913,6 +1913,16 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
+@@ -1948,6 +1948,16 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
  	    }
  	}