Skip to content

fw4: Add ICMP protocal for SNAT. #80

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

fw4: Add ICMP protocal for SNAT. #80

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
22 changes: 20 additions & 2 deletions root/usr/share/ucode/fw4.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,22 @@ function ensure_tcpudp(x) {
return false;
}

function ensure_tcpudpicmp(x) {
if (length(filter(x, p => (p.name == "tcp" || p.name == "udp" || p.name == "icmp"))))
return true;

let rest = filter(x, p => !p.any),
any = filter(x, p => p.any);

if (length(any) && !length(rest)) {
splice(x, 0);
push(x, { name: "tcp" }, { name: "udp" }, { name: "icmp" });
return true;
}

return false;
}

let is_family = (x, v) => (!x.family || x.family == v);
let family_is_ipv4 = (x) => (!x.family || x.family == 4);
let family_is_ipv6 = (x) => (!x.family || x.family == 6);
Expand Down Expand Up @@ -2868,6 +2884,7 @@ return {
switch (proto.name) {
case "tcp":
case "udp":
case "icmp":
sport = redir.src_port;
dport = redir.dest_port;
rport = redir.src_dport;
Expand Down Expand Up @@ -3089,8 +3106,8 @@ return {
return;
}

if ((snat.snat_port || snat.src_port || snat.dest_port) && !ensure_tcpudp(snat.proto)) {
this.warn_section(data, "specifies ports but no UDP/TCP protocol, ignoring section");
if ((snat.snat_port || snat.src_port || snat.dest_port) && !ensure_tcpudpicmp(snat.proto)) {
this.warn_section(data, "specifies ports but no UDP/TCP/ICMP protocol, ignoring section");
return;
}

Expand Down Expand Up @@ -3147,6 +3164,7 @@ return {
switch (proto.name) {
case "tcp":
case "udp":
case "icmp":
sport = snat.src_port;
dport = snat.dest_port;
rport = snat.snat_port;
Expand Down