projects
/
invirt/packages/invirt-dhcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pydhcplib api breakage
[invirt/packages/invirt-dhcp.git]
/
invirt-dhcpserver
diff --git
a/invirt-dhcpserver
b/invirt-dhcpserver
index
c017447
..
1f57a8d
100755
(executable)
--- a/
invirt-dhcpserver
+++ b/
invirt-dhcpserver
@@
-97,7
+97,7
@@
class DhcpBackend:
nic = self.findNIC(str(chaddr))
if nic is None or nic.machine is None:
return False
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
if ip is None: #Deactivated?
return False
@@
-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.encode("utf-8"))
+ ip = ipv4(ip)
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)
@@
-262,7
+262,7
@@
if '__main__' == __name__:
print "invirt-dhcpserver: cannot determine local IP address by looking up %s" % socket.gethostname()
sys.exit(1)
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)
backend = DhcpBackend()
server = DhcpServer(backend, options)
backend = DhcpBackend()
server = DhcpServer(backend, options)