X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=zyxel%2Fzyxelcommon.py;h=d35c540a04ebf3416fa4dfd0805f206e0d63f312;hb=40d6c7e02855fa3bb3cf35805efe853051c88ea5;hp=1c1ca7878c07ea1b8de54a80cbac8ac278460134;hpb=25695cf008e4fff7896494c57f72a2e92ddde8cb;p=nms

diff --git a/zyxel/zyxelcommon.py b/zyxel/zyxelcommon.py
index 1c1ca78..d35c540 100644
--- a/zyxel/zyxelcommon.py
+++ b/zyxel/zyxelcommon.py
@@ -6,15 +6,21 @@ LOGHOST="194.0.255.20"
 def retSubnet(sw):
     (rad,num) = sw
     drad = (rad + 1) / 2
-    if drad <= 7 or (drad == 8 and (num <= 3 or num == 6)):
+    if drad <= 4 or (drad == 5 and (num <= 2)):
         return "241"
-    if drad <= 13 or (drad == 14 and num != 4) or (drad == 15 and num <= 3):
+    if drad <= 7 or (drad == 8 and (num <= 3 or num == 6)):
         return "242"
-    if drad <= 22 or (drad == 23 and num >= 4) or (drad == 24 and num == 4):
+    if drad <= 13 or (drad == 14 and num != 4) or (drad == 15 and num <= 3):
         return "243"
-    if drad <= 29 or (drad == 30 and (num == 4 or num == 5)):
+    if drad <= 22 or (drad == 23 and num >= 4) or (drad == 24 and num == 4):
         return "244"
-    return "245"
+    if drad <= 29 or (drad == 30 and (num == 4 or num == 5)):
+        return "245"
+    if drad <= 31 or (drad == 32 and (num <= 5)):
+        return "246"
+    if drad <= 33 or (num >= 4):
+    	return "247"
+    return "248"
 
 def retIP(sw):
     (rad,num) = sw
@@ -24,4 +30,4 @@ def retIP(sw):
 
 # ooh, fugly
 def retColor(sw):
-    return "[%um" % (int(retSubnet(sw)) - 209)
+    return "[%um" % (int(retSubnet(sw)) - 210)