Skip to content

Commit ce296c3

Browse files
author
brentru
committed
linting..
1 parent 00f0cba commit ce296c3

File tree

3 files changed

+70
-73
lines changed

3 files changed

+70
-73
lines changed

‎adafruit_wiznet5k/adafruit_wiznet5k_dhcp.py‎

Lines changed: 62 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@
7575
BROADCAST_SERVER_ADDR = 255, 255, 255, 255
7676

7777
# pylint: enable=bad-whitespace
78-
79-
_BUFF = bytearray(317)
78+
_buff = bytearray(317)
8079

8180
class DHCP:
8281
"""W5k DHCP Client implementation.
@@ -87,10 +86,9 @@ class DHCP:
8786
:param bool debug: Enable debugging output.
8887
8988
"""
90-
89+
9190
# pylint: disable=too-many-arguments, too-many-instance-attributes
9291
def __init__(self, eth, mac_address, timeout=1, timeout_response=1):
93-
9492
self._timeout = timeout
9593
self._response_timeout = timeout_response
9694
self._mac_address = mac_address
@@ -126,151 +124,149 @@ def send_dhcp_message(self, state, time_elapsed):
126124
attempted to acquire/renew a lease.
127125
"""
128126
# OP
129-
_BUFF[0] = DHCP_BOOT_REQUEST
127+
_buff[0] = DHCP_BOOT_REQUEST
130128
# HTYPE
131-
_BUFF[1] = DHCP_HTYPE10MB
129+
_buff[1] = DHCP_HTYPE10MB
132130
# HLEN
133-
_BUFF[2] = DHCP_HLENETHERNET
131+
_buff[2] = DHCP_HLENETHERNET
134132
# HOPS
135-
_BUFF[3] = DHCP_HOPS
133+
_buff[3] = DHCP_HOPS
136134

137135
# Transaction ID (xid)
138136
self._initial_xid = htonl(self._transaction_id)
139137
self._initial_xid = self._initial_xid.to_bytes(4, 'l')
140-
_BUFF[4:7] = self._initial_xid
138+
_buff[4:7] = self._initial_xid
141139

142140
# seconds elapsed
143-
_BUFF[8] = ((int(time_elapsed) & 0xff00) >> 8)
144-
_BUFF[9] = (int(time_elapsed) & 0x00ff)
141+
_buff[8] = ((int(time_elapsed) & 0xff00) >> 8)
142+
_buff[9] = (int(time_elapsed) & 0x00ff)
145143

146144
# flags
147145
flags = htons(0x8000)
148146
flags = flags.to_bytes(2, 'b')
149-
_BUFF[10] = flags[1]
150-
_BUFF[11] = flags[0]
147+
_buff[10] = flags[1]
148+
_buff[11] = flags[0]
151149

152150
# NOTE: Skipping cidaddr/yiaddr/siaddr/giaddr
153151
# as they're already set to 0.0.0.0
154152

155153
# chaddr
156-
_BUFF[28:34] = self._mac_address
154+
_buff[28:34] = self._mac_address
157155

158156
# NOTE: 192 octets of 0's, BOOTP legacy
159157

160158
# Magic Cookie
161-
_BUFF[236] = ((MAGIC_COOKIE >> 24)& 0xFF)
162-
_BUFF[237] = ((MAGIC_COOKIE >> 16)& 0xFF)
163-
_BUFF[238] = ((MAGIC_COOKIE >> 8)& 0xFF)
164-
_BUFF[239] = (MAGIC_COOKIE& 0xFF)
159+
_buff[236] = ((MAGIC_COOKIE >> 24)& 0xFF)
160+
_buff[237] = ((MAGIC_COOKIE >> 16)& 0xFF)
161+
_buff[238] = ((MAGIC_COOKIE >> 8)& 0xFF)
162+
_buff[239] = (MAGIC_COOKIE& 0xFF)
165163

166164
# Option - DHCP Message Type
167-
_BUFF[240] = 53
168-
_BUFF[241] = 0x01
169-
_BUFF[242] = state
165+
_buff[240] = 53
166+
_buff[241] = 0x01
167+
_buff[242] = state
170168

171169
# Option - Client Identifier
172-
_BUFF[243] = 61
170+
_buff[243] = 61
173171
# Length
174-
_BUFF[244] = 0x07
172+
_buff[244] = 0x07
175173
# HW Type - ETH
176-
_BUFF[245] = 0x01
174+
_buff[245] = 0x01
177175
# Client MAC Address
178176
for mac in range(0, len(self._mac_address)):
179-
_BUFF[246+mac] = self._mac_address[mac]
177+
_buff[246+mac] = self._mac_address[mac]
180178

181179
# Option - Host Name
182-
_BUFF[252] = 12
183-
_BUFF[253] = len(b"Wiznet") + 6
180+
_buff[252] = 12
181+
_buff[253] = len(b"Wiznet") + 6
184182
# NOTE/TODO: This appends invalid ? chars. onto hostname instead of string
185-
_BUFF[254:266] = b"Wizneteeeeee"
183+
_buff[254:266] = b"Wizneteeeeee"
186184

187185
if state == DHCP_REQUEST:
188186
# Set the parsed local IP addr
189-
_BUFF[266] = 50
190-
_BUFF[267] = 0x04
187+
_buff[266] = 50
188+
_buff[267] = 0x04
191189

192-
_BUFF[268:272] = self.local_ip
190+
_buff[268:272] = self.local_ip
193191
# Set the parsed dhcp server ip addr
194-
_BUFF[272] = 54
195-
_BUFF[273] = 0x04
196-
_BUFF[274:278] = self.dhcp_server_ip
192+
_buff[272] = 54
193+
_buff[273] = 0x04
194+
_buff[274:278] = self.dhcp_server_ip
197195

198-
_BUFF[278] = 55
199-
_BUFF[279] = 0x06
196+
_buff[278] = 55
197+
_buff[279] = 0x06
200198
# subnet mask
201-
_BUFF[280] = 1
199+
_buff[280] = 1
202200
# routers on subnet
203-
_BUFF[281] = 3
201+
_buff[281] = 3
204202
# DNS
205-
_BUFF[282] = 6
203+
_buff[282] = 6
206204
# domain name
207-
_BUFF[283] = 15
205+
_buff[283] = 15
208206
# renewal (T1) value
209-
_BUFF[284] = 58
207+
_buff[284] = 58
210208
# rebinding (T2) value
211-
_BUFF[285] = 59
212-
_BUFF[286] = 255
209+
_buff[285] = 59
210+
_buff[286] = 255
213211

214212
# Send DHCP packet
215-
self._sock.send(_BUFF)
213+
self._sock.send(_buff)
216214

217215
def parse_dhcp_response(self, response_timeout):
218216
"""Parse DHCP response from DHCP server.
219217
Returns DHCP packet type.
220218
221219
:param int response_timeout: Time to wait for server to return packet, in seconds.
222220
"""
223-
print("CHECKING PACKET SIZE..")
221+
print("STATE: ", self._dhcp_state)
224222
start_time = time.monotonic()
225-
packet_sz = 0
223+
packet_sz = self._sock.available()
226224
while packet_sz <= 0:
227225
packet_sz = self._sock.available()
228226
if (time.monotonic() - start_time) > response_timeout:
229227
return 255
230228
time.sleep(0.05)
231-
# re-allocate and zero-out global packet buffer
232-
_BUFF = bytearray(packet_sz)
233-
_BUFF = self._sock.recv(packet_sz)[0]
229+
# store packet in buffer
230+
_buff = self._sock.recv(packet_sz)[0]
234231

235232
# Check OP, if valid, let's parse the packet out!
236-
assert _BUFF[0] == DHCP_BOOT_REPLY, "Malformed Packet - \
233+
assert _buff[0] == DHCP_BOOT_REPLY, "Malformed Packet - \
237234
DHCP message OP is not expected BOOT Reply."
238235

239-
240236
# Client Hardware Address (CHADDR)
241237
chaddr = bytearray(6)
242238
for mac, _ in enumerate(chaddr):
243-
chaddr[mac] = _BUFF[28+mac]
239+
chaddr[mac] = _buff[28+mac]
244240

245241
if chaddr != 0:
246-
xid = _BUFF[4:8]
242+
xid = _buff[4:8]
247243
if bytes(xid) < self._initial_xid:
248244
return 0, 0
249245

250246
# Your IP Address (YIADDR)
251-
self.local_ip = _BUFF[16:20]
247+
self.local_ip = _buff[16:20]
252248

253249
# Gateway IP Address (GIADDR)
254-
self.gateway_ip = _BUFF[20:24]
250+
self.gateway_ip = _buff[20:24]
255251

256252
# NOTE: Next 192 octets are 0's for BOOTP legacy
257253

258254
# DHCP Message Type
259-
msg_type = _BUFF[242]
255+
msg_type = _buff[242]
260256
# DHCP Server ID
261-
self.dhcp_server_ip = _BUFF[245:249]
257+
self.dhcp_server_ip = _buff[245:249]
262258
# Lease Time, in seconds
263-
self._lease_time = int.from_bytes(_BUFF[251:255], 'l')
259+
self._lease_time = int.from_bytes(_buff[251:255], 'l')
264260
# T1 value
265-
self._t1 = int.from_bytes(_BUFF[257:261], 'l')
261+
self._t1 = int.from_bytes(_buff[257:261], 'l')
266262
# print("T1: ", self._t1)
267263
# T2 value
268-
self._t2 = int.from_bytes(_BUFF[263:267], 'l')
264+
self._t2 = int.from_bytes(_buff[263:267], 'l')
269265
# print("T2: ", self._t2)
270266
# Subnet Mask
271-
self.subnet_mask = _BUFF[269:273]
267+
self.subnet_mask = _buff[269:273]
272268
# DNS Server
273-
self.dns_server_ip = _BUFF[285:289]
269+
self.dns_server_ip = _buff[285:289]
274270

275271
return msg_type, xid
276272

@@ -287,21 +283,24 @@ def request_dhcp_lease(self):
287283

288284
while self._dhcp_state != STATE_DHCP_LEASED:
289285
if self._dhcp_state == STATE_DHCP_START:
286+
print("START")
290287
self._transaction_id += 1
291288
self._sock.connect((BROADCAST_SERVER_ADDR, DHCP_SERVER_PORT))
292289
self.send_dhcp_message(STATE_DHCP_DISCOVER,
293290
((time.monotonic() - start_time) / 1000))
294291
self._dhcp_state = STATE_DHCP_DISCOVER
295292
elif self._dhcp_state == STATE_DHCP_DISCOVER:
293+
print("DISCOVER")
296294
msg_type, xid = self.parse_dhcp_response(self._timeout)
297-
print(msg_type)
298295
if msg_type == DHCP_OFFER:
299296
# use the _transaction_id the offer returned,
300297
# rather than the current one
301298
self._transaction_id = self._transaction_id.from_bytes(xid, 'l')
299+
print("REQUEST")
302300
self.send_dhcp_message(DHCP_REQUEST, ((time.monotonic() - start_time) / 1000))
303301
self._dhcp_state = STATE_DHCP_REQUEST
304302
elif STATE_DHCP_REQUEST:
303+
print("LEASE")
305304
msg_type, xid = self.parse_dhcp_response(self._timeout)
306305
if msg_type == DHCP_ACK:
307306
self._dhcp_state = STATE_DHCP_LEASED

‎adafruit_wiznet5k/adafruit_wiznet5k_socket.py‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ def htons(x):
5454
SOCK_DGRAM = const(0x02) # UDP
5555
AF_INET = const(3)
5656
NO_SOCKET_AVAIL = const(255)
57-
MAX_PACKET = const(4000)
5857
# pylint: enable=bad-whitespace
5958

6059

@@ -96,9 +95,9 @@ def connected(self):
9695
if status == adafruit_wiznet5k.SNSR_SOCK_CLOSE_WAIT and self.available()[0] == 0:
9796
result = False
9897
result = status not in (adafruit_wiznet5k.SNSR_SOCK_CLOSED,
99-
adafruit_wiznet5k.SNSR_SOCK_LISTEN,
100-
adafruit_wiznet5k.SNSR_SOCK_CLOSE_WAIT,
101-
adafruit_wiznet5k.SNSR_SOCK_FIN_WAIT)
98+
adafruit_wiznet5k.SNSR_SOCK_LISTEN,
99+
adafruit_wiznet5k.SNSR_SOCK_CLOSE_WAIT,
100+
adafruit_wiznet5k.SNSR_SOCK_FIN_WAIT)
102101
if not result:
103102
self.close()
104103
return result
@@ -121,7 +120,7 @@ def connect(self, address):
121120
host, port = address
122121

123122
if hasattr(host, 'split'):
124-
host = tuple(map(int, host.split('.')))
123+
host = tuple(map(int, host.split('.')))
125124

126125
if not _the_interface.socket_connect(self.socknum, host, port, conn_mode=self._sock_type):
127126
raise RuntimeError("Failed to connect to host", host)
@@ -148,10 +147,9 @@ def recv(self, bufsize=0):
148147
if self._sock_type == SOCK_STREAM:
149148
avail = self.available()
150149
elif self._sock_type == SOCK_DGRAM:
151-
avail = _the_interface._udp_remaining()
150+
avail = _the_interface.udp_remaining()
152151
if avail:
153152
if self._sock_type == SOCK_STREAM:
154-
buf = _the_interface.socket_read(self.socknum, avail)
155153
self._buffer += _the_interface.socket_read(self.socknum, avail)
156154
elif self._sock_type == SOCK_DGRAM:
157155
self._buffer += _the_interface.read_udp(self.socknum, avail)
@@ -170,7 +168,7 @@ def recv(self, bufsize=0):
170168
if self._sock_type == SOCK_STREAM:
171169
avail = self.available()
172170
elif self._sock_type == SOCK_DGRAM:
173-
avail = _the_interface._udp_remaining()
171+
avail = _the_interface.udp_remaining()
174172
if avail:
175173
stamp = time.monotonic()
176174
if self._sock_type == SOCK_STREAM:
@@ -203,7 +201,7 @@ def readline(self):
203201
avail = self.available()
204202
self._buffer += _the_interface.read(self.socknum, avail)[1]
205203
elif self._sock_type == SOCK_DGRAM:
206-
avail = _the_interface._udp_remaining()
204+
avail = _the_interface.udp_remaining()
207205
self._buffer += _the_interface.read_udp(self.socknum, avail)[1]
208206
elif self._timeout > 0 and time.monotonic() - stamp > self._timeout:
209207
self.close()

‎examples/wiznet5k_simpletest.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@
4848
print("Received: %d bytes"%bytes_avail)
4949
end = end - start / 1000000.0
5050
rate = bytes_avail / end / 1000.0
51-
print("Rate = %0.5f kbytes/second"%rate)
51+
print("Rate = %0.5f kbytes/second"%rate)

0 commit comments

Comments
 (0)