Updating version

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

diff --git a/invirt-dhcpserver b/invirt-dhcpserver
index c017447..2c36b22 100755 (executable)
--- a/invirt-dhcpserver
+++ b/invirt-dhcpserver
@@ -97,15 +97,15 @@ class DhcpBackend:
         nic = self.findNIC(str(chaddr))
         if nic is None or nic.machine is None:
             return False
-        ip = nic.ip
+        ip = nic.ip.encode("utf-8")
         if ip is None:  #Deactivated?
             return False
 
         options = {}
         if nic.hostname and '.' in nic.hostname:
-            options['host_name'], options['domain_name'] = nic.hostname.split('.', 1)
+            options['host_name'], options['domain_name'] = nic.hostname.encode('utf-8').split('.', 1)
         elif nic.machine.name:
-            options['host_name'] = nic.machine.name
+            options['host_name'] = nic.machine.name.encode('utf-8')
             options['domain_name'] = config.dns.domains[0]
         else:
             hostname = None
@@ -114,7 +114,7 @@ class DhcpBackend:
             del options['domain_name']
             options['domain_search'] = [config.dhcp.search_domain]
         if ip is not None:
-            ip = ipv4(ip.encode("utf-8"))
+            ip = ipv4(ip)
             s.syslog(s.LOG_DEBUG,"dhcp_backend : Discover result = "+str(ip))
             packet_parameters = self.getParameters(**options)
 
@@ -262,7 +262,7 @@ if '__main__' == __name__:
         print "invirt-dhcpserver: cannot determine local IP address by looking up %s" % socket.gethostname()
         sys.exit(1)
     
-    dhcp_options['server_identifier'] = myip
+    dhcp_options['server_identifier'] = ipv4(myip).int()
 
     backend = DhcpBackend()
     server = DhcpServer(backend, options)