paulmataruso/docker_open5gs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix condition for In-Dialog IPSec forwarding

Browse Source
This commit is contained in:
herlesupreeth
2021-06-09 18:08:08 +02:00
parent 6e81de422c
commit 9bb946f4d8
2 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pcscf/route/mo.cfg
View File

@@ -162,12 +162,25 @@ route[MO_indialog] {
xnotice("Contact header: $ct\n");
setflag(FLT_MOBILE_ORIG);
t_on_reply("MO_indialog_reply");
if ($du != "" && $ru != "") {
if ($du != "" && $ru != "" && $fs != "") {
# Remove sips: and sip: from destination URI for comparision
$var(destination) = $(du{re.subst,/sips://g});
$var(destination) = $(var(destination){re.subst,/sip://g});
$var(destination_alias) = $(var(destination){re.subst,/:/~/g});
if (is_request() && $dp != 5060 && ($ru =~ ".*" + $var(destination) + ".*" || $ru =~ ".*" + $var(destination_alias) + ".*")) {
# $var(fs_bck) = $fs;
# $var(fs_proto) = $(var(fs_bck){re.subst,/^([^:]*):([^:]*):([^:]*)/\1/g});
# $var(fs_ip) = $(var(fs_bck){re.subst,/^([^:]*):([^:]*):([^:]*)/\2/g});
# $var(fs_port) = $(var(fs_bck){re.subst,/^([^:]*):([^:]*):([^:]*)/\3/g});
# if (($ru =~ ".*" + $var(destination) + ".*" || $ru =~ ".*" + $var(destination_alias) + ".*") &&
# ($var(fs_ip) == IPSEC_LISTEN_ADDR &&
# (($var(fs_port) >= IPSEC_CLIENT_PORT && $var(fs_port) <= IPSEC_CLIENT_PORT + IPSEC_MAX_CONN) ||
# ($var(fs_port) >= IPSEC_SERVER_PORT && $var(fs_port) <= IPSEC_SERVER_PORT + IPSEC_MAX_CONN)))) {
# ipsec_forward("location");
# }
if ($ru =~ ".*" + $var(destination) + ".*" || $ru =~ ".*" + $var(destination_alias) + ".*") {
ipsec_forward("location");
}
}

20
pcscf/route/mt.cfg
View File

@@ -87,15 +87,25 @@ route[MT_indialog] {
xnotice("Contact header: $ct\n");
#resetflag(FLT_MOBILE_ORIG);
t_on_reply("MT_indialog_reply");
if ($du != "" && $ru != "") {
if ($du != "" && $ru != "" && $fs != "") {
# Remove sips: and sip: from destination URI for comparision
$var(destination) = $(du{re.subst,/sips://g});
$var(destination) = $(var(destination){re.subst,/sip://g});
$var(destination_alias) = $(var(destination){re.subst,/:/~/g});
$var(alias_proto) = $(ru{re.subst,/^(.*);alias=.*~[0-9]*~//g});
if (is_request() && $var(alias_proto) == 2 && ($ru =~ ".*" + $var(destination) + ".*" || $ru =~ ".*" + $var(destination_alias) + ".*")) {
$du = $du+";transport=tcp";
$fs = $(fs{re.subst,/udp/tcp/g});
# $var(fs_bck) = $fs;
# $var(fs_proto) = $(var(fs_bck){re.subst,/^([^:]*):([^:]*):([^:]*)/\1/g});
# $var(fs_ip) = $(var(fs_bck){re.subst,/^([^:]*):([^:]*):([^:]*)/\2/g});
# $var(fs_port) = $(var(fs_bck){re.subst,/^([^:]*):([^:]*):([^:]*)/\3/g});
# if (($ru =~ ".*" + $var(destination) + ".*" || $ru =~ ".*" + $var(destination_alias) + ".*") &&
# ($var(fs_ip) == IPSEC_LISTEN_ADDR &&
# (($var(fs_port) >= IPSEC_CLIENT_PORT && $var(fs_port) <= IPSEC_CLIENT_PORT + IPSEC_MAX_CONN) ||
# ($var(fs_port) >= IPSEC_SERVER_PORT && $var(fs_port) <= IPSEC_SERVER_PORT + IPSEC_MAX_CONN)))) {
# ipsec_forward("location");
# }
if ($ru =~ ".*" + $var(destination) + ".*" || $ru =~ ".*" + $var(destination_alias) + ".*") {
ipsec_forward("location");
}
}
}