package/network/services/dnsmasq/patches/100-remove-old-runtime-kernel-support.patch

   1 From 7df4c681678612d196b4e1eec24963d181fdb28a Mon Sep 17 00:00:00 2001
   2 From: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
   3 Date: Sun, 5 Apr 2020 17:18:23 +0100
   4 Subject: [PATCH] drop runtime old kernel support
   5
   6 Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
   7 ---
   8  src/dnsmasq.c |  4 ----
   9  src/dnsmasq.h |  5 +---
  10  src/ipset.c   | 64 ++++-----------------------------------------------
  11  src/netlink.c |  3 +--
  12  src/util.c    | 19 ---------------
  13  5 files changed, 6 insertions(+), 89 deletions(-)
  14
  15 --- a/src/dnsmasq.c
  16 +++ b/src/dnsmasq.c
  17 @@ -94,10 +94,6 @@ int main (int argc, char **argv)
  18
  19    read_opts(argc, argv, compile_opts);
  20
  21 -#ifdef HAVE_LINUX_NETWORK
  22 -  daemon->kernel_version = kernel_version();
  23 -#endif
  24 -
  25    if (daemon->edns_pktsz < PACKETSZ)
  26      daemon->edns_pktsz = PACKETSZ;
  27
  28 --- a/src/dnsmasq.h
  29 +++ b/src/dnsmasq.h
  30 @@ -1110,7 +1110,7 @@ extern struct daemon {
  31    int inotifyfd;
  32  #endif
  33  #if defined(HAVE_LINUX_NETWORK)
  34 -  int netlinkfd, kernel_version;
  35 +  int netlinkfd;
  36  #elif defined(HAVE_BSD_NETWORK)
  37    int dhcp_raw_fd, dhcp_icmp_fd, routefd;
  38  #endif
  39 @@ -1290,9 +1290,6 @@ int read_write(int fd, unsigned char *pa
  40  void close_fds(long max_fd, int spare1, int spare2, int spare3);
  41  int wildcard_match(const char* wildcard, const char* match);
  42  int wildcard_matchn(const char* wildcard, const char* match, int num);
  43 -#ifdef HAVE_LINUX_NETWORK
  44 -int kernel_version(void);
  45 -#endif
  46
  47  /* log.c */
  48  void die(char *message, char *arg1, int exit_code) ATTRIBUTE_NORETURN;
  49 --- a/src/ipset.c
  50 +++ b/src/ipset.c
  51 @@ -70,7 +70,7 @@ struct my_nfgenmsg {
  52
  53  #define NL_ALIGN(len) (((len)+3) & ~(3))
  54  static const struct sockaddr_nl snl = { .nl_family = AF_NETLINK };
  55 -static int ipset_sock, old_kernel;
  56 +static int ipset_sock;
  57  static char *buffer;
  58
  59  static inline void add_attr(struct nlmsghdr *nlh, uint16_t type, size_t len, const void *data)
  60 @@ -85,12 +85,7 @@ static inline void add_attr(struct nlmsg
  61
  62  void ipset_init(void)
  63  {
  64 -  old_kernel = (daemon->kernel_version < KERNEL_VERSION(2,6,32));
  65 -
  66 -  if (old_kernel && (ipset_sock = socket(AF_INET, SOCK_RAW, IPPROTO_RAW)) != -1)
  67 -    return;
  68 -
  69 -  if (!old_kernel &&
  70 +  if (
  71        (buffer = safe_malloc(BUFF_SZ)) &&
  72        (ipset_sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER)) != -1 &&
  73        (bind(ipset_sock, (struct sockaddr *)&snl, sizeof(snl)) != -1))
  74 @@ -147,65 +142,14 @@ static int new_add_to_ipset(const char *
  75    return errno == 0 ? 0 : -1;
  76  }
  77
  78 -
  79 -static int old_add_to_ipset(const char *setname, const union all_addr *ipaddr, int remove)
  80 -{
  81 -  socklen_t size;
  82 -  struct ip_set_req_adt_get {
  83 -    unsigned op;
  84 -    unsigned version;
  85 -    union {
  86 -      char name[IPSET_MAXNAMELEN];
  87 -      uint16_t index;
  88 -    } set;
  89 -    char typename[IPSET_MAXNAMELEN];
  90 -  } req_adt_get;
  91 -  struct ip_set_req_adt {
  92 -    unsigned op;
  93 -    uint16_t index;
  94 -    uint32_t ip;
  95 -  } req_adt;
  96 -
  97 -  if (strlen(setname) >= sizeof(req_adt_get.set.name))
  98 -    {
  99 -      errno = ENAMETOOLONG;
 100 -      return -1;
 101 -    }
 102 -
 103 -  req_adt_get.op = 0x10;
 104 -  req_adt_get.version = 3;
 105 -  strcpy(req_adt_get.set.name, setname);
 106 -  size = sizeof(req_adt_get);
 107 -  if (getsockopt(ipset_sock, SOL_IP, 83, &req_adt_get, &size) < 0)
 108 -    return -1;
 109 -  req_adt.op = remove ? 0x102 : 0x101;
 110 -  req_adt.index = req_adt_get.set.index;
 111 -  req_adt.ip = ntohl(ipaddr->addr4.s_addr);
 112 -  if (setsockopt(ipset_sock, SOL_IP, 83, &req_adt, sizeof(req_adt)) < 0)
 113 -    return -1;
 114 -
 115 -  return 0;
 116 -}
 117 -
 118 -
 119 -
 120  int add_to_ipset(const char *setname, const union all_addr *ipaddr, int flags, int remove)
 121  {
 122    int ret = 0, af = AF_INET;
 123
 124    if (flags & F_IPV6)
 125 -    {
 126        af = AF_INET6;
 127 -      /* old method only supports IPv4 */
 128 -      if (old_kernel)
 129 -       {
 130 -         errno = EAFNOSUPPORT ;
 131 -         ret = -1;
 132 -       }
 133 -    }
 134 -
 135 -  if (ret != -1)
 136 -    ret = old_kernel ? old_add_to_ipset(setname, ipaddr, remove) : new_add_to_ipset(setname, ipaddr, af, remove);
 137 +
 138 +  ret = new_add_to_ipset(setname, ipaddr, af, remove);
 139
 140    if (ret == -1)
 141       my_syslog(LOG_ERR, _("failed to update ipset %s: %s"), setname, strerror(errno));
 142 --- a/src/netlink.c
 143 +++ b/src/netlink.c
 144 @@ -82,8 +82,7 @@ void netlink_init(void)
 145      }
 146
 147    if (daemon->netlinkfd == -1 ||
 148 -      (daemon->kernel_version >= KERNEL_VERSION(2,6,30) &&
 149 -       setsockopt(daemon->netlinkfd, SOL_NETLINK, NETLINK_NO_ENOBUFS, &opt, sizeof(opt)) == -1) ||
 150 +      (setsockopt(daemon->netlinkfd, SOL_NETLINK, NETLINK_NO_ENOBUFS, &opt, sizeof(opt)) == -1) ||
 151        getsockname(daemon->netlinkfd, (struct sockaddr *)&addr, &slen) == -1)
 152      die(_("cannot create netlink socket: %s"), NULL, EC_MISC);
 153
 154 --- a/src/util.c
 155 +++ b/src/util.c
 156 @@ -786,22 +786,3 @@ int wildcard_matchn(const char* wildcard
 157
 158    return (!num) || (*wildcard == *match);
 159  }
 160 -
 161 -#ifdef HAVE_LINUX_NETWORK
 162 -int kernel_version(void)
 163 -{
 164 -  struct utsname utsname;
 165 -  int version;
 166 -  char *split;
 167 -
 168 -  if (uname(&utsname) < 0)
 169 -    die(_("failed to find kernel version: %s"), NULL, EC_MISC);
 170 -
 171 -  split = strtok(utsname.release, ".");
 172 -  version = (split ? atoi(split) : 0);
 173 -  split = strtok(NULL, ".");
 174 -  version = version * 256 + (split ? atoi(split) : 0);
 175 -  split = strtok(NULL, ".");
 176 -  return version * 256 + (split ? atoi(split) : 0);
 177 -}
 178 -#endif