From 9188280a7bd3642526a01b98d04e7c5f178f9179 Mon Sep 17 00:00:00 2001
From: yakamok <38737288+yakamok@users.noreply.github.com>
Date: Sun, 1 Jul 2018 02:15:34 +0200
Subject: [PATCH] Update vserv.py

---
 vserv.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/vserv.py b/vserv.py
index 22f3faa..b776000 100644
--- a/vserv.py
+++ b/vserv.py
@@ -1,4 +1,4 @@
-#server for collecting views of the network
+#server for collecting DHT info
 
 import json
 import time
@@ -17,7 +17,7 @@ DB_PATH = "vservdb/"
 def check_coords(coords):
     coord_len = coords.replace(' ', '').replace('[', '').replace(']', '')
     digits_found = [x for x in coord_len if x.isdigit()]
-    
+
     if len(digits_found) == len(coord_len):
         crus = True
     else:
@@ -26,7 +26,6 @@ def check_coords(coords):
 
 
 def valid_ipv6_check(ipv6add):
-    import ipaddress
     try:
         if ipaddress.IPv6Address(unicode(ipv6add)):
             addr = True
@@ -47,11 +46,11 @@ def isdatabase(db_path):
             conn.commit()
             # c.commit()
         except Error as e:
-            print(e)
+            print e
         finally:
             conn.close()
     else:
-        print("found database will not create a new one")
+        print"found database will not create a new one"
 
 
 def insert_new_entry(db_path, ipv6, coords, utimestamp):
@@ -59,26 +58,26 @@ def insert_new_entry(db_path, ipv6, coords, utimestamp):
         conn = sqlite3.connect(db_path + "yggindex.db")
         c = conn.cursor()
         c.execute('''INSERT OR REPLACE INTO yggindex(ipv6, coords, utimestamp) VALUES(?, ?, ?)''',\
-                    (ipv6, coords, utimestamp)) 
+                    (ipv6, coords, utimestamp))
         conn.commit()
         conn.close()
     except Error as e:
-        print(e)
+        print e
 
 
 def error_check_insert_into_db(dht, switchpeers):
     try:
-        if "success" == dht.get("status"):
-            for x,y in dht["response"]["dht"].iteritems():
+        if dht.get("status") == "success":
+            for x, y in dht["response"]["dht"].iteritems():
                 if valid_ipv6_check(x) and check_coords(y["coords"]):
                     insert_new_entry(DB_PATH, x, y["coords"], int(time.time()))
 
-        if "success" == dht.get("status"):
+        if dht.get("status") == "success":
             for x in switchpeers["response"]["switchpeers"].iteritems():
                 if valid_ipv6_check(x[1]["ip"]) and check_coords(x[1]["coords"]):
                     insert_new_entry(DB_PATH, x[1]["ip"], x[1]["coords"], int(time.time()))
     except:
-        print("error in json file, aborting")
+        print"error in json file, aborting"
 
 def proccess_incoming_data(datty, addr):
     print addr