6 #include <sys/socket.h>
7 -#include <sys/utsname.h>
9 #include <linux/version.h>
10 #include <linux/netlink.h>
11 @@ -72,7 +71,7 @@ struct my_nfgenmsg {
13 #define NL_ALIGN(len) (((len)+3) & ~(3))
14 static const struct sockaddr_nl snl = { .nl_family = AF_NETLINK };
15 -static int ipset_sock, old_kernel;
16 +static int ipset_sock;
19 static inline void add_attr(struct nlmsghdr *nlh, uint16_t type, size_t len, const void *data)
20 @@ -87,25 +86,7 @@ static inline void add_attr(struct nlmsg
24 - struct utsname utsname;
28 - if (uname(&utsname) < 0)
29 - die(_("failed to find kernel version: %s"), NULL, EC_MISC);
31 - split = strtok(utsname.release, ".");
32 - version = (split ? atoi(split) : 0);
33 - split = strtok(NULL, ".");
34 - version = version * 256 + (split ? atoi(split) : 0);
35 - split = strtok(NULL, ".");
36 - version = version * 256 + (split ? atoi(split) : 0);
37 - old_kernel = (version < KERNEL_VERSION(2,6,32));
39 - if (old_kernel && (ipset_sock = socket(AF_INET, SOCK_RAW, IPPROTO_RAW)) != -1)
44 (buffer = safe_malloc(BUFF_SZ)) &&
45 (ipset_sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER)) != -1 &&
46 (bind(ipset_sock, (struct sockaddr *)&snl, sizeof(snl)) != -1))
47 @@ -211,16 +192,9 @@ int add_to_ipset(const char *setname, co
51 - /* old method only supports IPv4 */
54 - errno = EAFNOSUPPORT ;
60 - ret = old_kernel ? old_add_to_ipset(setname, ipaddr, remove) : new_add_to_ipset(setname, ipaddr, af, remove);
61 + ret = new_add_to_ipset(setname, ipaddr, af, remove);
64 my_syslog(LOG_ERR, _("failed to update ipset %s: %s"), setname, strerror(errno));