fix(ippool): fix geo ip bug

Author: duanhongyi

smartdns/ippool.py

@@ -19,15 +19,13 @@ def ip2long(ip):
     return int(hexn, 16)
 
 
-def long2ip(n):
+def long2ip(num):
     "convert long int to dotted quad string"
-    d = 256 * 256 * 256
-    q = []
-    while d > 0:
-        m, n = divmod(n, d)
-        q.append(str(m))
-        d = d/256
-    return '.'.join(q)
+    iplist = []
+    for n in range(4):
+        num,mod = divmod(num,256)
+        iplist.insert(0,str(mod))
+    return '.'.join(iplist)
 
 
 class IPPool(object):
@@ -103,7 +101,7 @@ def LoadRecord(self):
                     continue
                 p = None
                 # p = re.match(ur"(.*),(.*),(.*),(.*)", router)
-                p = str(router.encode('utf-8')).strip().split(',')
+                p = router.strip().split(',')
                 if p is None:
                     logger.warning(
                         "maybe record file format error: %s" % self.recordfile)
@@ -133,6 +131,7 @@ def LoadRecord(self):
                 elif match[3] not in self.locmapip[fqdn][match[0]][match[1]][match[2]]:
                     self.locmapip[fqdn][match[0]][match[1]][match[2]][match[3]] = \
                         [self.record[fqdn][router], weight]
+        print(self.locmapip)
         f.close()
         # logger.warning(self.locmapip)
 
@@ -203,6 +202,8 @@ def FindIP(self, ip, name):
                         if not re.search(r'[^0-9.]', tmp_ip) and self.monitor_mapping.check(name, tmp_ip)]
                 logger.info("userip:[%s] domain:[%s] section:[%s-%s] location:[%s,%s,%s,%s] ip_list:%s" % (
                     ip, name, long2ip(ipstart), long2ip(ipend), country, province, city, sp, ip_list))
+                print(self.iphash[i])
+                print(name, ipnum, ip, long2ip(ipstart), long2ip(ipend),country, province, city, sp, ip_list)
         if not ip_list or len(ip_list) == 0:
             # maybe something wrong
             tmp_ip_list = [

templates/a.yaml

@@ -13,4 +13,4 @@ horizon.parkone.cn:
   中国,,,: 1.1.1.9 3.3.3.9
   美国,,,: 1.1.1.10 3.3.3.10
   马来西亚,,,: 1.1.1.11 3.3.3.11
-  土耳其,,,: 1.1.1.12 3.3.3.12
+  内网,,,: 1.1.1.12 3.3.3.12

templates/ip.csv

@@ -135152,3 +135152,4 @@
 3758096128,3758096383,澳大利亚,,,
 3758096384,3774873599,IANA,,,
 3774873600,4026531839,IANA保留地址,,,用于多点传送
+3232237056,3232237311,内网,,,