Commit 89fd9b30 authored by gauthier's avatar gauthier
Browse files

Hardcoded ambr, qos, with NN

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5658 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent 7bc086df
...@@ -293,7 +293,7 @@ mme_app_handle_conn_est_cnf( ...@@ -293,7 +293,7 @@ mme_app_handle_conn_est_cnf(
ue_context_p = mme_ue_context_exists_nas_ue_id(&mme_app_desc.mme_ue_contexts, nas_conn_est_cnf_pP->UEid); ue_context_p = mme_ue_context_exists_nas_ue_id(&mme_app_desc.mme_ue_contexts, nas_conn_est_cnf_pP->UEid);
if (ue_context_p == NULL) { if (ue_context_p == NULL) {
MME_APP_ERROR("UE context doesn't exist for UE ox%08X/dec%u\n", MME_APP_ERROR("UE context doesn't exist for UE 0x%08X/dec%u\n",
nas_conn_est_cnf_pP->UEid, nas_conn_est_cnf_pP->UEid,
nas_conn_est_cnf_pP->UEid); nas_conn_est_cnf_pP->UEid);
return; return;
...@@ -331,7 +331,15 @@ mme_app_handle_conn_est_cnf( ...@@ -331,7 +331,15 @@ mme_app_handle_conn_est_cnf(
establishment_cnf_p->bearer_qos_prio_level = current_bearer_p->prio_level; establishment_cnf_p->bearer_qos_prio_level = current_bearer_p->prio_level;
establishment_cnf_p->bearer_qos_pre_emp_vulnerability = current_bearer_p->pre_emp_vulnerability; establishment_cnf_p->bearer_qos_pre_emp_vulnerability = current_bearer_p->pre_emp_vulnerability;
establishment_cnf_p->bearer_qos_pre_emp_capability = current_bearer_p->pre_emp_capability; establishment_cnf_p->bearer_qos_pre_emp_capability = current_bearer_p->pre_emp_capability;
establishment_cnf_p->ambr = ue_context_p->used_ambr; #warning "Hardcoded AMBR"
//establishment_cnf_p->ambr = ue_context_p->used_ambr;
establishment_cnf_p->ambr.br_ul = 40000000;
establishment_cnf_p->ambr.br_dl = 100000000;
establishment_cnf_p->security_capabilities_encryption_algorithms = nas_conn_est_cnf_pP->selected_encryption_algorithm;
establishment_cnf_p->security_capabilities_integrity_algorithms = nas_conn_est_cnf_pP->selected_integrity_algorithm;
MME_APP_DEBUG("security_capabilities_encryption_algorithms 0x%04X\n", establishment_cnf_p->security_capabilities_encryption_algorithms);
MME_APP_DEBUG("security_capabilities_integrity_algorithms 0x%04X\n", establishment_cnf_p->security_capabilities_integrity_algorithms);
MME_APP_DEBUG("Derive keNB with UL NAS COUNT %x\n", nas_conn_est_cnf_pP->ul_nas_count); MME_APP_DEBUG("Derive keNB with UL NAS COUNT %x\n", nas_conn_est_cnf_pP->ul_nas_count);
derive_keNB(ue_context_p->vector_in_use->kasme, nas_conn_est_cnf_pP->ul_nas_count, keNB); //156 derive_keNB(ue_context_p->vector_in_use->kasme, nas_conn_est_cnf_pP->ul_nas_count, keNB); //156
...@@ -596,12 +604,17 @@ mme_app_handle_create_sess_resp( ...@@ -596,12 +604,17 @@ mme_app_handle_create_sess_resp(
NAS_PDN_CONNECTIVITY_RSP(message_p).pdn_type = create_sess_resp_pP->paa.pdn_type; NAS_PDN_CONNECTIVITY_RSP(message_p).pdn_type = create_sess_resp_pP->paa.pdn_type;
NAS_PDN_CONNECTIVITY_RSP(message_p).proc_data = ue_context_p->pending_pdn_connectivity_req_proc_data; // NAS internal ref NAS_PDN_CONNECTIVITY_RSP(message_p).proc_data = ue_context_p->pending_pdn_connectivity_req_proc_data; // NAS internal ref
ue_context_p->pending_pdn_connectivity_req_proc_data = NULL; ue_context_p->pending_pdn_connectivity_req_proc_data = NULL;
memcpy(&NAS_PDN_CONNECTIVITY_RSP(message_p).qos,
&ue_context_p->pending_pdn_connectivity_req_qos, #warning "QOS hardcoded here"
sizeof(network_qos_t)); //memcpy(&NAS_PDN_CONNECTIVITY_RSP(message_p).qos,
memset(&ue_context_p->pending_pdn_connectivity_req_qos, // &ue_context_p->pending_pdn_connectivity_req_qos,
0, // sizeof(network_qos_t));
sizeof(network_qos_t)); NAS_PDN_CONNECTIVITY_RSP(message_p).qos.gbrUL = 0;
NAS_PDN_CONNECTIVITY_RSP(message_p).qos.gbrDL = 0; /* Guaranteed Bit Rate for downlink */
NAS_PDN_CONNECTIVITY_RSP(message_p).qos.mbrUL = 50000; /* Maximum Bit Rate for uplink */
NAS_PDN_CONNECTIVITY_RSP(message_p).qos.mbrDL = 100000; /* Maximum Bit Rate for downlink */
NAS_PDN_CONNECTIVITY_RSP(message_p).qos.qci = 9; /* QoS Class Identifier */
NAS_PDN_CONNECTIVITY_RSP(message_p).request_type = ue_context_p->pending_pdn_connectivity_req_request_type; // NAS internal ref NAS_PDN_CONNECTIVITY_RSP(message_p).request_type = ue_context_p->pending_pdn_connectivity_req_request_type; // NAS internal ref
ue_context_p->pending_pdn_connectivity_req_request_type = 0; ue_context_p->pending_pdn_connectivity_req_request_type = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment