Skip to content

Commit fa27994

Browse files
Robin-RheeRobin-Rhee
authored
Merge branch 'herlesupreeth:master' into master
2 parents 3e99855 + a9c3c12 commit fa27994

23 files changed

Lines changed: 92 additions & 84 deletions

‎custom_deployments/open5gs_hss_cx/icscf/icscf.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ alias=IMS_DOMAIN
1515

1616
#!define ENUM_SUFFIX "e164.arpa."
1717

18-
# Maximum lifetime of a subscription in seconds (same is advertised to UE)
19-
#!substdef "/UE_SUBSCRIPTION_EXPIRES/SUBSCRIPTION_EXPIRES_ENV/g"
18+
# Maximum lifetime of a UE registration in seconds (same is advertised to UE)
19+
#!substdef "/UE_REGISTRATION_EXPIRES/REGISTRATION_EXPIRES_ENV/g"
2020

2121
# SIP-Address of capturing node, if not set, capturing is disabled.
2222
##!define CAPTURE_NODE "sip:127.0.0.1:9060"

‎custom_deployments/open5gs_hss_cx/icscf/icscf.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
QueueLength="32"
1212
TransactionTimeout="5"
1313
SessionsHashSize="128"
14-
DefaultAuthSessionTimeout="SUBSCRIPTION_EXPIRES_ENV"
15-
MaxAuthSessionTimeout="SUBSCRIPTION_EXPIRES_ENV"
14+
DefaultAuthSessionTimeout="REGISTRATION_EXPIRES_ENV"
15+
MaxAuthSessionTimeout="REGISTRATION_EXPIRES_ENV"
1616
>
1717

1818
<Peer FQDN="hss.EPC_DOMAIN" Realm="EPC_DOMAIN" port="HSS_BIND_PORT"/>

‎custom_deployments/open5gs_hss_cx/icscf/icscf_init.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,16 @@ then
8181
mysql -u root -h ${MYSQL_IP} icscf -e "INSERT INTO s_cscf_capabilities (id_s_cscf, capability) VALUES ('$SCSCF_ID', 0),('$SCSCF_ID', 1);"
8282
fi
8383

84-
SUBSCRIPTION_EXPIRES_ENV=3600
84+
REGISTRATION_EXPIRES_ENV=3600
8585

8686
sed -i 's|ICSCF_IP|'$ICSCF_IP'|g' /etc/kamailio_icscf/icscf.cfg
87-
sed -i 's|SUBSCRIPTION_EXPIRES_ENV|'$SUBSCRIPTION_EXPIRES_ENV'|g' /etc/kamailio_icscf/icscf.cfg
87+
sed -i 's|REGISTRATION_EXPIRES_ENV|'$REGISTRATION_EXPIRES_ENV'|g' /etc/kamailio_icscf/icscf.cfg
8888
sed -i 's|IMS_DOMAIN|'$IMS_DOMAIN'|g' /etc/kamailio_icscf/icscf.cfg
8989
sed -i 's|EPC_DOMAIN|'$EPC_DOMAIN'|g' /etc/kamailio_icscf/icscf.cfg
9090
sed -i 's|MYSQL_IP|'$MYSQL_IP'|g' /etc/kamailio_icscf/icscf.cfg
9191

9292
sed -i 's|ICSCF_IP|'$ICSCF_IP'|g' /etc/kamailio_icscf/icscf.xml
93-
sed -i 's|SUBSCRIPTION_EXPIRES_ENV|'$SUBSCRIPTION_EXPIRES_ENV'|g' /etc/kamailio_icscf/icscf.xml
93+
sed -i 's|REGISTRATION_EXPIRES_ENV|'$REGISTRATION_EXPIRES_ENV'|g' /etc/kamailio_icscf/icscf.xml
9494
sed -i 's|IMS_DOMAIN|'$IMS_DOMAIN'|g' /etc/kamailio_icscf/icscf.xml
9595
sed -i 's|EPC_DOMAIN|'$EPC_DOMAIN'|g' /etc/kamailio_icscf/icscf.xml
9696
sed -i 's|HSS_BIND_PORT|'$HSS_BIND_PORT'|g' /etc/kamailio_icscf/icscf.xml

‎custom_deployments/open5gs_hss_cx/icscf/kamailio_icscf.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ dns_try_naptr=no
6666
#!ifdef WITH_TCP
6767
# life time of TCP connection when there is no traffic
6868
# - a bit higher than registration expires to cope with UA behind NAT
69-
tcp_connection_lifetime=UE_SUBSCRIPTION_EXPIRES
69+
tcp_connection_lifetime=UE_REGISTRATION_EXPIRES
7070
#!ifdef TCP_PROCESSES
7171
tcp_children=TCP_PROCESSES
7272
#!endif

‎custom_deployments/open5gs_hss_cx/scscf/kamailio_scscf.cfg‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ use_dns_cache=off
8484
#!ifdef WITH_TCP
8585
# life time of TCP connection when there is no traffic
8686
# - a bit higher than registration expires to cope with UA behind NAT
87-
tcp_connection_lifetime=UE_SUBSCRIPTION_EXPIRES
87+
tcp_connection_lifetime=UE_REGISTRATION_EXPIRES
8888
#!ifdef TCP_PROCESSES
8989
tcp_children=TCP_PROCESSES
9090
#!endif
@@ -235,9 +235,9 @@ modparam("ims_usrloc_scscf", "db_url", DB_URL)
235235
#!endif
236236
modparam("ims_usrloc_scscf", "db_mode", 0)
237237
#!endif
238-
modparam("ims_registrar_scscf", "subscription_default_expires", UE_SUBSCRIPTION_EXPIRES)
238+
modparam("ims_registrar_scscf", "subscription_default_expires", UE_REGISTRATION_EXPIRES)
239239
modparam("ims_registrar_scscf", "subscription_min_expires", 0)
240-
modparam("ims_registrar_scscf", "subscription_max_expires", UE_SUBSCRIPTION_EXPIRES)
240+
modparam("ims_registrar_scscf", "subscription_max_expires", UE_REGISTRATION_EXPIRES)
241241

242242
# -- CDP params --
243243
modparam("cdp","config_file","/etc/kamailio_scscf/scscf.xml")
@@ -290,8 +290,8 @@ modparam("ims_auth", "av_check_only_impu", 0)
290290

291291
modparam("ims_auth", "max_nonce_reuse", 20)
292292
modparam("ims_auth", "auth_vector_timeout", 60)
293-
modparam("ims_auth", "auth_data_timeout", UE_SUBSCRIPTION_EXPIRES)
294-
modparam("ims_auth", "auth_used_vector_timeout", UE_SUBSCRIPTION_EXPIRES)
293+
modparam("ims_auth", "auth_data_timeout", UE_REGISTRATION_EXPIRES)
294+
modparam("ims_auth", "auth_used_vector_timeout", UE_REGISTRATION_EXPIRES)
295295
modparam("ims_auth", "av_request_at_once", 1)
296296
modparam("ims_auth", "av_request_at_sync", 1)
297297
modparam("ims_auth", "registration_qop", "auth")
@@ -302,9 +302,9 @@ modparam("ims_registrar_scscf", "default_expires", 60)
302302
modparam("ims_registrar_scscf", "min_expires", 60)
303303
modparam("ims_registrar_scscf", "max_expires", 60)
304304
#!else
305-
modparam("ims_registrar_scscf", "default_expires", UE_SUBSCRIPTION_EXPIRES)
305+
modparam("ims_registrar_scscf", "default_expires", UE_REGISTRATION_EXPIRES)
306306
modparam("ims_registrar_scscf", "min_expires", 0)
307-
modparam("ims_registrar_scscf", "max_expires", UE_SUBSCRIPTION_EXPIRES)
307+
modparam("ims_registrar_scscf", "max_expires", UE_REGISTRATION_EXPIRES)
308308
#!endif
309309
modparam("ims_registrar_scscf", "use_path", 1)
310310
modparam("ims_registrar_scscf", "support_wildcardPSI",1)
@@ -351,7 +351,7 @@ modparam("ims_charging", "ro_forced_peer", RO_FORCED_PEER);
351351
#!endif
352352
modparam("ims_charging", "destination_host", RO_DESTINATION);
353353
modparam("ims_charging", "destination_realm", NETWORKNAME);
354-
modparam("ims_charging", "ro_auth_expiry", UE_SUBSCRIPTION_EXPIRES)
354+
modparam("ims_charging", "ro_auth_expiry", UE_REGISTRATION_EXPIRES)
355355

356356
modparam("ims_charging","service_context_id_root", RO_ROOT);
357357
modparam("ims_charging","service_context_id_ext", RO_EXT);

‎custom_deployments/open5gs_hss_cx/scscf/scscf.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ alias=scscf.IMS_DOMAIN
4343
# Number of TCP Processes
4444
#!define TCP_PROCESSES 3
4545

46-
# Maximum lifetime of a subscription in seconds (same is advertised to UE)
47-
#!substdef "/UE_SUBSCRIPTION_EXPIRES/SUBSCRIPTION_EXPIRES_ENV/g"
46+
# Maximum lifetime of a UE registration in seconds (same is advertised to UE)
47+
#!substdef "/UE_REGISTRATION_EXPIRES/REGISTRATION_EXPIRES_ENV/g"
4848

4949
##!define RO_FORCED_PEER "32260@3gpp.org"
5050
#!define RO_DESTINATION "hssocs.voiceblue.com"

‎custom_deployments/open5gs_hss_cx/scscf/scscf.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
QueueLength="32"
1212
TransactionTimeout="5"
1313
SessionsHashSize="128"
14-
DefaultAuthSessionTimeout="SUBSCRIPTION_EXPIRES_ENV"
15-
MaxAuthSessionTimeout="SUBSCRIPTION_EXPIRES_ENV"
14+
DefaultAuthSessionTimeout="REGISTRATION_EXPIRES_ENV"
15+
MaxAuthSessionTimeout="REGISTRATION_EXPIRES_ENV"
1616
>
1717
<Peer FQDN="hss.EPC_DOMAIN" Realm="EPC_DOMAIN" port="HSS_BIND_PORT"/>
1818

‎custom_deployments/open5gs_hss_cx/scscf/scscf_init.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,17 @@ fi
6767

6868
export IMS_SLASH_DOMAIN=`echo $IMS_DOMAIN | sed 's/\./\\\./g'`
6969

70-
SUBSCRIPTION_EXPIRES_ENV=3600
70+
REGISTRATION_EXPIRES_ENV=3600
7171

7272
sed -i 's|SCSCF_IP|'$SCSCF_IP'|g' /etc/kamailio_scscf/scscf.cfg
73-
sed -i 's|SUBSCRIPTION_EXPIRES_ENV|'$SUBSCRIPTION_EXPIRES_ENV'|g' /etc/kamailio_scscf/scscf.cfg
73+
sed -i 's|REGISTRATION_EXPIRES_ENV|'$REGISTRATION_EXPIRES_ENV'|g' /etc/kamailio_scscf/scscf.cfg
7474
sed -i 's|IMS_DOMAIN|'$IMS_DOMAIN'|g' /etc/kamailio_scscf/scscf.cfg
7575
sed -i 's|EPC_DOMAIN|'$EPC_DOMAIN'|g' /etc/kamailio_scscf/scscf.cfg
7676
sed -i 's|IMS_SLASH_DOMAIN|'$IMS_SLASH_DOMAIN'|g' /etc/kamailio_scscf/scscf.cfg
7777
sed -i 's|MYSQL_IP|'$MYSQL_IP'|g' /etc/kamailio_scscf/scscf.cfg
7878

7979
sed -i 's|SCSCF_IP|'$SCSCF_IP'|g' /etc/kamailio_scscf/scscf.xml
80-
sed -i 's|SUBSCRIPTION_EXPIRES_ENV|'$SUBSCRIPTION_EXPIRES_ENV'|g' /etc/kamailio_scscf/scscf.xml
80+
sed -i 's|REGISTRATION_EXPIRES_ENV|'$REGISTRATION_EXPIRES_ENV'|g' /etc/kamailio_scscf/scscf.xml
8181
sed -i 's|IMS_DOMAIN|'$IMS_DOMAIN'|g' /etc/kamailio_scscf/scscf.xml
8282
sed -i 's|EPC_DOMAIN|'$EPC_DOMAIN'|g' /etc/kamailio_scscf/scscf.xml
8383
sed -i 's|HSS_BIND_PORT|'$HSS_BIND_PORT'|g' /etc/kamailio_scscf/scscf.xml

‎icscf/icscf.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ alias=IMS_DOMAIN
1414

1515
#!define ENUM_SUFFIX "e164.arpa."
1616

17-
# Maximum lifetime of a subscription in seconds (same is advertised to UE)
18-
#!substdef "/UE_SUBSCRIPTION_EXPIRES/SUBSCRIPTION_EXPIRES_ENV/g"
17+
# Maximum lifetime of a UE registration in seconds (same is advertised to UE)
18+
#!substdef "/UE_REGISTRATION_EXPIRES/REGISTRATION_EXPIRES_ENV/g"
1919

2020
# SIP-Address of capturing node, if not set, capturing is disabled.
2121
##!define CAPTURE_NODE "sip:127.0.0.1:9060"

‎icscf/icscf.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
QueueLength="32"
1212
TransactionTimeout="5"
1313
SessionsHashSize="128"
14-
DefaultAuthSessionTimeout="SUBSCRIPTION_EXPIRES_ENV"
15-
MaxAuthSessionTimeout="SUBSCRIPTION_EXPIRES_ENV"
14+
DefaultAuthSessionTimeout="REGISTRATION_EXPIRES_ENV"
15+
MaxAuthSessionTimeout="REGISTRATION_EXPIRES_ENV"
1616
>
1717

1818
<Peer FQDN="hss.IMS_DOMAIN" Realm="IMS_DOMAIN" port="PYHSS_BIND_PORT"/>

0 commit comments

Comments
 (0)