Pyhton3.7#7

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
zack-vii wants to merge 2 commits into
base:master
Choose a base branch
from
Open

Pyhton3.7 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b44466d
packet: fixed mac starting with 00:
Nov 5, 2020
5bb8d8e
fixed for python3.7; replaced := and format {var=} syntax
Nov 5, 2020
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
49 changes: 25 additions & 24 deletions dhcppython/client.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,8 @@ def format_dhcp_packet(pkt: packet.DHCPPacket) -> str:
broadcast = "BROADCAST" if pkt.flags else "UNICAST"
client_info_padding = 18
client_info = f"{pkt.htype} - {pkt.chaddr} ({utils.mac2vendor(pkt.chaddr)})"
if (
visual_diff := (
utils.visual_length(client_info) - (COL_LEN - client_info_padding)
)
) > 0:
visual_diff = (utils.visual_length(client_info) - (COL_LEN - client_info_padding))
if visual_diff > 0:
client_info = client_info[:-visual_diff]

output = (
Expand DownExpand Up@@ -172,15 +169,16 @@ def get_lease(
if verbose > 1:
print(format_dhcp_packet(discover))
start = default_timer()
logging.debug(f"Sending discover packet to {server} with {tx_id=}")
logging.debug(f"Sending discover packet to {server} with {tx_id}")
self.send_discover(server, discover, verbose)
# O
tries = 0
while not (offer := self.receive_offer(tx_id, verbose)):
offer = self.receive_offer(tx_id, verbose)
while not offer:
logging.debug(f"Sleeping {self.retry_interval} ms then retrying discover")
sleep(self.retry_interval / 1000)
logging.debug(
f"Attempt {tries} - Sending discover packet to {server} with {tx_id=}"
f"Attempt {tries} - Sending discover packet to {server} with {tx_id}"
)
if verbose > 1:
print("Resending DISCOVER packet")
Expand All@@ -190,6 +188,7 @@ def get_lease(
"Unable to obtain offer run client with -d for debug info"
)
tries += 1
offer = self.receive_offer(tx_id, verbose)
# R
request = packet.DHCPPacket.Request(
mac_addr,
Expand All@@ -204,15 +203,16 @@ def get_lease(
print("REQUEST Packet")
print(format_dhcp_packet(request))
logging.debug(f"Constructed request packet: {request}")
logging.debug(f"Sending request packet to {server} with {tx_id=}")
logging.debug(f"Sending request packet to {server} with {tx_id}")
self.send_request(server, request, verbose)
# A
tries = 0
while not (ack := self.receive_ack(tx_id, verbose)):
ack = self.receive_ack(tx_id, verbose)
while not ack:
logging.debug(f"Sleeping {self.retry_interval} ms then retrying request")
sleep(self.retry_interval / 1000)
logging.debug(
f"Attempt {tries} - Sending request packet to {server} with {tx_id=}"
f"Attempt {tries} - Sending request packet to {server} with {tx_id}"
)
if verbose > 1:
print("Resending REQUEST packet")
Expand All@@ -222,7 +222,7 @@ def get_lease(
"Unable to obtain ack run client with -d for debug info"
)
tries += 1

ack = self.receive_ack(tx_id, verbose)
lease_time = default_timer() - start
lease = Lease(discover, offer, request, ack, lease_time, self.ack_server)

Expand DownExpand Up@@ -256,19 +256,19 @@ def listen(
logging.debug(
f"Select: {select.select(self.listening_sockets, self.writing_sockets, self.except_sockets, 0)}"
)
if len(
socks := select.select(
socks = select.select(
self.listening_sockets,
self.writing_sockets,
self.except_sockets,
self.select_timout,
)[0]
):
if len(socks):
for sock in socks:
data, addr = sock.recvfrom(self.max_pkt_size)
logging.debug(f"Received data from {addr}: {data}")
dhcp_packet = self.get_valid_pkt(data)
if (
(dhcp_packet := self.get_valid_pkt(data)) is not None
dhcp_packet is not None
and dhcp_packet.xid == tx_id
and dhcp_packet.msg_type == msg_type
):
Expand All@@ -283,12 +283,14 @@ def listen(
logging.debug(
f"TX ID does not match expected ID {dhcp_packet.xid} != {tx_id}"
)
elif (msg_type_actual := dhcp_packet.msg_type) != msg_type:
logging.debug(
f"DHCP message type does not match expected: {msg_type_actual} != {msg_type}"
)
else:
logging.debug("Something is wrong with this packet")
msg_type_actual = dhcp_packet.msg_type
if msg_type_actual != msg_type:
logging.debug(
f"DHCP message type does not match expected: {msg_type_actual} != {msg_type}"
)
else:
logging.debug("Something is wrong with this packet")
logging.debug(dhcp_packet)
dhcp_packet = None
tries += 1
Expand DownExpand Up@@ -346,14 +348,13 @@ def send(self, remote_addr: str, remote_port: int, data: bytes, verbosity: int):
tries = 0
while tries < self.max_tries:
logging.debug(f"Select: {select.select(self.listening_sockets, self.writing_sockets, self.except_sockets, self.select_timout,)}")
if len(
socks := select.select(
socks = select.select(
self.listening_sockets,
self.writing_sockets,
self.except_sockets,
self.select_timout,
)[1]
):
if socks:
sock = socks[0]
logging.debug(f"Connecting to {remote_addr}:{remote_port}")
logging.debug(f"Sending data {data!r}")
Expand Down
6 changes: 2 additions & 4 deletions dhcppython/options.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@
import csv
from abc import ABC, abstractmethod
import collections.abc
from typing import Dict, Union, List, Tuple, Optional, TypedDict
from typing import Dict, Union, List, Tuple, Optional
import ipaddress
import struct
import json
Expand All@@ -74,9 +74,7 @@
}


class CodeDataMapping(TypedDict):
obj: Option
index: int
CodeDataMapping = dict


class OptionList(collections.abc.MutableSequence):
Expand Down
7 changes: 4 additions & 3 deletions dhcppython/packet.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ class DHCPPacket(object):
magic_cookie: ClassVar[bytes] = b"\x63\x82\x53\x63"
cookie_offset_start: ClassVar[int] = 236
cookie_offset_end: ClassVar[int] = 240
packet_fmt: ClassVar[str] = ">BBBBLHHLLLL16s64s128s"
packet_fmt: ClassVar[str] = "!BBBBLHHLLLL16s64s128s"
op_map: ClassVar[Dict[int, str]] = {1: "BOOTREQUEST", 2: "BOOTREPLY"}
inverse_op_map: ClassVar[Dict[str, int]] = {v: k for k, v in op_map.items()}
htype_map: ClassVar[Dict[int, str]] = {
Expand DownExpand Up@@ -111,7 +111,8 @@ def asbytes(self):

@property
def msg_type(self) -> Optional[str]:
if msg_type_option := self.options.by_code(53):
msg_type_option = self.options.by_code(53)
if msg_type_option:
return list(msg_type_option.value.values())[0]
else:
return None
Expand All@@ -125,7 +126,7 @@ def from_bytes(cls, packet: bytes):
raise MalformedPacketError("Magic cookie missing")
try:
decoded_packet = [
field.strip(b"\x00") if isinstance(field, bytes) else field
field.rstrip(b"\x00") if isinstance(field, bytes) else field
for field in struct.unpack(
cls.packet_fmt, packet[: cls.cookie_offset_start]
)
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Pyhton3.7#7

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

zack-vii
wants to merge
2
commits into

base:master
Choose a base branch

from

 Open


Pyhton3.7
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b44466d

packet: fixed mac starting with 00:

Nov 5, 2020
5bb8d8e

fixed for python3.7; replaced := and format {var=} syntax

Nov 5, 2020

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


49 changes: 25 additions & 24 deletions
dhcppython/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,8 @@ def format_dhcp_packet(pkt: packet.DHCPPacket) -> str:
 broadcast = "BROADCAST" if pkt.flags else "UNICAST"
 client_info_padding = 18
 client_info = f"{pkt.htype} - {pkt.chaddr} ({utils.mac2vendor(pkt.chaddr)})"
 if (
 visual_diff := (
 utils.visual_length(client_info) - (COL_LEN - client_info_padding)
 )
 ) > 0:
 visual_diff = (utils.visual_length(client_info) - (COL_LEN - client_info_padding))
 if visual_diff > 0:
 client_info = client_info[:-visual_diff]

 output = (
Expand DownExpand Up@@ -172,15 +169,16 @@ def get_lease(
 if verbose > 1:
 print(format_dhcp_packet(discover))
 start = default_timer()
 logging.debug(f"Sending discover packet to {server} with {tx_id=}")
 logging.debug(f"Sending discover packet to {server} with {tx_id}")
 self.send_discover(server, discover, verbose)
 # O
 tries = 0
 while not (offer := self.receive_offer(tx_id, verbose)):
 offer = self.receive_offer(tx_id, verbose)
 while not offer:
 logging.debug(f"Sleeping {self.retry_interval} ms then retrying discover")
 sleep(self.retry_interval / 1000)
 logging.debug(
 f"Attempt {tries} - Sending discover packet to {server} with {tx_id=}"
 f"Attempt {tries} - Sending discover packet to {server} with {tx_id}"
 )
 if verbose > 1:
 print("Resending DISCOVER packet")
Expand All@@ -190,6 +188,7 @@ def get_lease(
 "Unable to obtain offer run client with -d for debug info"
 )
 tries += 1
 offer = self.receive_offer(tx_id, verbose)
 # R
 request = packet.DHCPPacket.Request(
 mac_addr,
Expand All@@ -204,15 +203,16 @@ def get_lease(
 print("REQUEST Packet")
 print(format_dhcp_packet(request))
 logging.debug(f"Constructed request packet: {request}")
 logging.debug(f"Sending request packet to {server} with {tx_id=}")
 logging.debug(f"Sending request packet to {server} with {tx_id}")
 self.send_request(server, request, verbose)
 # A
 tries = 0
 while not (ack := self.receive_ack(tx_id, verbose)):
 ack = self.receive_ack(tx_id, verbose)
 while not ack:
 logging.debug(f"Sleeping {self.retry_interval} ms then retrying request")
 sleep(self.retry_interval / 1000)
 logging.debug(
 f"Attempt {tries} - Sending request packet to {server} with {tx_id=}"
 f"Attempt {tries} - Sending request packet to {server} with {tx_id}"
 )
 if verbose > 1:
 print("Resending REQUEST packet")
Expand All@@ -222,7 +222,7 @@ def get_lease(
 "Unable to obtain ack run client with -d for debug info"
 )
 tries += 1

 ack = self.receive_ack(tx_id, verbose)
 lease_time = default_timer() - start
 lease = Lease(discover, offer, request, ack, lease_time, self.ack_server)

Expand DownExpand Up@@ -256,19 +256,19 @@ def listen(
 logging.debug(
 f"Select: {select.select(self.listening_sockets, self.writing_sockets, self.except_sockets, 0)}"
 )
 if len(
 socks := select.select(
 socks = select.select(
 self.listening_sockets,
 self.writing_sockets,
 self.except_sockets,
 self.select_timout,
 )[0]
 ):
if len(socks):
 for sock in socks:
 data, addr = sock.recvfrom(self.max_pkt_size)
 logging.debug(f"Received data from {addr}: {data}")
 dhcp_packet = self.get_valid_pkt(data)
 if (
(dhcp_packet := self.get_valid_pkt(data)) is not None
 dhcp_packet is not None
 and dhcp_packet.xid == tx_id
 and dhcp_packet.msg_type == msg_type
 ):
Expand All@@ -283,12 +283,14 @@ def listen(
 logging.debug(
 f"TX ID does not match expected ID {dhcp_packet.xid} != {tx_id}"
 )
 elif (msg_type_actual := dhcp_packet.msg_type) != msg_type:
 logging.debug(
 f"DHCP message type does not match expected: {msg_type_actual} != {msg_type}"
 )
 else:
 logging.debug("Something is wrong with this packet")
 msg_type_actual = dhcp_packet.msg_type
 if msg_type_actual != msg_type:
 logging.debug(
 f"DHCP message type does not match expected: {msg_type_actual} != {msg_type}"
 )
 else:
 logging.debug("Something is wrong with this packet")
 logging.debug(dhcp_packet)
 dhcp_packet = None
 tries += 1
Expand DownExpand Up@@ -346,14 +348,13 @@ def send(self, remote_addr: str, remote_port: int, data: bytes, verbosity: int):
 tries = 0
 while tries < self.max_tries:
 logging.debug(f"Select: {select.select(self.listening_sockets, self.writing_sockets, self.except_sockets, self.select_timout,)}")
 if len(
 socks := select.select(
 socks = select.select(
 self.listening_sockets,
 self.writing_sockets,
 self.except_sockets,
 self.select_timout,
 )[1]
):
if socks:
 sock = socks[0]
 logging.debug(f"Connecting to {remote_addr}:{remote_port}")
 logging.debug(f"Sending data {data!r}")
Expand Down

6 changes: 2 additions & 4 deletions
dhcppython/options.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@
import csv
from abc import ABC, abstractmethod
import collections.abc
from typing import Dict, Union, List, Tuple, Optional, TypedDict
from typing import Dict, Union, List, Tuple, Optional
import ipaddress
import struct
import json
Expand All@@ -74,9 +74,7 @@
}


class CodeDataMapping(TypedDict):
 obj: Option
 index: int
CodeDataMapping = dict


class OptionList(collections.abc.MutableSequence):
Expand Down

7 changes: 4 additions & 3 deletions
dhcppython/packet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ class DHCPPacket(object):
 magic_cookie: ClassVar[bytes] = b"\x63\x82\x53\x63"
 cookie_offset_start: ClassVar[int] = 236
 cookie_offset_end: ClassVar[int] = 240
 packet_fmt: ClassVar[str] = ">BBBBLHHLLLL16s64s128s"
 packet_fmt: ClassVar[str] = "!BBBBLHHLLLL16s64s128s"
 op_map: ClassVar[Dict[int, str]] = {1: "BOOTREQUEST", 2: "BOOTREPLY"}
 inverse_op_map: ClassVar[Dict[str, int]] = {v: k for k, v in op_map.items()}
 htype_map: ClassVar[Dict[int, str]] = {
Expand DownExpand Up@@ -111,7 +111,8 @@ def asbytes(self):

 @property
 def msg_type(self) -> Optional[str]:
 if msg_type_option := self.options.by_code(53):
 msg_type_option = self.options.by_code(53)
 if msg_type_option:
 return list(msg_type_option.value.values())[0]
 else:
 return None
Expand All@@ -125,7 +126,7 @@ def from_bytes(cls, packet: bytes):
 raise MalformedPacketError("Magic cookie missing")
 try:
 decoded_packet = [
 field.strip(b"\x00") if isinstance(field, bytes) else field
 field.rstrip(b"\x00") if isinstance(field, bytes) else field
 for field in struct.unpack(
 cls.packet_fmt, packet[: cls.cookie_offset_start]
 )
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Pyhton3.7#7

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

zack-vii
wants to merge
2
commits into

base:master
Choose a base branch

from

 Open


Pyhton3.7
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b44466d

packet: fixed mac starting with 00:

Nov 5, 2020
5bb8d8e

fixed for python3.7; replaced := and format {var=} syntax

Nov 5, 2020

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


49 changes: 25 additions & 24 deletions
dhcppython/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,8 @@ def format_dhcp_packet(pkt: packet.DHCPPacket) -> str:
 broadcast = "BROADCAST" if pkt.flags else "UNICAST"
 client_info_padding = 18
 client_info = f"{pkt.htype} - {pkt.chaddr} ({utils.mac2vendor(pkt.chaddr)})"
 if (
 visual_diff := (
 utils.visual_length(client_info) - (COL_LEN - client_info_padding)
 )
 ) > 0:
 visual_diff = (utils.visual_length(client_info) - (COL_LEN - client_info_padding))
 if visual_diff > 0:
 client_info = client_info[:-visual_diff]

 output = (
Expand DownExpand Up@@ -172,15 +169,16 @@ def get_lease(
 if verbose > 1:
 print(format_dhcp_packet(discover))
 start = default_timer()
 logging.debug(f"Sending discover packet to {server} with {tx_id=}")
 logging.debug(f"Sending discover packet to {server} with {tx_id}")
 self.send_discover(server, discover, verbose)
 # O
 tries = 0
 while not (offer := self.receive_offer(tx_id, verbose)):
 offer = self.receive_offer(tx_id, verbose)
 while not offer:
 logging.debug(f"Sleeping {self.retry_interval} ms then retrying discover")
 sleep(self.retry_interval / 1000)
 logging.debug(
 f"Attempt {tries} - Sending discover packet to {server} with {tx_id=}"
 f"Attempt {tries} - Sending discover packet to {server} with {tx_id}"
 )
 if verbose > 1:
 print("Resending DISCOVER packet")
Expand All@@ -190,6 +188,7 @@ def get_lease(
 "Unable to obtain offer run client with -d for debug info"
 )
 tries += 1
 offer = self.receive_offer(tx_id, verbose)
 # R
 request = packet.DHCPPacket.Request(
 mac_addr,
Expand All@@ -204,15 +203,16 @@ def get_lease(
 print("REQUEST Packet")
 print(format_dhcp_packet(request))
 logging.debug(f"Constructed request packet: {request}")
 logging.debug(f"Sending request packet to {server} with {tx_id=}")
 logging.debug(f"Sending request packet to {server} with {tx_id}")
 self.send_request(server, request, verbose)
 # A
 tries = 0
 while not (ack := self.receive_ack(tx_id, verbose)):
 ack = self.receive_ack(tx_id, verbose)
 while not ack:
 logging.debug(f"Sleeping {self.retry_interval} ms then retrying request")
 sleep(self.retry_interval / 1000)
 logging.debug(
 f"Attempt {tries} - Sending request packet to {server} with {tx_id=}"
 f"Attempt {tries} - Sending request packet to {server} with {tx_id}"
 )
 if verbose > 1:
 print("Resending REQUEST packet")
Expand All@@ -222,7 +222,7 @@ def get_lease(
 "Unable to obtain ack run client with -d for debug info"
 )
 tries += 1

 ack = self.receive_ack(tx_id, verbose)
 lease_time = default_timer() - start
 lease = Lease(discover, offer, request, ack, lease_time, self.ack_server)

Expand DownExpand Up@@ -256,19 +256,19 @@ def listen(
 logging.debug(
 f"Select: {select.select(self.listening_sockets, self.writing_sockets, self.except_sockets, 0)}"
 )
 if len(
 socks := select.select(
 socks = select.select(
 self.listening_sockets,
 self.writing_sockets,
 self.except_sockets,
 self.select_timout,
 )[0]
 ):
if len(socks):
 for sock in socks:
 data, addr = sock.recvfrom(self.max_pkt_size)
 logging.debug(f"Received data from {addr}: {data}")
 dhcp_packet = self.get_valid_pkt(data)
 if (
(dhcp_packet := self.get_valid_pkt(data)) is not None
 dhcp_packet is not None
 and dhcp_packet.xid == tx_id
 and dhcp_packet.msg_type == msg_type
 ):
Expand All@@ -283,12 +283,14 @@ def listen(
 logging.debug(
 f"TX ID does not match expected ID {dhcp_packet.xid} != {tx_id}"
 )
 elif (msg_type_actual := dhcp_packet.msg_type) != msg_type:
 logging.debug(
 f"DHCP message type does not match expected: {msg_type_actual} != {msg_type}"
 )
 else:
 logging.debug("Something is wrong with this packet")
 msg_type_actual = dhcp_packet.msg_type
 if msg_type_actual != msg_type:
 logging.debug(
 f"DHCP message type does not match expected: {msg_type_actual} != {msg_type}"
 )
 else:
 logging.debug("Something is wrong with this packet")
 logging.debug(dhcp_packet)
 dhcp_packet = None
 tries += 1
Expand DownExpand Up@@ -346,14 +348,13 @@ def send(self, remote_addr: str, remote_port: int, data: bytes, verbosity: int):
 tries = 0
 while tries < self.max_tries:
 logging.debug(f"Select: {select.select(self.listening_sockets, self.writing_sockets, self.except_sockets, self.select_timout,)}")
 if len(
 socks := select.select(
 socks = select.select(
 self.listening_sockets,
 self.writing_sockets,
 self.except_sockets,
 self.select_timout,
 )[1]
):
if socks:
 sock = socks[0]
 logging.debug(f"Connecting to {remote_addr}:{remote_port}")
 logging.debug(f"Sending data {data!r}")
Expand Down

6 changes: 2 additions & 4 deletions
dhcppython/options.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@
import csv
from abc import ABC, abstractmethod
import collections.abc
from typing import Dict, Union, List, Tuple, Optional, TypedDict
from typing import Dict, Union, List, Tuple, Optional
import ipaddress
import struct
import json
Expand All@@ -74,9 +74,7 @@
}


class CodeDataMapping(TypedDict):
 obj: Option
 index: int
CodeDataMapping = dict


class OptionList(collections.abc.MutableSequence):
Expand Down

7 changes: 4 additions & 3 deletions
dhcppython/packet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ class DHCPPacket(object):
 magic_cookie: ClassVar[bytes] = b"\x63\x82\x53\x63"
 cookie_offset_start: ClassVar[int] = 236
 cookie_offset_end: ClassVar[int] = 240
 packet_fmt: ClassVar[str] = ">BBBBLHHLLLL16s64s128s"
 packet_fmt: ClassVar[str] = "!BBBBLHHLLLL16s64s128s"
 op_map: ClassVar[Dict[int, str]] = {1: "BOOTREQUEST", 2: "BOOTREPLY"}
 inverse_op_map: ClassVar[Dict[str, int]] = {v: k for k, v in op_map.items()}
 htype_map: ClassVar[Dict[int, str]] = {
Expand DownExpand Up@@ -111,7 +111,8 @@ def asbytes(self):

 @property
 def msg_type(self) -> Optional[str]:
 if msg_type_option := self.options.by_code(53):
 msg_type_option = self.options.by_code(53)
 if msg_type_option:
 return list(msg_type_option.value.values())[0]
 else:
 return None
Expand All@@ -125,7 +126,7 @@ def from_bytes(cls, packet: bytes):
 raise MalformedPacketError("Magic cookie missing")
 try:
 decoded_packet = [
 field.strip(b"\x00") if isinstance(field, bytes) else field
 field.rstrip(b"\x00") if isinstance(field, bytes) else field
 for field in struct.unpack(
 cls.packet_fmt, packet[: cls.cookie_offset_start]
 )
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Pyhton3.7#7

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

zack-vii
wants to merge
2
commits into

base:master
Choose a base branch

from

 Open


Pyhton3.7
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b44466d

packet: fixed mac starting with 00:

Nov 5, 2020
5bb8d8e

fixed for python3.7; replaced := and format {var=} syntax

Nov 5, 2020

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


49 changes: 25 additions & 24 deletions
dhcppython/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,8 @@ def format_dhcp_packet(pkt: packet.DHCPPacket) -> str:
 broadcast = "BROADCAST" if pkt.flags else "UNICAST"
 client_info_padding = 18
 client_info = f"{pkt.htype} - {pkt.chaddr} ({utils.mac2vendor(pkt.chaddr)})"
 if (
 visual_diff := (
 utils.visual_length(client_info) - (COL_LEN - client_info_padding)
 )
 ) > 0:
 visual_diff = (utils.visual_length(client_info) - (COL_LEN - client_info_padding))
 if visual_diff > 0:
 client_info = client_info[:-visual_diff]

 output = (
Expand DownExpand Up@@ -172,15 +169,16 @@ def get_lease(
 if verbose > 1:
 print(format_dhcp_packet(discover))
 start = default_timer()
 logging.debug(f"Sending discover packet to {server} with {tx_id=}")
 logging.debug(f"Sending discover packet to {server} with {tx_id}")
 self.send_discover(server, discover, verbose)
 # O
 tries = 0
 while not (offer := self.receive_offer(tx_id, verbose)):
 offer = self.receive_offer(tx_id, verbose)
 while not offer:
 logging.debug(f"Sleeping {self.retry_interval} ms then retrying discover")
 sleep(self.retry_interval / 1000)
 logging.debug(
 f"Attempt {tries} - Sending discover packet to {server} with {tx_id=}"
 f"Attempt {tries} - Sending discover packet to {server} with {tx_id}"
 )
 if verbose > 1:
 print("Resending DISCOVER packet")
Expand All@@ -190,6 +188,7 @@ def get_lease(
 "Unable to obtain offer run client with -d for debug info"
 )
 tries += 1
 offer = self.receive_offer(tx_id, verbose)
 # R
 request = packet.DHCPPacket.Request(
 mac_addr,
Expand All@@ -204,15 +203,16 @@ def get_lease(
 print("REQUEST Packet")
 print(format_dhcp_packet(request))
 logging.debug(f"Constructed request packet: {request}")
 logging.debug(f"Sending request packet to {server} with {tx_id=}")
 logging.debug(f"Sending request packet to {server} with {tx_id}")
 self.send_request(server, request, verbose)
 # A
 tries = 0
 while not (ack := self.receive_ack(tx_id, verbose)):
 ack = self.receive_ack(tx_id, verbose)
 while not ack:
 logging.debug(f"Sleeping {self.retry_interval} ms then retrying request")
 sleep(self.retry_interval / 1000)
 logging.debug(
 f"Attempt {tries} - Sending request packet to {server} with {tx_id=}"
 f"Attempt {tries} - Sending request packet to {server} with {tx_id}"
 )
 if verbose > 1:
 print("Resending REQUEST packet")
Expand All@@ -222,7 +222,7 @@ def get_lease(
 "Unable to obtain ack run client with -d for debug info"
 )
 tries += 1

 ack = self.receive_ack(tx_id, verbose)
 lease_time = default_timer() - start
 lease = Lease(discover, offer, request, ack, lease_time, self.ack_server)

Expand DownExpand Up@@ -256,19 +256,19 @@ def listen(
 logging.debug(
 f"Select: {select.select(self.listening_sockets, self.writing_sockets, self.except_sockets, 0)}"
 )
 if len(
 socks := select.select(
 socks = select.select(
 self.listening_sockets,
 self.writing_sockets,
 self.except_sockets,
 self.select_timout,
 )[0]
 ):
if len(socks):
 for sock in socks:
 data, addr = sock.recvfrom(self.max_pkt_size)
 logging.debug(f"Received data from {addr}: {data}")
 dhcp_packet = self.get_valid_pkt(data)
 if (
(dhcp_packet := self.get_valid_pkt(data)) is not None
 dhcp_packet is not None
 and dhcp_packet.xid == tx_id
 and dhcp_packet.msg_type == msg_type
 ):
Expand All@@ -283,12 +283,14 @@ def listen(
 logging.debug(
 f"TX ID does not match expected ID {dhcp_packet.xid} != {tx_id}"
 )
 elif (msg_type_actual := dhcp_packet.msg_type) != msg_type:
 logging.debug(
 f"DHCP message type does not match expected: {msg_type_actual} != {msg_type}"
 )
 else:
 logging.debug("Something is wrong with this packet")
 msg_type_actual = dhcp_packet.msg_type
 if msg_type_actual != msg_type:
 logging.debug(
 f"DHCP message type does not match expected: {msg_type_actual} != {msg_type}"
 )
 else:
 logging.debug("Something is wrong with this packet")
 logging.debug(dhcp_packet)
 dhcp_packet = None
 tries += 1
Expand DownExpand Up@@ -346,14 +348,13 @@ def send(self, remote_addr: str, remote_port: int, data: bytes, verbosity: int):
 tries = 0
 while tries < self.max_tries:
 logging.debug(f"Select: {select.select(self.listening_sockets, self.writing_sockets, self.except_sockets, self.select_timout,)}")
 if len(
 socks := select.select(
 socks = select.select(
 self.listening_sockets,
 self.writing_sockets,
 self.except_sockets,
 self.select_timout,
 )[1]
):
if socks:
 sock = socks[0]
 logging.debug(f"Connecting to {remote_addr}:{remote_port}")
 logging.debug(f"Sending data {data!r}")
Expand Down

6 changes: 2 additions & 4 deletions
dhcppython/options.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@
import csv
from abc import ABC, abstractmethod
import collections.abc
from typing import Dict, Union, List, Tuple, Optional, TypedDict
from typing import Dict, Union, List, Tuple, Optional
import ipaddress
import struct
import json
Expand All@@ -74,9 +74,7 @@
}


class CodeDataMapping(TypedDict):
 obj: Option
 index: int
CodeDataMapping = dict


class OptionList(collections.abc.MutableSequence):
Expand Down

7 changes: 4 additions & 3 deletions
dhcppython/packet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ class DHCPPacket(object):
 magic_cookie: ClassVar[bytes] = b"\x63\x82\x53\x63"
 cookie_offset_start: ClassVar[int] = 236
 cookie_offset_end: ClassVar[int] = 240
 packet_fmt: ClassVar[str] = ">BBBBLHHLLLL16s64s128s"
 packet_fmt: ClassVar[str] = "!BBBBLHHLLLL16s64s128s"
 op_map: ClassVar[Dict[int, str]] = {1: "BOOTREQUEST", 2: "BOOTREPLY"}
 inverse_op_map: ClassVar[Dict[str, int]] = {v: k for k, v in op_map.items()}
 htype_map: ClassVar[Dict[int, str]] = {
Expand DownExpand Up@@ -111,7 +111,8 @@ def asbytes(self):

 @property
 def msg_type(self) -> Optional[str]:
 if msg_type_option := self.options.by_code(53):
 msg_type_option = self.options.by_code(53)
 if msg_type_option:
 return list(msg_type_option.value.values())[0]
 else:
 return None
Expand All@@ -125,7 +126,7 @@ def from_bytes(cls, packet: bytes):
 raise MalformedPacketError("Magic cookie missing")
 try:
 decoded_packet = [
 field.strip(b"\x00") if isinstance(field, bytes) else field
 field.rstrip(b"\x00") if isinstance(field, bytes) else field
 for field in struct.unpack(
 cls.packet_fmt, packet[: cls.cookie_offset_start]
 )
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Pyhton3.7#7

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

zack-vii
wants to merge
2
commits into

base:master
Choose a base branch

from

 Open


Pyhton3.7
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b44466d

packet: fixed mac starting with 00:

Nov 5, 2020
5bb8d8e

fixed for python3.7; replaced := and format {var=} syntax

Nov 5, 2020

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


49 changes: 25 additions & 24 deletions
dhcppython/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,8 @@ def format_dhcp_packet(pkt: packet.DHCPPacket) -> str:
 broadcast = "BROADCAST" if pkt.flags else "UNICAST"
 client_info_padding = 18
 client_info = f"{pkt.htype} - {pkt.chaddr} ({utils.mac2vendor(pkt.chaddr)})"
 if (
 visual_diff := (
 utils.visual_length(client_info) - (COL_LEN - client_info_padding)
 )
 ) > 0:
 visual_diff = (utils.visual_length(client_info) - (COL_LEN - client_info_padding))
 if visual_diff > 0:
 client_info = client_info[:-visual_diff]

 output = (
Expand DownExpand Up@@ -172,15 +169,16 @@ def get_lease(
 if verbose > 1:
 print(format_dhcp_packet(discover))
 start = default_timer()
 logging.debug(f"Sending discover packet to {server} with {tx_id=}")
 logging.debug(f"Sending discover packet to {server} with {tx_id}")
 self.send_discover(server, discover, verbose)
 # O
 tries = 0
 while not (offer := self.receive_offer(tx_id, verbose)):
 offer = self.receive_offer(tx_id, verbose)
 while not offer:
 logging.debug(f"Sleeping {self.retry_interval} ms then retrying discover")
 sleep(self.retry_interval / 1000)
 logging.debug(
 f"Attempt {tries} - Sending discover packet to {server} with {tx_id=}"
 f"Attempt {tries} - Sending discover packet to {server} with {tx_id}"
 )
 if verbose > 1:
 print("Resending DISCOVER packet")
Expand All@@ -190,6 +188,7 @@ def get_lease(
 "Unable to obtain offer run client with -d for debug info"
 )
 tries += 1
 offer = self.receive_offer(tx_id, verbose)
 # R
 request = packet.DHCPPacket.Request(
 mac_addr,
Expand All@@ -204,15 +203,16 @@ def get_lease(
 print("REQUEST Packet")
 print(format_dhcp_packet(request))
 logging.debug(f"Constructed request packet: {request}")
 logging.debug(f"Sending request packet to {server} with {tx_id=}")
 logging.debug(f"Sending request packet to {server} with {tx_id}")
 self.send_request(server, request, verbose)
 # A
 tries = 0
 while not (ack := self.receive_ack(tx_id, verbose)):
 ack = self.receive_ack(tx_id, verbose)
 while not ack:
 logging.debug(f"Sleeping {self.retry_interval} ms then retrying request")
 sleep(self.retry_interval / 1000)
 logging.debug(
 f"Attempt {tries} - Sending request packet to {server} with {tx_id=}"
 f"Attempt {tries} - Sending request packet to {server} with {tx_id}"
 )
 if verbose > 1:
 print("Resending REQUEST packet")
Expand All@@ -222,7 +222,7 @@ def get_lease(
 "Unable to obtain ack run client with -d for debug info"
 )
 tries += 1

 ack = self.receive_ack(tx_id, verbose)
 lease_time = default_timer() - start
 lease = Lease(discover, offer, request, ack, lease_time, self.ack_server)

Expand DownExpand Up@@ -256,19 +256,19 @@ def listen(
 logging.debug(
 f"Select: {select.select(self.listening_sockets, self.writing_sockets, self.except_sockets, 0)}"
 )
 if len(
 socks := select.select(
 socks = select.select(
 self.listening_sockets,
 self.writing_sockets,
 self.except_sockets,
 self.select_timout,
 )[0]
 ):
if len(socks):
 for sock in socks:
 data, addr = sock.recvfrom(self.max_pkt_size)
 logging.debug(f"Received data from {addr}: {data}")
 dhcp_packet = self.get_valid_pkt(data)
 if (
(dhcp_packet := self.get_valid_pkt(data)) is not None
 dhcp_packet is not None
 and dhcp_packet.xid == tx_id
 and dhcp_packet.msg_type == msg_type
 ):
Expand All@@ -283,12 +283,14 @@ def listen(
 logging.debug(
 f"TX ID does not match expected ID {dhcp_packet.xid} != {tx_id}"
 )
 elif (msg_type_actual := dhcp_packet.msg_type) != msg_type:
 logging.debug(
 f"DHCP message type does not match expected: {msg_type_actual} != {msg_type}"
 )
 else:
 logging.debug("Something is wrong with this packet")
 msg_type_actual = dhcp_packet.msg_type
 if msg_type_actual != msg_type:
 logging.debug(
 f"DHCP message type does not match expected: {msg_type_actual} != {msg_type}"
 )
 else:
 logging.debug("Something is wrong with this packet")
 logging.debug(dhcp_packet)
 dhcp_packet = None
 tries += 1
Expand DownExpand Up@@ -346,14 +348,13 @@ def send(self, remote_addr: str, remote_port: int, data: bytes, verbosity: int):
 tries = 0
 while tries < self.max_tries:
 logging.debug(f"Select: {select.select(self.listening_sockets, self.writing_sockets, self.except_sockets, self.select_timout,)}")
 if len(
 socks := select.select(
 socks = select.select(
 self.listening_sockets,
 self.writing_sockets,
 self.except_sockets,
 self.select_timout,
 )[1]
):
if socks:
 sock = socks[0]
 logging.debug(f"Connecting to {remote_addr}:{remote_port}")
 logging.debug(f"Sending data {data!r}")
Expand Down

6 changes: 2 additions & 4 deletions
dhcppython/options.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@
import csv
from abc import ABC, abstractmethod
import collections.abc
from typing import Dict, Union, List, Tuple, Optional, TypedDict
from typing import Dict, Union, List, Tuple, Optional
import ipaddress
import struct
import json
Expand All@@ -74,9 +74,7 @@
}


class CodeDataMapping(TypedDict):
 obj: Option
 index: int
CodeDataMapping = dict


class OptionList(collections.abc.MutableSequence):
Expand Down

7 changes: 4 additions & 3 deletions
dhcppython/packet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ class DHCPPacket(object):
 magic_cookie: ClassVar[bytes] = b"\x63\x82\x53\x63"
 cookie_offset_start: ClassVar[int] = 236
 cookie_offset_end: ClassVar[int] = 240
 packet_fmt: ClassVar[str] = ">BBBBLHHLLLL16s64s128s"
 packet_fmt: ClassVar[str] = "!BBBBLHHLLLL16s64s128s"
 op_map: ClassVar[Dict[int, str]] = {1: "BOOTREQUEST", 2: "BOOTREPLY"}
 inverse_op_map: ClassVar[Dict[str, int]] = {v: k for k, v in op_map.items()}
 htype_map: ClassVar[Dict[int, str]] = {
Expand DownExpand Up@@ -111,7 +111,8 @@ def asbytes(self):

 @property
 def msg_type(self) -> Optional[str]:
 if msg_type_option := self.options.by_code(53):
 msg_type_option = self.options.by_code(53)
 if msg_type_option:
 return list(msg_type_option.value.values())[0]
 else:
 return None
Expand All@@ -125,7 +126,7 @@ def from_bytes(cls, packet: bytes):
 raise MalformedPacketError("Magic cookie missing")
 try:
 decoded_packet = [
 field.strip(b"\x00") if isinstance(field, bytes) else field
 field.rstrip(b"\x00") if isinstance(field, bytes) else field
 for field in struct.unpack(
 cls.packet_fmt, packet[: cls.cookie_offset_start]
 )
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Pyhton3.7#7

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

zack-vii
wants to merge
2
commits into

base:master
Choose a base branch

from

 Open


Pyhton3.7
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b44466d

packet: fixed mac starting with 00:

Nov 5, 2020
5bb8d8e

fixed for python3.7; replaced := and format {var=} syntax

Nov 5, 2020

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


49 changes: 25 additions & 24 deletions
dhcppython/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,8 @@ def format_dhcp_packet(pkt: packet.DHCPPacket) -> str:
 broadcast = "BROADCAST" if pkt.flags else "UNICAST"
 client_info_padding = 18
 client_info = f"{pkt.htype} - {pkt.chaddr} ({utils.mac2vendor(pkt.chaddr)})"
 if (
 visual_diff := (
 utils.visual_length(client_info) - (COL_LEN - client_info_padding)
 )
 ) > 0:
 visual_diff = (utils.visual_length(client_info) - (COL_LEN - client_info_padding))
 if visual_diff > 0:
 client_info = client_info[:-visual_diff]

 output = (
Expand DownExpand Up@@ -172,15 +169,16 @@ def get_lease(
 if verbose > 1:
 print(format_dhcp_packet(discover))
 start = default_timer()
 logging.debug(f"Sending discover packet to {server} with {tx_id=}")
 logging.debug(f"Sending discover packet to {server} with {tx_id}")
 self.send_discover(server, discover, verbose)
 # O
 tries = 0
 while not (offer := self.receive_offer(tx_id, verbose)):
 offer = self.receive_offer(tx_id, verbose)
 while not offer:
 logging.debug(f"Sleeping {self.retry_interval} ms then retrying discover")
 sleep(self.retry_interval / 1000)
 logging.debug(
 f"Attempt {tries} - Sending discover packet to {server} with {tx_id=}"
 f"Attempt {tries} - Sending discover packet to {server} with {tx_id}"
 )
 if verbose > 1:
 print("Resending DISCOVER packet")
Expand All@@ -190,6 +188,7 @@ def get_lease(
 "Unable to obtain offer run client with -d for debug info"
 )
 tries += 1
 offer = self.receive_offer(tx_id, verbose)
 # R
 request = packet.DHCPPacket.Request(
 mac_addr,
Expand All@@ -204,15 +203,16 @@ def get_lease(
 print("REQUEST Packet")
 print(format_dhcp_packet(request))
 logging.debug(f"Constructed request packet: {request}")
 logging.debug(f"Sending request packet to {server} with {tx_id=}")
 logging.debug(f"Sending request packet to {server} with {tx_id}")
 self.send_request(server, request, verbose)
 # A
 tries = 0
 while not (ack := self.receive_ack(tx_id, verbose)):
 ack = self.receive_ack(tx_id, verbose)
 while not ack:
 logging.debug(f"Sleeping {self.retry_interval} ms then retrying request")
 sleep(self.retry_interval / 1000)
 logging.debug(
 f"Attempt {tries} - Sending request packet to {server} with {tx_id=}"
 f"Attempt {tries} - Sending request packet to {server} with {tx_id}"
 )
 if verbose > 1:
 print("Resending REQUEST packet")
Expand All@@ -222,7 +222,7 @@ def get_lease(
 "Unable to obtain ack run client with -d for debug info"
 )
 tries += 1

 ack = self.receive_ack(tx_id, verbose)
 lease_time = default_timer() - start
 lease = Lease(discover, offer, request, ack, lease_time, self.ack_server)

Expand DownExpand Up@@ -256,19 +256,19 @@ def listen(
 logging.debug(
 f"Select: {select.select(self.listening_sockets, self.writing_sockets, self.except_sockets, 0)}"
 )
 if len(
 socks := select.select(
 socks = select.select(
 self.listening_sockets,
 self.writing_sockets,
 self.except_sockets,
 self.select_timout,
 )[0]
 ):
if len(socks):
 for sock in socks:
 data, addr = sock.recvfrom(self.max_pkt_size)
 logging.debug(f"Received data from {addr}: {data}")
 dhcp_packet = self.get_valid_pkt(data)
 if (
(dhcp_packet := self.get_valid_pkt(data)) is not None
 dhcp_packet is not None
 and dhcp_packet.xid == tx_id
 and dhcp_packet.msg_type == msg_type
 ):
Expand All@@ -283,12 +283,14 @@ def listen(
 logging.debug(
 f"TX ID does not match expected ID {dhcp_packet.xid} != {tx_id}"
 )
 elif (msg_type_actual := dhcp_packet.msg_type) != msg_type:
 logging.debug(
 f"DHCP message type does not match expected: {msg_type_actual} != {msg_type}"
 )
 else:
 logging.debug("Something is wrong with this packet")
 msg_type_actual = dhcp_packet.msg_type
 if msg_type_actual != msg_type:
 logging.debug(
 f"DHCP message type does not match expected: {msg_type_actual} != {msg_type}"
 )
 else:
 logging.debug("Something is wrong with this packet")
 logging.debug(dhcp_packet)
 dhcp_packet = None
 tries += 1
Expand DownExpand Up@@ -346,14 +348,13 @@ def send(self, remote_addr: str, remote_port: int, data: bytes, verbosity: int):
 tries = 0
 while tries < self.max_tries:
 logging.debug(f"Select: {select.select(self.listening_sockets, self.writing_sockets, self.except_sockets, self.select_timout,)}")
 if len(
 socks := select.select(
 socks = select.select(
 self.listening_sockets,
 self.writing_sockets,
 self.except_sockets,
 self.select_timout,
 )[1]
):
if socks:
 sock = socks[0]
 logging.debug(f"Connecting to {remote_addr}:{remote_port}")
 logging.debug(f"Sending data {data!r}")
Expand Down

6 changes: 2 additions & 4 deletions
dhcppython/options.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@
import csv
from abc import ABC, abstractmethod
import collections.abc
from typing import Dict, Union, List, Tuple, Optional, TypedDict
from typing import Dict, Union, List, Tuple, Optional
import ipaddress
import struct
import json
Expand All@@ -74,9 +74,7 @@
}


class CodeDataMapping(TypedDict):
 obj: Option
 index: int
CodeDataMapping = dict


class OptionList(collections.abc.MutableSequence):
Expand Down

7 changes: 4 additions & 3 deletions
dhcppython/packet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ class DHCPPacket(object):
 magic_cookie: ClassVar[bytes] = b"\x63\x82\x53\x63"
 cookie_offset_start: ClassVar[int] = 236
 cookie_offset_end: ClassVar[int] = 240
 packet_fmt: ClassVar[str] = ">BBBBLHHLLLL16s64s128s"
 packet_fmt: ClassVar[str] = "!BBBBLHHLLLL16s64s128s"
 op_map: ClassVar[Dict[int, str]] = {1: "BOOTREQUEST", 2: "BOOTREPLY"}
 inverse_op_map: ClassVar[Dict[str, int]] = {v: k for k, v in op_map.items()}
 htype_map: ClassVar[Dict[int, str]] = {
Expand DownExpand Up@@ -111,7 +111,8 @@ def asbytes(self):

 @property
 def msg_type(self) -> Optional[str]:
 if msg_type_option := self.options.by_code(53):
 msg_type_option = self.options.by_code(53)
 if msg_type_option:
 return list(msg_type_option.value.values())[0]
 else:
 return None
Expand All@@ -125,7 +126,7 @@ def from_bytes(cls, packet: bytes):
 raise MalformedPacketError("Magic cookie missing")
 try:
 decoded_packet = [
 field.strip(b"\x00") if isinstance(field, bytes) else field
 field.rstrip(b"\x00") if isinstance(field, bytes) else field
 for field in struct.unpack(
 cls.packet_fmt, packet[: cls.cookie_offset_start]
 )
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Pyhton3.7#7

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

zack-vii
wants to merge
2
commits into

base:master
Choose a base branch

from

 Open


Pyhton3.7
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b44466d

packet: fixed mac starting with 00:

Nov 5, 2020
5bb8d8e

fixed for python3.7; replaced := and format {var=} syntax

Nov 5, 2020

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


49 changes: 25 additions & 24 deletions
dhcppython/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,8 @@ def format_dhcp_packet(pkt: packet.DHCPPacket) -> str:
 broadcast = "BROADCAST" if pkt.flags else "UNICAST"
 client_info_padding = 18
 client_info = f"{pkt.htype} - {pkt.chaddr} ({utils.mac2vendor(pkt.chaddr)})"
 if (
 visual_diff := (
 utils.visual_length(client_info) - (COL_LEN - client_info_padding)
 )
 ) > 0:
 visual_diff = (utils.visual_length(client_info) - (COL_LEN - client_info_padding))
 if visual_diff > 0:
 client_info = client_info[:-visual_diff]

 output = (
Expand DownExpand Up@@ -172,15 +169,16 @@ def get_lease(
 if verbose > 1:
 print(format_dhcp_packet(discover))
 start = default_timer()
 logging.debug(f"Sending discover packet to {server} with {tx_id=}")
 logging.debug(f"Sending discover packet to {server} with {tx_id}")
 self.send_discover(server, discover, verbose)
 # O
 tries = 0
 while not (offer := self.receive_offer(tx_id, verbose)):
 offer = self.receive_offer(tx_id, verbose)
 while not offer:
 logging.debug(f"Sleeping {self.retry_interval} ms then retrying discover")
 sleep(self.retry_interval / 1000)
 logging.debug(
 f"Attempt {tries} - Sending discover packet to {server} with {tx_id=}"
 f"Attempt {tries} - Sending discover packet to {server} with {tx_id}"
 )
 if verbose > 1:
 print("Resending DISCOVER packet")
Expand All@@ -190,6 +188,7 @@ def get_lease(
 "Unable to obtain offer run client with -d for debug info"
 )
 tries += 1
 offer = self.receive_offer(tx_id, verbose)
 # R
 request = packet.DHCPPacket.Request(
 mac_addr,
Expand All@@ -204,15 +203,16 @@ def get_lease(
 print("REQUEST Packet")
 print(format_dhcp_packet(request))
 logging.debug(f"Constructed request packet: {request}")
 logging.debug(f"Sending request packet to {server} with {tx_id=}")
 logging.debug(f"Sending request packet to {server} with {tx_id}")
 self.send_request(server, request, verbose)
 # A
 tries = 0
 while not (ack := self.receive_ack(tx_id, verbose)):
 ack = self.receive_ack(tx_id, verbose)
 while not ack:
 logging.debug(f"Sleeping {self.retry_interval} ms then retrying request")
 sleep(self.retry_interval / 1000)
 logging.debug(
 f"Attempt {tries} - Sending request packet to {server} with {tx_id=}"
 f"Attempt {tries} - Sending request packet to {server} with {tx_id}"
 )
 if verbose > 1:
 print("Resending REQUEST packet")
Expand All@@ -222,7 +222,7 @@ def get_lease(
 "Unable to obtain ack run client with -d for debug info"
 )
 tries += 1

 ack = self.receive_ack(tx_id, verbose)
 lease_time = default_timer() - start
 lease = Lease(discover, offer, request, ack, lease_time, self.ack_server)

Expand DownExpand Up@@ -256,19 +256,19 @@ def listen(
 logging.debug(
 f"Select: {select.select(self.listening_sockets, self.writing_sockets, self.except_sockets, 0)}"
 )
 if len(
 socks := select.select(
 socks = select.select(
 self.listening_sockets,
 self.writing_sockets,
 self.except_sockets,
 self.select_timout,
 )[0]
 ):
if len(socks):
 for sock in socks:
 data, addr = sock.recvfrom(self.max_pkt_size)
 logging.debug(f"Received data from {addr}: {data}")
 dhcp_packet = self.get_valid_pkt(data)
 if (
(dhcp_packet := self.get_valid_pkt(data)) is not None
 dhcp_packet is not None
 and dhcp_packet.xid == tx_id
 and dhcp_packet.msg_type == msg_type
 ):
Expand All@@ -283,12 +283,14 @@ def listen(
 logging.debug(
 f"TX ID does not match expected ID {dhcp_packet.xid} != {tx_id}"
 )
 elif (msg_type_actual := dhcp_packet.msg_type) != msg_type:
 logging.debug(
 f"DHCP message type does not match expected: {msg_type_actual} != {msg_type}"
 )
 else:
 logging.debug("Something is wrong with this packet")
 msg_type_actual = dhcp_packet.msg_type
 if msg_type_actual != msg_type:
 logging.debug(
 f"DHCP message type does not match expected: {msg_type_actual} != {msg_type}"
 )
 else:
 logging.debug("Something is wrong with this packet")
 logging.debug(dhcp_packet)
 dhcp_packet = None
 tries += 1
Expand DownExpand Up@@ -346,14 +348,13 @@ def send(self, remote_addr: str, remote_port: int, data: bytes, verbosity: int):
 tries = 0
 while tries < self.max_tries:
 logging.debug(f"Select: {select.select(self.listening_sockets, self.writing_sockets, self.except_sockets, self.select_timout,)}")
 if len(
 socks := select.select(
 socks = select.select(
 self.listening_sockets,
 self.writing_sockets,
 self.except_sockets,
 self.select_timout,
 )[1]
):
if socks:
 sock = socks[0]
 logging.debug(f"Connecting to {remote_addr}:{remote_port}")
 logging.debug(f"Sending data {data!r}")
Expand Down

6 changes: 2 additions & 4 deletions
dhcppython/options.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@
import csv
from abc import ABC, abstractmethod
import collections.abc
from typing import Dict, Union, List, Tuple, Optional, TypedDict
from typing import Dict, Union, List, Tuple, Optional
import ipaddress
import struct
import json
Expand All@@ -74,9 +74,7 @@
}


class CodeDataMapping(TypedDict):
 obj: Option
 index: int
CodeDataMapping = dict


class OptionList(collections.abc.MutableSequence):
Expand Down

7 changes: 4 additions & 3 deletions
dhcppython/packet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ class DHCPPacket(object):
 magic_cookie: ClassVar[bytes] = b"\x63\x82\x53\x63"
 cookie_offset_start: ClassVar[int] = 236
 cookie_offset_end: ClassVar[int] = 240
 packet_fmt: ClassVar[str] = ">BBBBLHHLLLL16s64s128s"
 packet_fmt: ClassVar[str] = "!BBBBLHHLLLL16s64s128s"
 op_map: ClassVar[Dict[int, str]] = {1: "BOOTREQUEST", 2: "BOOTREPLY"}
 inverse_op_map: ClassVar[Dict[str, int]] = {v: k for k, v in op_map.items()}
 htype_map: ClassVar[Dict[int, str]] = {
Expand DownExpand Up@@ -111,7 +111,8 @@ def asbytes(self):

 @property
 def msg_type(self) -> Optional[str]:
 if msg_type_option := self.options.by_code(53):
 msg_type_option = self.options.by_code(53)
 if msg_type_option:
 return list(msg_type_option.value.values())[0]
 else:
 return None
Expand All@@ -125,7 +126,7 @@ def from_bytes(cls, packet: bytes):
 raise MalformedPacketError("Magic cookie missing")
 try:
 decoded_packet = [
 field.strip(b"\x00") if isinstance(field, bytes) else field
 field.rstrip(b"\x00") if isinstance(field, bytes) else field
 for field in struct.unpack(
 cls.packet_fmt, packet[: cls.cookie_offset_start]
 )
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Pyhton3.7#7

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

zack-vii
wants to merge
2
commits into

base:master
Choose a base branch

from

 Open


Pyhton3.7
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b44466d

packet: fixed mac starting with 00:

Nov 5, 2020
5bb8d8e

fixed for python3.7; replaced := and format {var=} syntax

Nov 5, 2020

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


49 changes: 25 additions & 24 deletions
dhcppython/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,8 @@ def format_dhcp_packet(pkt: packet.DHCPPacket) -> str:
 broadcast = "BROADCAST" if pkt.flags else "UNICAST"
 client_info_padding = 18
 client_info = f"{pkt.htype} - {pkt.chaddr} ({utils.mac2vendor(pkt.chaddr)})"
 if (
 visual_diff := (
 utils.visual_length(client_info) - (COL_LEN - client_info_padding)
 )
 ) > 0:
 visual_diff = (utils.visual_length(client_info) - (COL_LEN - client_info_padding))
 if visual_diff > 0:
 client_info = client_info[:-visual_diff]

 output = (
Expand DownExpand Up@@ -172,15 +169,16 @@ def get_lease(
 if verbose > 1:
 print(format_dhcp_packet(discover))
 start = default_timer()
 logging.debug(f"Sending discover packet to {server} with {tx_id=}")
 logging.debug(f"Sending discover packet to {server} with {tx_id}")
 self.send_discover(server, discover, verbose)
 # O
 tries = 0
 while not (offer := self.receive_offer(tx_id, verbose)):
 offer = self.receive_offer(tx_id, verbose)
 while not offer:
 logging.debug(f"Sleeping {self.retry_interval} ms then retrying discover")
 sleep(self.retry_interval / 1000)
 logging.debug(
 f"Attempt {tries} - Sending discover packet to {server} with {tx_id=}"
 f"Attempt {tries} - Sending discover packet to {server} with {tx_id}"
 )
 if verbose > 1:
 print("Resending DISCOVER packet")
Expand All@@ -190,6 +188,7 @@ def get_lease(
 "Unable to obtain offer run client with -d for debug info"
 )
 tries += 1
 offer = self.receive_offer(tx_id, verbose)
 # R
 request = packet.DHCPPacket.Request(
 mac_addr,
Expand All@@ -204,15 +203,16 @@ def get_lease(
 print("REQUEST Packet")
 print(format_dhcp_packet(request))
 logging.debug(f"Constructed request packet: {request}")
 logging.debug(f"Sending request packet to {server} with {tx_id=}")
 logging.debug(f"Sending request packet to {server} with {tx_id}")
 self.send_request(server, request, verbose)
 # A
 tries = 0
 while not (ack := self.receive_ack(tx_id, verbose)):
 ack = self.receive_ack(tx_id, verbose)
 while not ack:
 logging.debug(f"Sleeping {self.retry_interval} ms then retrying request")
 sleep(self.retry_interval / 1000)
 logging.debug(
 f"Attempt {tries} - Sending request packet to {server} with {tx_id=}"
 f"Attempt {tries} - Sending request packet to {server} with {tx_id}"
 )
 if verbose > 1:
 print("Resending REQUEST packet")
Expand All@@ -222,7 +222,7 @@ def get_lease(
 "Unable to obtain ack run client with -d for debug info"
 )
 tries += 1

 ack = self.receive_ack(tx_id, verbose)
 lease_time = default_timer() - start
 lease = Lease(discover, offer, request, ack, lease_time, self.ack_server)

Expand DownExpand Up@@ -256,19 +256,19 @@ def listen(
 logging.debug(
 f"Select: {select.select(self.listening_sockets, self.writing_sockets, self.except_sockets, 0)}"
 )
 if len(
 socks := select.select(
 socks = select.select(
 self.listening_sockets,
 self.writing_sockets,
 self.except_sockets,
 self.select_timout,
 )[0]
 ):
if len(socks):
 for sock in socks:
 data, addr = sock.recvfrom(self.max_pkt_size)
 logging.debug(f"Received data from {addr}: {data}")
 dhcp_packet = self.get_valid_pkt(data)
 if (
(dhcp_packet := self.get_valid_pkt(data)) is not None
 dhcp_packet is not None
 and dhcp_packet.xid == tx_id
 and dhcp_packet.msg_type == msg_type
 ):
Expand All@@ -283,12 +283,14 @@ def listen(
 logging.debug(
 f"TX ID does not match expected ID {dhcp_packet.xid} != {tx_id}"
 )
 elif (msg_type_actual := dhcp_packet.msg_type) != msg_type:
 logging.debug(
 f"DHCP message type does not match expected: {msg_type_actual} != {msg_type}"
 )
 else:
 logging.debug("Something is wrong with this packet")
 msg_type_actual = dhcp_packet.msg_type
 if msg_type_actual != msg_type:
 logging.debug(
 f"DHCP message type does not match expected: {msg_type_actual} != {msg_type}"
 )
 else:
 logging.debug("Something is wrong with this packet")
 logging.debug(dhcp_packet)
 dhcp_packet = None
 tries += 1
Expand DownExpand Up@@ -346,14 +348,13 @@ def send(self, remote_addr: str, remote_port: int, data: bytes, verbosity: int):
 tries = 0
 while tries < self.max_tries:
 logging.debug(f"Select: {select.select(self.listening_sockets, self.writing_sockets, self.except_sockets, self.select_timout,)}")
 if len(
 socks := select.select(
 socks = select.select(
 self.listening_sockets,
 self.writing_sockets,
 self.except_sockets,
 self.select_timout,
 )[1]
):
if socks:
 sock = socks[0]
 logging.debug(f"Connecting to {remote_addr}:{remote_port}")
 logging.debug(f"Sending data {data!r}")
Expand Down

6 changes: 2 additions & 4 deletions
dhcppython/options.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@
import csv
from abc import ABC, abstractmethod
import collections.abc
from typing import Dict, Union, List, Tuple, Optional, TypedDict
from typing import Dict, Union, List, Tuple, Optional
import ipaddress
import struct
import json
Expand All@@ -74,9 +74,7 @@
}


class CodeDataMapping(TypedDict):
 obj: Option
 index: int
CodeDataMapping = dict


class OptionList(collections.abc.MutableSequence):
Expand Down

7 changes: 4 additions & 3 deletions
dhcppython/packet.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ class DHCPPacket(object):
 magic_cookie: ClassVar[bytes] = b"\x63\x82\x53\x63"
 cookie_offset_start: ClassVar[int] = 236
 cookie_offset_end: ClassVar[int] = 240
 packet_fmt: ClassVar[str] = ">BBBBLHHLLLL16s64s128s"
 packet_fmt: ClassVar[str] = "!BBBBLHHLLLL16s64s128s"
 op_map: ClassVar[Dict[int, str]] = {1: "BOOTREQUEST", 2: "BOOTREPLY"}
 inverse_op_map: ClassVar[Dict[str, int]] = {v: k for k, v in op_map.items()}
 htype_map: ClassVar[Dict[int, str]] = {
Expand DownExpand Up@@ -111,7 +111,8 @@ def asbytes(self):

 @property
 def msg_type(self) -> Optional[str]:
 if msg_type_option := self.options.by_code(53):
 msg_type_option = self.options.by_code(53)
 if msg_type_option:
 return list(msg_type_option.value.values())[0]
 else:
 return None
Expand All@@ -125,7 +126,7 @@ def from_bytes(cls, packet: bytes):
 raise MalformedPacketError("Magic cookie missing")
 try:
 decoded_packet = [
 field.strip(b"\x00") if isinstance(field, bytes) else field
 field.rstrip(b"\x00") if isinstance(field, bytes) else field
 for field in struct.unpack(
 cls.packet_fmt, packet[: cls.cookie_offset_start]
 )
Expand Down