Skip to content

Add the ability to use port-ranges instead of individual ports #6

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
Lepidopterist wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add the ability to use port-ranges instead of individual ports #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 45 additions & 12 deletions nethang/simu_path.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,17 +374,19 @@ def create_iptables_rule(direction_ : str):

if self.filter.protocol in ['udp', 'tcp']:
iptables_str_ += ' -p {}'.format(self.filter.protocol)
if self.filter.lan_port and self.filter.lan_port != 'Any' and int(self.filter.lan_port) > 0 and int(self.filter.lan_port) < 65536:
lan_port_ = self._format_port(self.filter.lan_port)
if lan_port_:
if direction_ == 'uplink':
iptables_str_ += ' --sport {}'.format(self.filter.lan_port)
iptables_str_ += ' --sport {}'.format(lan_port_)
else:
iptables_str_ += ' --dport {}'.format(self.filter.lan_port)
iptables_str_ += ' --dport {}'.format(lan_port_)

if self.filter.wan_port and self.filter.wan_port != 'Any' and int(self.filter.wan_port) > 0 and int(self.filter.wan_port) < 65536:
wan_port_ = self._format_port(self.filter.wan_port)
if wan_port_:
if direction_ == 'uplink':
iptables_str_ += ' --dport {}'.format(self.filter.wan_port)
iptables_str_ += ' --dport {}'.format(wan_port_)
else:
iptables_str_ += ' --sport {}'.format(self.filter.wan_port)
iptables_str_ += ' --sport {}'.format(wan_port_)

with ProcLock(IPT_LOCK_FILE):
SimuPathManager.run_cmd('iptables -t mangle -A FORWARD -i {form_iface} -o {to_iface} {iptables_str} -j MARK --set-mark {host_num} > /dev/null 2>&1'.format(
Expand Down Expand Up @@ -412,17 +414,19 @@ def delete_iptables_rule(direction_ : str):

if self.filter.protocol in ['udp', 'tcp']:
iptables_str_ += ' -p {}'.format(self.filter.protocol)
if self.filter.lan_port and self.filter.lan_port != 'Any' and int(self.filter.lan_port) > 0 and int(self.filter.lan_port) < 65536:
lan_port_ = self._format_port(self.filter.lan_port)
if lan_port_:
if direction_ == 'uplink':
iptables_str_ += ' --sport {}'.format(self.filter.lan_port)
iptables_str_ += ' --sport {}'.format(lan_port_)
else:
iptables_str_ += ' --dport {}'.format(self.filter.lan_port)
iptables_str_ += ' --dport {}'.format(lan_port_)

if self.filter.wan_port and self.filter.wan_port != 'Any' and int(self.filter.wan_port) > 0 and int(self.filter.wan_port) < 65536:
wan_port_ = self._format_port(self.filter.wan_port)
if wan_port_:
if direction_ == 'uplink':
iptables_str_ += ' --dport {}'.format(self.filter.wan_port)
iptables_str_ += ' --dport {}'.format(wan_port_)
else:
iptables_str_ += ' --sport {}'.format(self.filter.wan_port)
iptables_str_ += ' --sport {}'.format(wan_port_)

with ProcLock(IPT_LOCK_FILE):
SimuPathManager.run_cmd('iptables -t mangle -D FORWARD -i {form_iface} -o {to_iface} {iptables_str} -j MARK --set-mark {host_num} > /dev/null 2>&1'.format(
Expand All @@ -435,6 +439,35 @@ def __del__(self):
"""Delete the path by removing traffic control"""
self.deactivate()

@staticmethod
def _format_port(port) -> Optional[str]:
"""Validate a port filter value and format it for iptables --sport/--dport.

Accepts either a single port number (e.g. '8080') or a port range
in the 'start:end' format (e.g. '8000:9000'), matching the formats
iptables itself accepts for --sport/--dport. Returns None for
empty/'Any' values or anything that fails validation.
"""
if not port or port == 'Any':
return None

port = str(port).strip()

def is_valid_port_num(value: str) -> bool:
return value.isdigit() and 0 < int(value) < 65536

if ':' in port:
start, sep, end = port.partition(':')
if not is_valid_port_num(start) or not is_valid_port_num(end):
return None
if int(start) > int(end):
return None
return '{}:{}'.format(start, end)

if not is_valid_port_num(port):
return None
return port

def __get_delay_jitter_param(self, input_delay, input_jitter):
delay_ = input_delay if input_delay != None else 0
jitter_ = input_jitter if input_jitter != None else 0
Expand Down
4 changes: 2 additions & 2 deletions nethang/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ <h5 class="modal-title">Add New Path</h5>
</div>
<div class="col-md-6">
<label class="form-label">LAN Port</label>
<input type="text" class="form-control" id="lan-port-input" name="lan_port" value="Any">
<input type="text" class="form-control" id="lan-port-input" name="lan_port" value="Any" placeholder="Any, 8080, or 8000:9000">
</div>
</div>
<div class="row mb-3">
Expand All @@ -268,7 +268,7 @@ <h5 class="modal-title">Add New Path</h5>
</div>
<div class="col-md-6">
<label class="form-label">WAN Port</label>
<input type="text" class="form-control" id="wan-port-input" name="wan_port" value="Any">
<input type="text" class="form-control" id="wan-port-input" name="wan_port" value="Any" placeholder="Any, 8080, or 8000:9000">
</div>
</div>

Expand Down