Skip to content

Maximum data size and string casting in python3 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lucabodd wants to merge 3 commits into
base: python3
Choose a base branch
from
Open

Maximum data size and string casting in python3 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bbf0b15
Merge branch 'python3'
eblot Sep 6, 2019
5d722cc
Update pxed.py
lucabodd Sep 18, 2019
bb6e5c0
Update tftpd.py
lucabodd Sep 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 29 additions & 28 deletions pybootd/pxed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,34 +312,35 @@ def parse_options(self, tail):
continue
dhcp_tags[tag] = value

def build_pxe_options(self, options, server):
buf = b''
try:
uuid = options[97]
buf += spack('!BB%ds' % len(uuid),
97, len(uuid), uuid)
clientclass = options[60]
clientclass = clientclass[:clientclass.find(':')]
buf += spack('!BB%ds' % len(clientclass),
60, len(clientclass), clientclass)
vendor = ''
vendor += spack('!BBB', PXE_DISCOVERY_CONTROL, 1, 0x0A)
vendor += spack('!BBHB4s', PXE_BOOT_SERVERS, 2+1+4,
0, 1, server)
srvstr = 'Python'
vendor += spack('!BBHB%ds' % len(srvstr), PXE_BOOT_MENU,
2+1+len(srvstr), 0, len(srvstr), srvstr)
prompt = 'Stupid PXE'
vendor += spack('!BBB%ds' % len(prompt), PXE_MENU_PROMPT,
1+len(prompt), len(prompt), prompt)
buf += spack('!BB%ds' % len(vendor), 43,
len(vendor), vendor)
buf += spack('!BBB', 255, 0, 0)
return buf
except KeyError as exc:
self.log.error('Missing options, cancelling: %s' % exc)
return b''

def build_pxe_options(self, options, server):
buf = b''
try:
uuid = options[97]
buf += spack('!BB%ds' % len(uuid),
97, len(uuid), uuid)
clientclass = options[60]
#clientclass = clientclass[:clientclass.find(':')]
clientclass = clientclass[:clientclass.find(b':')]
buf += spack('!BB%ds' % len(clientclass),
60, len(clientclass), clientclass)
vendor = ''
vendor += spack('!BBB', PXE_DISCOVERY_CONTROL, 1, 0x0a).decode("utf-8")
vendor += spack('!BBHB4s', PXE_BOOT_SERVERS, 2+1+4,
0, 1, server).decode("utf-8")
srvstr = b'Python'
vendor += spack('!BBHB%ds' % len(srvstr), PXE_BOOT_MENU,
2+1+len(srvstr), 0, len(srvstr), srvstr).decode("utf-8")
prompt = b'Stupid PXE'
vendor += spack('!BBB%ds' % len(prompt), PXE_MENU_PROMPT,
1+len(prompt), len(prompt), prompt).decode("utf-8")
buf += spack('!BB%ds' % len(vendor), 43,
len(vendor), vendor.encode("utf-8"))
buf += spack('!BBB', 255, 0, 0)
return buf
except KeyError as exc:
self.log.error('Missing options, cancelling: %s' % exc)
return b''

def build_dhcp_options(self, clientname):
if not clientname:
return b''
Expand Down
5 changes: 3 additions & 2 deletions pybootd/tftpd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
from urllib.request import urlopen
from . import pybootd_path
from .util import hexline
import numpy as np

#pylint: disable-msg=broad-except
#pylint: disable-msg=invalid-name
Expand Down Expand Up @@ -71,7 +72,7 @@ def __init__(self, server, port=0):
self.client_addr = None
self.sock = None
self.active = 0 # 0: inactive, 1: active
self.blockNumber = 0
self.blockNumber = np.int16(0x0000)
self.lastpkt = ''
self.mode = ''
self.filename = ''
Expand Down Expand Up @@ -263,7 +264,7 @@ def send_data(self, data, pack=spack):
if not self.time:
self.time = now()
blocksize = self.blocksize
block = self.blockNumber = self.blockNumber + 1
block = self.blockNumber = np.int16(self.blockNumber + 1)
lendata = len(data)
fmt = '!hh%ds' % lendata
pkt = pack(fmt, self.DATA, block, data)
Expand Down