eblot/pybootd
1
1
Fork 0
mirror of https://github.com/eblot/pybootd.git synced 2024-09-11 22:17:44 +03:00
Code Issues Projects Releases Wiki Activity

Fix UUID string generation (more to go)

Browse Source
This commit is contained in:
Emmanuel Blot 2020-04-10 14:49:47 +02:00
parent 35d930e9c1
commit 12b719bddb
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pybootd/pxed.py
View File

@ -239,6 +239,7 @@ class BootpServer:
if access == 'mac' and mac_str not in self.acl: if access == 'mac' and mac_str not in self.acl:
self.acl[mac_key] = True self.acl[mac_key] = True
self.access = access self.access = access
self._resume = False
# Private # Private
def _notify(self, notice, uuid_str, mac_str, ip): def _notify(self, notice, uuid_str, mac_str, ip):
@ -379,11 +380,11 @@ class BootpServer:
uuid = self.uuidpool.get(mac_addr, None) uuid = self.uuidpool.get(mac_addr, None)
pxe = False pxe = False
self.log.info('PXE UUID not present in request') self.log.info('PXE UUID not present in request')
uuid_str = uuid and ('%s-%s-%s-%s-%s' % tuple([hexlify(x) uuid_str = (':'.join(hexlify(x).decode() for x in
for x in (uuid[0:4], uuid[4:6], uuid[6:8], uuid[8:10], uuid[10:16]) (uuid[0:4], uuid[4:6], uuid[6:8], uuid[8:10],
])).upper() uuid[10:16]))).upper() if uuid else None
if uuid_str: if uuid_str:
self.log.info('UUID is %s for MAC %s' % (uuid_str, mac_str)) self.log.info('UUID is %s for MAC %s', uuid_str, mac_str)
hostname = '' hostname = ''
filename = '' filename = ''
@ -606,9 +607,8 @@ class BootpServer:
dns_ip = inet_aton(dns_str) dns_ip = inet_aton(dns_str)
pkt += spack('!BB4s', DHCP_IP_DNS, 4, dns_ip) pkt += spack('!BB4s', DHCP_IP_DNS, 4, dns_ip)
pkt += spack('!BBI', DHCP_LEASE_TIME, 4, pkt += spack('!BBI', DHCP_LEASE_TIME, 4,
int(self.config.get(self.BOOTP_SECTION, int(self.config.get(self.BOOTP_SECTION, 'lease_time',
'lease_time', str(24*3600))))
str(24*3600))))
# do not attempt to produce a PXE-augmented response for # do not attempt to produce a PXE-augmented response for
# regular DHCP requests # regular DHCP requests