pydhcpserver expects ip strings as strs, and sqlalchemy returns unistrings

[invirt/packages/invirt-dhcp.git] / invirt-dhcpserver

diff --git a/invirt-dhcpserver b/invirt-dhcpserver
index 9f6fb68..c017447 100755 (executable)
--- a/invirt-dhcpserver
+++ b/invirt-dhcpserver
@@ -31,7 +31,7 @@ class DhcpBackend:
         nic = self.findNIC(str(chaddr))
         if nic is None or nic.ip is None:
             return None
         nic = self.findNIC(str(chaddr))
         if nic is None or nic.ip is None:
             return None

-        ipstr = ''.join(reversed(['%02X' % i for i in ipv4(nic.ip).list()]))
+        ipstr = ''.join(reversed(['%02X' % i for i in ipv4(nic.ip.encode("utf-8")).list()]))

         for line in open('/proc/net/route'):
             parts = line.split()
             if parts[1] == ipstr:
         for line in open('/proc/net/route'):
             parts = line.split()
             if parts[1] == ipstr:

@@ -114,7 +114,7 @@ class DhcpBackend:
             del options['domain_name']
             options['domain_search'] = [config.dhcp.search_domain]
         if ip is not None:
             del options['domain_name']
             options['domain_search'] = [config.dhcp.search_domain]
         if ip is not None:

-            ip = ipv4(ip)
+            ip = ipv4(ip.encode("utf-8"))

             s.syslog(s.LOG_DEBUG,"dhcp_backend : Discover result = "+str(ip))
             packet_parameters = self.getParameters(**options)
 
             s.syslog(s.LOG_DEBUG,"dhcp_backend : Discover result = "+str(ip))
             packet_parameters = self.getParameters(**options)