OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 42... Line 42...
42 - if (!old_kernel && 42 - if (!old_kernel &&
43 + if ( 43 + if (
44 (buffer = safe_malloc(BUFF_SZ)) && 44 (buffer = safe_malloc(BUFF_SZ)) &&
45 (ipset_sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER)) != -1 && 45 (ipset_sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER)) != -1 &&
46 (bind(ipset_sock, (struct sockaddr *)&snl, sizeof(snl)) != -1)) 46 (bind(ipset_sock, (struct sockaddr *)&snl, sizeof(snl)) != -1))
47 @@ -211,16 +192,9 @@ int add_to_ipset(const char *setname, co 47 @@ -217,17 +198,10 @@ int add_to_ipset(const char *setname, co
48 if (flags & F_IPV6) 48 if (flags & F_IPV6)
49 { 49 {
50 af = AF_INET6; 50 af = AF_INET6;
51 - /* old method only supports IPv4 */ 51 - /* old method only supports IPv4 */
52 - if (old_kernel) 52 - if (old_kernel)
53 - { 53 - {
54 - errno = EAFNOSUPPORT ; 54 - errno = EAFNOSUPPORT ;
55 - ret = -1; 55 - ret = -1;
56 - } 56 - }
57 } 57 }
-   58 #endif
Line 58... Line 59...
58 59
59 - if (ret != -1) 60 - if (ret != -1)
60 - ret = old_kernel ? old_add_to_ipset(setname, ipaddr, remove) : new_add_to_ipset(setname, ipaddr, af, remove); 61 - ret = old_kernel ? old_add_to_ipset(setname, ipaddr, remove) : new_add_to_ipset(setname, ipaddr, af, remove);