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

Simplify in-dialog ipsec forward condition

Browse Source
This commit is contained in:
herlesupreeth
2021-06-22 11:22:44 +02:00
parent ed77063bc6
commit 97a57ec2c4
2 changed files with 4 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pcscf/route/mo.cfg
View File

@@ -163,24 +163,8 @@ route[MO_indialog] {
setflag(FLT_MOBILE_ORIG);
t_on_reply("MO_indialog_reply");
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(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) + ".*") {
if ($dd != "" && $rd != "" && $fs != "") {
if ($rd =~ ".*" + $dd + ".*") {
ipsec_forward("location");
}
}

20
pcscf/route/mt.cfg
View File

@@ -87,24 +87,8 @@ route[MT_indialog] {
xnotice("Contact header: $ct\n");
#resetflag(FLT_MOBILE_ORIG);
t_on_reply("MT_indialog_reply");
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(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) + ".*") {
if ($dd != "" && $rd != "" && $fs != "") {
if ($rd =~ ".*" + $dd + ".*") {
ipsec_forward("location");
}
}