merge
authorTero Marttila <terom@paivola.fi>
Thu, 31 Jan 2013 00:11:29 +0200
changeset 196 81a5bfe6dc7c
parent 194 95bfa7ac88ca (diff)
parent 195 5e22cca68c39 (current diff)
child 197 9f18b11647fb
merge
--- a/pvl/dhcp/hosts.py	Mon Jan 28 19:39:36 2013 +0200
+++ b/pvl/dhcp/hosts.py	Thu Jan 31 00:11:29 2013 +0200
@@ -86,6 +86,7 @@
             return
 
         # do not override error from request on NAK; clear otherwise
+        # TODO: DHCPINFORM from 192.168.x.y with error -> rogue dhcp?
         if item.get('type') == 'DHCPNAK' :
             pass
         else :
--- a/pvl/dhcp/syslog.py	Mon Jan 28 19:39:36 2013 +0200
+++ b/pvl/dhcp/syslog.py	Thu Jan 31 00:11:29 2013 +0200
@@ -69,6 +69,8 @@
         #       unknown subnet for relay address %s
         #       unknown subnet for %s address %s
         #       not authoritative for subnet %s
+        #
+        # TODO: DHCPINFORM with error indicates rogue dhcp
         re.compile(r'(?P<type>DHCPINFORM) from (?P<lease>.+?) via (?P<gateway>.+?)(: (?P<error>.+?))?$'),
         
         # dhcpleasequery
--- a/setup_verkko.py	Mon Jan 28 19:39:36 2013 +0200
+++ b/setup_verkko.py	Thu Jan 31 00:11:29 2013 +0200
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
-__version__ = '0.3.0'
+__version__ = '0.3.1'
 
 from distutils.core import setup
 from glob import glob