Merge branch 'herlesupreeth:master' into master

Author: Robin-Rhee

pcscf/kamailio_pcscf.cfg

@@ -442,8 +442,8 @@ modparam("ims_qos", "dialog_direction", RX_IMS_REG_DIALOG_DIRECTION)
 #!ifdef WITH_N5
 
 # Tables to store users and their session details
-modparam("htable", "htable", "user_data=>size=8;autoexpire=3600;")
-modparam("htable", "htable", "user_ids=>size=8;autoexpire=3600;")
+modparam("htable", "htable", "imsi_to_app_session_map=>size=8;autoexpire=UE_SUBSCRIPTION_EXPIRES;")
+modparam("htable", "htable", "ue_ip_to_imsi_map=>size=8;autoexpire=UE_SUBSCRIPTION_EXPIRES;")
 modparam("htable", "htable", "user_sdps_ip=>size=8;autoexpire=3600;")
 modparam("htable", "htable", "user_sdps_port=>size=8;autoexpire=3600;")
 modparam("htable", "htable", "user_sdps_rtcp_port=>size=8;autoexpire=3600;")
@@ -1109,7 +1109,7 @@ route[NRF_NFM] {
 
 	$var(nf_reg_body) = '{
 		"nfInstanceId": "PCSCF_UUID",
-		"nfType":   "AF",
+		"nfType": "AF",
 		"nfStatus": "REGISTERED",
 		"ipv4Addresses": ["N5_BIND_IP"],
 		"allowedNfTypes": ["SCP", "PCF"],

pcscf/pcscf_init.sh

@@ -99,7 +99,7 @@ ip r add ${UE_IPV4_IMS} via ${UPF_IP}
 ip r add ${UE_IPV4_INTERNET} via ${UPF_IP}
 
 rm -f /kamailio_pcscf.pid
-exec kamailio -f /etc/kamailio_pcscf/kamailio_pcscf.cfg -P /kamailio_pcscf.pid -DD -E -e $@
+exec kamailio -f /etc/kamailio_pcscf/kamailio_pcscf.cfg -P /kamailio_pcscf.pid -m 32 -M 1024 -DD -E -e $@
 
 # Sync docker time
 #ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

pcscf/route/mo.cfg

@@ -299,7 +299,7 @@ route[N5_INIT_REQ] {
 
 			$var(user_id) = $fU;
 			# Store the AppSession Id in the hash table associated with the UE
-			$sht(user_data=>$var(user_id)) = $var(app_session);
+			$sht(imsi_to_app_session_map=>$var(user_id)) = $var(app_session);
 			xlog("L_INFO", "Stored AppSession Id for user $var(user_id): $var(app_session)\n");
 			break;
 		# Failure case
@@ -666,11 +666,11 @@ route[N5_PATCH_REQ] {
 
 	# Retrieve AppSession Id
 	$var(user_id_inv_rep) = $fU;
-	$var(user_appsess_inv_rep) = $sht(user_data=>$var(user_id_inv_rep));
+	$var(user_appsess_inv_rep) = $sht(imsi_to_app_session_map=>$var(user_id_inv_rep));
 	xlog("L_INFO", "Stored AppSession Id for user $var(user_id_inv_rep): $var(user_appsess_inv_rep)\n");
 	if ($var(user_appsess_inv_rep)==0){
 		$var(user_id_inv_rep) = $tU;
-		$var(user_appsess_inv_rep) = $sht(user_data=>$var(user_id_inv_rep));
+		$var(user_appsess_inv_rep) = $sht(imsi_to_app_session_map=>$var(user_id_inv_rep));
 		xlog("L_INFO", "Alt-Mode: Stored AppSession Id for user $var(user_id_inv_rep): $var(user_appsess_inv_rep)\n");
 	}
 	xlog("L_INFO","Preparing PATCH N5 Message for SDP Answer\n");
@@ -811,12 +811,12 @@ route[N5_PATCH_REQ] {
 route[N5_MOC_TERM]{
 	# Retrieving and paying attention to who ended the call
 	$var(user_id_call_rel) = $fU; # User Part of the from Header to get the USER 
-	$var(user_appsess_call_rel) = $sht(user_data=>$var(user_id_call_rel));
+	$var(user_appsess_call_rel) = $sht(imsi_to_app_session_map=>$var(user_id_call_rel));
 	if ($var(user_appsess_call_rel) == 0) {
 		xlog("L_INFO", "we dont have AppSessionID to terminate, doing alternative Method\n");
 		# Retrieving and paying attention to who ended the call
 		$var(user_id_call_rel) = $tU; # User Part of the from Header to get the USER 
-		$var(user_appsess_call_rel) = $sht(user_data=>$var(user_id_call_rel));
+		$var(user_appsess_call_rel) = $sht(imsi_to_app_session_map=>$var(user_id_call_rel));
 		xlog("L_INFO", "Alt-Method : Terminating Stored AppSession for user $var(user_id_call_rel): $var(user_appsess_call_rel)\n");
 	} else {
 		xlog("L_INFO", "We have AppSessionID, doing normal Method\n");

pcscf/route/mt.cfg

@@ -439,7 +439,7 @@ route[N5_INIT_MT_REQ] {
 			$var(term_user_id) = $ci;
 
 			# Store the AppSession Id in the hash table associated with the UE
-			$sht(user_data=>$var(term_user_id)) = $var(mtc_app_session);
+			$sht(imsi_to_app_session_map=>$var(term_user_id)) = $var(mtc_app_session);
 			xlog("L_INFO", "Stored AppSession for user $var(term_user_id): $var(mtc_app_session)\n");
 			break;
 		default:
@@ -524,7 +524,7 @@ route[N5_PATCH_MT_REQ] {
 
 	# Retrieve AppSession
 	$var(mtc_resp_app_id) = $ci;
-	$var(user_appsess_mtc_rep) = $sht(user_data=>$var(mtc_resp_app_id));
+	$var(user_appsess_mtc_rep) = $sht(imsi_to_app_session_map=>$var(mtc_resp_app_id));
 	xlog("L_INFO", "Stored MTC AppSession for user $var(mtc_resp_app_id): $var(user_appsess_mtc_rep)\n");
 
 	xlog("L_INFO","Preparing PATCH N5 Message for SDP Answer\n");
@@ -666,7 +666,7 @@ route[N5_MTC_TERM] {
 	xlog("L_ALERT","Terminating AppSession For Call $ci due to call END\n");
 	# Retrieve appSession based on To URI
 	$var(mtc_resp_app_id) = $ci;
-	$var(user_appsess_mtc_rep) = $sht(user_data=>$var(mtc_resp_app_id));
+	$var(user_appsess_mtc_rep) = $sht(imsi_to_app_session_map=>$var(mtc_resp_app_id));
 
 	xlog("L_INFO", "Normal Method : MTC AppSession for user $var(mtc_resp_app_id): $var(user_appsess_mtc_rep)\n");