fix mask > 0xFFFF with chnroute

shadowsocks · Aug 10, 2014 · 94f7809 · 94f7809
1 parent 139fdcc
commit 94f7809
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,6 @@
+1.1.2 2014-08-11
+- Fix mask > 0xFFFF with chnroute
+
 1.1.1 2014-08-08
 - Use CIDR format in chnroute.txt
 

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.67])
-AC_INIT([ChinaDNS-C], [1.1.1], [[email protected]])
+AC_INIT([ChinaDNS-C], [1.1.2], [[email protected]])
 AC_CONFIG_SRCDIR([src/chinadns.c])
 AC_CONFIG_HEADERS([config.h])
 

diff --git a/openwrt/Makefile b/openwrt/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ChinaDNS-C
-PKG_VERSION:=1.1.1
+PKG_VERSION:=1.1.2
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_URL:=https://github.com/clowwindy/ChinaDNS-C/releases/download/$(PKG_VERSION)

diff --git a/src/chinadns.c b/src/chinadns.c
@@ -435,8 +435,10 @@ static int test_ip_in_list(struct in_addr ip, const net_list_t *netlist) {
     DLOG("%s, %d\n", inet_ntoa(netlist->nets[m].net),
          netlist->nets[m].mask);
   }
+  DLOG("result: %x\n", (ntohl(netlist->nets[l].net.s_addr) ^ ntohl(ip.s_addr)));
+  DLOG("mask: %x\n", (UINT32_MAX - netlist->nets[l].mask));
   if ((ntohl(netlist->nets[l].net.s_addr) ^ ntohl(ip.s_addr)) &
-      (0xFFFF - netlist->nets[l].mask)) {
+      (UINT32_MAX - netlist->nets[l].mask)) {
     return 0;
   }
   return 1;