Commit b79159f8 authored by gauthier's avatar gauthier

Added dynamic protocol configuration options IE in NAS ESM message

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7586 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent ec69c661
......@@ -61,7 +61,7 @@ MME :
# TA (mcc.mnc:tracking area code) DEFAULT = 208.34:0
# max values = 999.999:65535
# maximum of 32 values, comma separated
PLMN = (
TAI_LIST = (
{MCC="208" ; MNC="95"; TAC = "1"; } # YOUR PLMN CONFIG HERE
);
};
......@@ -124,8 +124,8 @@ P-GW =
};
#WARNING DNS ARE HARDCODED IN openair-cn/NAS/EURECOM-NAS/src/esm/msg/ActivateDefaultEpsBearerContextRequest.c:305
DEFAULT_DNS_1_IPV4_ADDRESS = "192.168.12.100"; # YOUR NETWORK CONFIG HERE
DEFAULT_DNS_2_IPV4_ADDRESS = "192.168.106.12"; # YOUR NETWORK CONFIG HERE
DEFAULT_DNS_IPV4_ADDRESS = "192.168.106.12"; # YOUR NETWORK CONFIG HERE
DEFAULT_DNS_SEC_IPV4_ADDRESS = "192.168.12.100"; # YOUR NETWORK CONFIG HERE
};
......@@ -61,9 +61,8 @@ MME :
# TA (mcc.mnc:tracking area code) DEFAULT = 208.34:0
# max values = 999.999:65535
# maximum of 32 values, comma separated
PLMN = (
{MCC="208" ; MNC="95"; TAC = "1"; }, # YOUR PLMN CONFIG HERE
{MCC="208" ; MNC="10"; TAC = "1"; } # YOUR PLMN CONFIG HERE
TAI_LIST = (
{MCC="208" ; MNC="95"; TAC = "1"; } # YOUR PLMN CONFIG HERE
);
};
......@@ -125,8 +124,8 @@ P-GW =
};
#WARNING DNS ARE HARDCODED IN openair-cn/NAS/EURECOM-NAS/src/esm/msg/ActivateDefaultEpsBearerContextRequest.c:305
DEFAULT_DNS_1_IPV4_ADDRESS = "192.168.12.100"; # YOUR NETWORK CONFIG HERE
DEFAULT_DNS_2_IPV4_ADDRESS = "192.168.106.12"; # YOUR NETWORK CONFIG HERE
DEFAULT_DNS_IPV4_ADDRESS = "192.168.106.12"; # YOUR NETWORK CONFIG HERE
DEFAULT_DNS_SEC_IPV4_ADDRESS = "192.168.12.100"; # YOUR NETWORK CONFIG HERE
};
......@@ -57,6 +57,7 @@ typedef struct {
ebi_t eps_bearer_id; ///< EPS bearer identifier
pdn_type_t pdn_type; ///< PDN Type
PAA_t paa; ///< PDN Address Allocation
pco_flat_t pco; ///< Protocol configuration options
} SGICreateEndpointResp;
typedef struct {
......
......@@ -177,6 +177,7 @@ typedef struct nas_pdn_connectivity_req_s {
char imsi[16];
uint8_t imsi_length;
network_qos_t qos;
pco_flat_t pco;
OctetString apn;
OctetString pdn_addr;
int pdn_type;
......@@ -189,6 +190,7 @@ typedef struct nas_pdn_connectivity_rsp_s {
int pti; // nas ref Identity of the procedure transaction executed to activate the PDN connection entry
unsigned ue_id; // nas ref
network_qos_t qos;
pco_flat_t pco;
OctetString apn;
OctetString pdn_addr;
int pdn_type;
......
......@@ -55,6 +55,10 @@
/** @struct SgwCreateSessionRequest
* @brief Create Session Request
*
* Spec 3GPP TS 29.274, Universal Mobile Telecommunications System (UMTS);
* LTE; 3GPP Evolved Packet System (EPS);
* Evolved General Packet Radio Service (GPRS);
* Tunnelling Protocol for Control plane (GTPv2-C); Stage 3
* The Create Session Request will be sent on S11 interface as
* part of these procedures:
* - E-UTRAN Initial Attach
......@@ -250,7 +254,8 @@ typedef struct SgwCreateSessionRequest_s {
///< RAU/TAU/HO procedures with SGW change to identify the
///< default bearer of the PDN Connection
// PCO protocol_configuration_options ///< This IE is not applicable to TAU/RAU/Handover. If
pco_flat_t pco; /// PCO protocol_configuration_options
///< This IE is not applicable to TAU/RAU/Handover. If
///< MME/SGSN receives PCO from UE (during the attach
///< procedures), the MME/SGSN shall forward the PCO IE to
///< SGW. The SGW shall also forward it to PGW.
......@@ -413,7 +418,9 @@ typedef struct SgwCreateSessionResponse_s {
///< Gn/Gp SGSN to S4-SGSN/MME RAU/TAU procedure to
///< identify the default bearer the PGW selects for the PDN
///< Connection.
// PCO protocol_configuration_options ///< This IE is not applicable for TAU/RAU/Handover. If PGW
pco_flat_t pco;// PCO protocol_configuration_options
///< This IE is not applicable for TAU/RAU/Handover. If PGW
///< decides to return PCO to the UE, PGW shall send PCO to
///< SGW. If SGW receives the PCO IE, SGW shall forward it
///< MME/SGSN.
......
......@@ -43,6 +43,7 @@
#include "mme_app_extern.h"
#include "mme_app_ue_context.h"
#include "mme_app_defs.h"
#include "sgw_lite_ie_defs.h"
#include "secu_defs.h"
......@@ -246,6 +247,13 @@ mme_app_send_s11_create_session_req(
}
}
if ((ue_context_pP->pending_pdn_connectivity_req_pco.length >= PCO_MIN_LENGTH) && (ue_context_pP->pending_pdn_connectivity_req_pco.length <= PCO_MAX_LENGTH)) {
memcpy(&session_request_p->pco.byte[0],
&ue_context_pP->pending_pdn_connectivity_req_pco.byte[0],
ue_context_pP->pending_pdn_connectivity_req_pco.length);
session_request_p->pco.length = ue_context_pP->pending_pdn_connectivity_req_pco.length;
}
config_read_lock(&mme_config);
session_request_p->peer_ip = mme_config.ipv4.sgw_ip_address_for_S11;
config_unlock(&mme_config);
......@@ -321,6 +329,11 @@ mme_app_handle_nas_pdn_connectivity_req(
ue_context_p->pending_pdn_connectivity_req_pti = nas_pdn_connectivity_req_pP->pti;
ue_context_p->pending_pdn_connectivity_req_ue_id = nas_pdn_connectivity_req_pP->ue_id;
memcpy(&ue_context_p->pending_pdn_connectivity_req_pco.byte[0],
&nas_pdn_connectivity_req_pP->pco.byte[0],
nas_pdn_connectivity_req_pP->pco.length);
ue_context_p->pending_pdn_connectivity_req_pco.length = nas_pdn_connectivity_req_pP->pco.length;
memcpy(&ue_context_p->pending_pdn_connectivity_req_qos,
&nas_pdn_connectivity_req_pP->qos,
sizeof(network_qos_t));
......@@ -759,6 +772,11 @@ mme_app_handle_create_sess_resp(
NAS_PDN_CONNECTIVITY_RSP(message_p).ambr.br_dl = ue_context_p->subscribed_ambr.br_dl;
memcpy(&NAS_PDN_CONNECTIVITY_RSP(message_p).pco.byte[0],
&create_sess_resp_pP->pco.byte[0],
create_sess_resp_pP->pco.length);
NAS_PDN_CONNECTIVITY_RSP(message_p).pco.length = create_sess_resp_pP->pco.length;
MSC_LOG_TX_MESSAGE(
MSC_MMEAPP_MME,
MSC_NAS_MME,
......
......@@ -177,6 +177,7 @@ typedef struct ue_context_s {
int pending_pdn_connectivity_req_pti;
unsigned pending_pdn_connectivity_req_ue_id;
network_qos_t pending_pdn_connectivity_req_qos;
pco_flat_t pending_pdn_connectivity_req_pco;
void *pending_pdn_connectivity_req_proc_data;
int pending_pdn_connectivity_req_request_type;
......
......@@ -99,6 +99,8 @@ typedef struct mme_api_emm_config_s {
*/
typedef struct mme_api_esm_config_s {
mme_api_feature_t features; /* Supported features */
uint8_t dns_prim_ipv4[4]; /* Network byte order */
uint8_t dns_sec_ipv4[4]; /* Network byte order */
} mme_api_esm_config_t;
/****************************************************************************/
......
This diff is collapsed.
......@@ -399,7 +399,7 @@ typedef struct emm_data_context_s {
* Structure of the EMM data
* -------------------------
*/
typedef struct {
typedef struct emm_data_s {
/*
* MME configuration
* -----------------
......
......@@ -58,7 +58,7 @@ Description Defines the EMM primitives available at the EMMAS Service
/*
* EMMAS-SAP primitives
*/
typedef enum {
typedef enum emm_as_primitive_u {
_EMMAS_START = 200,
_EMMAS_SECURITY_REQ, /* EMM->AS: Security request */
_EMMAS_SECURITY_IND, /* AS->EMM: Security indication */
......@@ -80,7 +80,7 @@ typedef enum {
} emm_as_primitive_t;
/* Data used to setup EPS NAS security */
typedef struct {
typedef struct emm_as_security_data_s {
UInt8_t is_new; /* New security data indicator */
#define EMM_AS_NO_KEY_AVAILABLE 0xff
UInt8_t ksi; /* NAS key set identifier */
......@@ -98,7 +98,7 @@ typedef struct {
* EMMAS primitive for security
* ----------------------------
*/
typedef struct {
typedef struct emm_as_security_s {
UInt32_t ueid; /* UE lower layer identifier */
const GUTI_t *guti; /* GUTI temporary mobile identity */
emm_as_security_data_t sctx;/* EPS NAS security context */
......@@ -144,7 +144,7 @@ typedef struct {
* EMMAS primitive for connection establishment
* --------------------------------------------
*/
typedef struct {
typedef struct emm_as_EPS_identity_s {
const GUTI_t *guti; /* The GUTI, if valid */
const tai_t *tai; /* The last visited registered Tracking
* Area Identity, if available */
......@@ -152,7 +152,7 @@ typedef struct {
const imei_t *imei; /* UE's IMEI for emergency bearer services */
} emm_as_EPS_identity_t;
typedef struct {
typedef struct emm_as_establish_s {
UInt32_t ueid; /* UE lower layer identifier */
emm_as_EPS_identity_t UEid; /* UE's EPS mobile identity */
emm_as_security_data_t sctx;/* EPS NAS security context */
......@@ -184,7 +184,7 @@ typedef struct {
* EMMAS primitive for connection release
* --------------------------------------
*/
typedef struct {
typedef struct emm_as_release_s {
UInt32_t ueid; /* UE lower layer identifier */
const GUTI_t *guti; /* GUTI temporary mobile identity */
#define EMM_AS_CAUSE_AUTHENTICATION 0x01 /* Authentication failure */
......@@ -196,7 +196,7 @@ typedef struct {
* EMMAS primitive for data transfer
* ---------------------------------
*/
typedef struct {
typedef struct emm_as_data_s {
UInt32_t ueid; /* UE lower layer identifier */
const GUTI_t *guti; /* GUTI temporary mobile identity */
emm_as_security_data_t sctx;/* EPS NAS security context */
......@@ -213,13 +213,13 @@ typedef struct {
* EMMAS primitive for paging
* --------------------------
*/
typedef struct {} emm_as_page_t;
typedef struct emm_as_page_s {} emm_as_page_t;
/*
* EMMAS primitive for status indication
* -------------------------------------
*/
typedef struct {
typedef struct emm_as_status_s {
UInt32_t ueid; /* UE lower layer identifier */
const GUTI_t *guti; /* GUTI temporary mobile identity */
emm_as_security_data_t sctx;/* EPS NAS security context */
......@@ -230,7 +230,7 @@ typedef struct {
* EMMAS primitive for cell information
* ------------------------------------
*/
typedef struct {
typedef struct emm_as_cell_info_s {
UInt8_t found; /* Indicates whether a suitable cell is found */
#define EMM_AS_PLMN_LIST_SIZE 6
PLMN_LIST_T(EMM_AS_PLMN_LIST_SIZE) plmnIDs;
......@@ -245,7 +245,7 @@ typedef struct {
* Structure of EMMAS-SAP primitive
* --------------------------------
*/
typedef struct {
typedef struct emm_as_s {
emm_as_primitive_t primitive;
union {
emm_as_security_t security;
......
......@@ -181,19 +181,26 @@ static int _emm_cn_deregister_ue(const UInt32_t ue_id)
static int _emm_cn_pdn_connectivity_res(const emm_cn_pdn_res_t *msg_pP)
{
int rc = RETURNok;
struct emm_data_context_s *emm_ctx_p = NULL;
esm_proc_pdn_type_t esm_pdn_type = ESM_PDN_TYPE_IPV4;
esm_proc_data_t *esm_proc_data_p = NULL;
ESM_msg esm_msg;
EpsQualityOfService qos;
OctetString rsp = { 0, NULL};
int is_standalone = 0; // warning hardcoded
int triggered_by_ue = 1; // warning hardcoded
attach_data_t *data_p = NULL;
int esm_cause = ESM_CAUSE_SUCCESS;
int pid = 0;
unsigned int new_ebi = 0;
int rc = RETURNok;
struct emm_data_context_s *emm_ctx_p = NULL;
esm_proc_pdn_type_t esm_pdn_type = ESM_PDN_TYPE_IPV4;
esm_proc_data_t *esm_proc_data_p = NULL;
ESM_msg esm_msg;
EpsQualityOfService qos;
ProtocolConfigurationOptions pco;
unsigned int pco_in_index = 0;
signed int length_in_pco = 0;
uint16_t pi_or_ci = 0; // protocol identifier or container identifier;
uint8_t length_pi_or_ci = 0;
OctetString rsp = { 0, NULL};
int is_standalone = 0; // warning hardcoded
int triggered_by_ue = 1; // warning hardcoded
attach_data_t *data_p = NULL;
int esm_cause = ESM_CAUSE_SUCCESS;
int pid = 0;
unsigned int new_ebi = 0;
LOG_FUNC_IN;
emm_ctx_p = emm_data_context_get(&_emm_data, msg_pP->ue_id);
......@@ -247,7 +254,44 @@ static int _emm_cn_pdn_connectivity_res(const emm_cn_pdn_res_t *msg_pP)
qos.bitRatesExt.guarBitRateForUL = 0;
qos.bitRatesExt.guarBitRateForDL = 0;
//--------------------------------------------------------------------------
// PCO processing
//--------------------------------------------------------------------------
memset(&pco, 0, sizeof(ProtocolConfigurationOptions));
length_in_pco = msg_pP->pco.byte[1];
if ((length_in_pco+1+1) != msg_pP->pco.length) {
LOG_TRACE(WARNING, "PCO: mismatch in lengths length_pco+1+1 %u != msg_pP->pco.length %u\n",
length_in_pco+1+1, msg_pP->pco.length);
}
pco.configurationprotol = msg_pP->pco.byte[2] & 0x07;
for (int i = 0; i < msg_pP->pco.length; i++) {
LOG_TRACE(WARNING, "EMMCN_PDN_CONNECTIVITY_RES.pco.byte[%u] = 0x%x", i, msg_pP->pco.byte[i]);
}
if ((length_in_pco > 0) && (msg_pP->pco.byte[2] & 0x80)) {
pco_in_index = PCO_MIN_LENGTH;
while (length_in_pco >= 3) {
pi_or_ci = (((uint16_t)msg_pP->pco.byte[pco_in_index]) << 8) | (uint16_t)msg_pP->pco.byte[pco_in_index+1];
pco_in_index += 2;
length_pi_or_ci = msg_pP->pco.byte[pco_in_index++];
pco.protocolid[pco.num_protocol_id_or_container_id] = pi_or_ci;
pco.lengthofprotocolid[pco.num_protocol_id_or_container_id] = length_pi_or_ci;
pco.protocolidcontents[pco.num_protocol_id_or_container_id].value = malloc(length_pi_or_ci);
pco.protocolidcontents[pco.num_protocol_id_or_container_id].length = length_pi_or_ci;
memcpy(pco.protocolidcontents[pco.num_protocol_id_or_container_id].value,
&msg_pP->pco.byte[pco_in_index],
length_pi_or_ci);
LOG_TRACE(WARNING, "PCO: Found pi_or_ci 0x%x length %u content %s\n",
pi_or_ci, length_pi_or_ci, dump_octet_string(&pco.protocolidcontents[pco.num_protocol_id_or_container_id]));
pco.num_protocol_id_or_container_id++;
pco_in_index += length_pi_or_ci;
length_in_pco = length_in_pco - (length_pi_or_ci + 2 + 1);
} // while (length_in_pco >= 3) {
} // if ((length_in_pco > 0) && (msg_pP->pco.byte[2] & 0x80)) {
/*************************************************************************/
/* CODE THAT WAS IN esm_recv.c/esm_recv_pdn_connectivity_request() */
/*************************************************************************/
......@@ -294,6 +338,7 @@ static int _emm_cn_pdn_connectivity_res(const emm_cn_pdn_res_t *msg_pP)
new_ebi, //msg_pP->ebi,
&esm_msg.activate_default_eps_bearer_context_request,
&msg_pP->apn,
&pco,
esm_pdn_type,
&msg_pP->pdn_addr,
&qos,
......
......@@ -165,7 +165,7 @@ typedef enum {
/*
* Structure of EPS Mobility Management primitive
*/
typedef struct {
typedef struct emm_sap_s {
emm_primitive_t primitive;
union {
emm_reg_t emm_reg; /* EMMREG-SAP primitives */
......
......@@ -96,7 +96,7 @@ typedef enum {
#ifdef NAS_MME
/* ESM message timer retransmission data */
typedef struct {
typedef struct esm_ebr_timer_data_s {
void *ctx;
unsigned int ueid; /* Lower layers UE identifier */
unsigned int ebi; /* EPS bearer identity */
......@@ -110,7 +110,7 @@ typedef struct {
* EPS bearer context data
* -----------------------
*/
typedef struct {
typedef struct esm_ebr_context_s {
unsigned char ebi; /* EPS bearer identity */
esm_ebr_state status; /* EPS bearer context status */
#ifdef NAS_UE
......@@ -125,7 +125,7 @@ typedef struct {
#endif
} esm_ebr_context_t;
typedef struct {
typedef struct esm_ebr_data_s {
unsigned char index; /* Index of the next EPS bearer context
* identity to be used */
#define ESM_EBR_DATA_SIZE (ESM_EBI_MAX - ESM_EBI_MIN + 1)
......@@ -147,7 +147,7 @@ typedef struct {
* butes. An EPS bearer corresponds to one Quality of Service policy
* applied within the EPC and E-UTRAN.
*/
typedef struct {
typedef struct esm_bearer_s {
int bid; /* Identifier of the EPS bearer */
unsigned int ebi; /* EPS bearer identity */
network_qos_t qos; /* EPS bearer level QoS parameters */
......@@ -161,7 +161,7 @@ typedef struct {
* one IPv4 address and/or one IPv6 prefix and a PDN represented by
* an Access Point Name (APN).
*/
typedef struct {
typedef struct esm_pdn_s {
unsigned int pti; /* Identity of the procedure transaction executed
* to activate the PDN connection entry */
int is_emergency; /* Emergency bearer services indicator */
......@@ -234,7 +234,7 @@ typedef esm_data_context_t esm_data_t;
* Structure of the ESM data
* -------------------------
*/
typedef struct {
typedef struct esm_data_s {
/*
* MME configuration
* -----------------
......
......@@ -49,6 +49,7 @@ Description Defines the EPS Session Management procedures executed at
#include "networkDef.h"
#include "OctetString.h"
#include "emmData.h"
#include "ProtocolConfigurationOptions.h"
/****************************************************************************/
/********************* G L O B A L C O N S T A N T S *******************/
......@@ -103,6 +104,8 @@ typedef network_qos_t esm_proc_qos_t;
/* Traffic Flow Template for packet filtering */
typedef network_tft_t esm_proc_tft_t;
typedef ProtocolConfigurationOptions esm_proc_pco_t;
/* PDN connection and EPS bearer context data */
typedef struct {
OctetString apn;
......@@ -110,6 +113,7 @@ typedef struct {
OctetString pdn_addr;
esm_proc_qos_t qos;
esm_proc_tft_t tft;
esm_proc_pco_t pco;
} esm_proc_data_t;
/****************************************************************************/
......
......@@ -297,7 +297,7 @@ int encode_activate_default_eps_bearer_context_request(activate_default_eps_bear
encoded += encode_result;
}
#if 1 /* LW: force Protocol Configuration Options to be included in the ESM message */
#if 0 /* LW: force Protocol Configuration Options to be included in the ESM message */
{
#define CONFIGURATION_PROTOCOL_PPP 0
......
......@@ -735,6 +735,7 @@ int esm_recv_pdn_connectivity_request(emm_data_context_t *ctx, int pti, int ebi,
unsigned int *new_ebi, void *data)
{
int esm_cause = ESM_CAUSE_SUCCESS;
uint8_t i;
LOG_FUNC_IN;
......@@ -823,6 +824,13 @@ int esm_recv_pdn_connectivity_request(emm_data_context_t *ctx, int pti, int ebi,
*/
//TODO: rc = esm_proc_information_request();
}
esm_data->pco = msg->protocolconfigurationoptions;
for (i = 0; i < msg->protocolconfigurationoptions.num_protocol_id_or_container_id; i++) {
DUP_OCTET_STRING(msg->protocolconfigurationoptions.protocolidcontents[i], esm_data->pco.protocolidcontents[i]);
esm_data->pco.protocolid[i] = msg->protocolconfigurationoptions.protocolid[i];
esm_data->pco.lengthofprotocolid[i] = msg->protocolconfigurationoptions.lengthofprotocolid[i];
}
#if defined(ORIGINAL_CODE)
/* Execute the PDN connectivity procedure requested by the UE */
......
......@@ -59,7 +59,7 @@ Description Defines the ESM Service Access Point that provides EPS
* EPS Session Management primitives
* ---------------------------------
*/
typedef enum {
typedef enum esm_primitive_s {
ESM_START = 0,
/* Procedures related to EPS bearer contexts (initiated by the network) */
ESM_DEFAULT_EPS_BEARER_CONTEXT_ACTIVATE_REQ,
......@@ -107,14 +107,14 @@ typedef enum {
* ESM primitive for activate EPS default bearer context procedure
* ---------------------------------------------------------------
*/
typedef struct {
typedef struct esm_activate_eps_default_bearer_context_s {
} esm_activate_eps_default_bearer_context_t;
/*
* ESM primitive for PDN connectivity procedure
* --------------------------------------------
*/
typedef struct {
typedef struct esm_pdn_connectivity_s {
int cid; /* PDN connection local identifier */
int is_defined; /* Indicates whether a PDN context has been defined
* for the specified APN */
......@@ -129,7 +129,7 @@ typedef struct {
* ESM primitive for PDN disconnect procedure
* ------------------------------------------
*/
typedef struct {
typedef struct esm_pdn_disconnect_s {
int cid; /* PDN connection local identifier */
} esm_pdn_disconnect_t;
......@@ -137,7 +137,7 @@ typedef struct {
* ESM primitive for deactivate EPS bearer context procedure
* ---------------------------------------------------------
*/
typedef struct {
typedef struct esm_eps_bearer_context_deactivate_s {
#define ESM_SAP_ALL_EBI 0xff
unsigned int ebi; /* EPS bearer identity of the EPS bearer context
* to be deactivated */
......@@ -154,20 +154,20 @@ typedef union {
esm_eps_bearer_context_deactivate_t eps_bearer_context_deactivate;
} esm_sap_data_t;
typedef struct {
typedef struct esm_sap_s {
esm_primitive_t primitive; /* ESM-SAP primitive to process */
int is_standalone; /* Indicates whether the ESM message handled
* within this primitive has to be sent/received
* standalone or together within an EMM related
* message */
#if defined(NAS_MME)
emm_data_context_t *ctx; /* UE context */
emm_data_context_t *ctx; /* UE context */
#endif
unsigned int ueid; /* Local UE identifier */
esm_sap_error_t err; /* ESM-SAP error code */
const OctetString *recv; /* Encoded ESM message received */
OctetString send; /* Encoded ESM message to be sent */
esm_sap_data_t data; /* ESM message data parameters */
unsigned int ueid; /* Local UE identifier */
esm_sap_error_t err; /* ESM-SAP error code */
const OctetString *recv; /* Encoded ESM message received */
OctetString send; /* Encoded ESM message to be sent */
esm_sap_data_t data; /* ESM message data parameters */
} esm_sap_t;
/****************************************************************************/
......
......@@ -555,6 +555,7 @@ int esm_send_activate_default_eps_bearer_context_request(int pti,
int ebi,
activate_default_eps_bearer_context_request_msg *msg,
const OctetString *apn,
const ProtocolConfigurationOptions *pco,
int pdn_type,
const OctetString *pdn_addr,
const EpsQualityOfService *qos,
......@@ -615,6 +616,12 @@ int esm_send_activate_default_eps_bearer_context_request(int pti,
msg->esmcause = esm_cause;
}
if (pco != NULL) {
msg->presencemask |=
ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_REQUEST_PROTOCOL_CONFIGURATION_OPTIONS_PRESENT;
msg->protocolconfigurationoptions = *pco;
}
#warning "TEST LG FORCE APN-AMBR"
LOG_TRACE(INFO, "ESM-SAP - FORCE APN-AMBR");
msg->presencemask |=
......
......@@ -159,8 +159,8 @@ int esm_send_pdn_disconnect_reject(int pti, pdn_disconnect_reject_msg *msg,
*/
int esm_send_activate_default_eps_bearer_context_request(int pti, int ebi,
activate_default_eps_bearer_context_request_msg *msg, const OctetString *apn,
int pdn_type, const OctetString *pdn_addr, const EpsQualityOfService *qos,
int esm_cause);
const ProtocolConfigurationOptions *pco, int pdn_type, const OctetString *pdn_addr,
const EpsQualityOfService *qos, int esm_cause);
int esm_send_activate_dedicated_eps_bearer_context_request(int pti, int ebi,
activate_dedicated_eps_bearer_context_request_msg *msg, int linked_ebi,
......
......@@ -54,6 +54,7 @@ int decode_esm_message_container(EsmMessageContainer *esmmessagecontainer, uint8
CHECK_LENGTH_DECODER(len - decoded, ielen);
if ((decode_result = decode_octet_string(&esmmessagecontainer->esmmessagecontainercontents, ielen, buffer + decoded, len - decoded)) < 0) {
LOG_FUNC_RETURN(decode_result);
} else {
......
......@@ -64,16 +64,23 @@ int decode_protocol_configuration_options(ProtocolConfigurationOptions *protocol
decoded++;
//IES_DECODE_U16(protocolconfigurationoptions->protocolid, *(buffer + decoded));
protocolconfigurationoptions->num_protocol_id_or_container_id = 0;
while ((len - decoded) > 0) {
IES_DECODE_U16(buffer, decoded, protocolconfigurationoptions->protocolid);
DECODE_U8(buffer + decoded, protocolconfigurationoptions->lengthofprotocolid, decoded);
if ((decode_result = decode_octet_string(&protocolconfigurationoptions->protocolidcontents,
protocolconfigurationoptions->lengthofprotocolid, buffer + decoded, len - decoded)) < 0) {
return decode_result;
IES_DECODE_U16(buffer, decoded, protocolconfigurationoptions->protocolid[protocolconfigurationoptions->num_protocol_id_or_container_id]);
DECODE_U8(buffer + decoded, protocolconfigurationoptions->lengthofprotocolid[protocolconfigurationoptions->num_protocol_id_or_container_id], decoded);
if (protocolconfigurationoptions->lengthofprotocolid[protocolconfigurationoptions->num_protocol_id_or_container_id] > 0) {
if ((decode_result = decode_octet_string(&protocolconfigurationoptions->protocolidcontents[protocolconfigurationoptions->num_protocol_id_or_container_id],
protocolconfigurationoptions->lengthofprotocolid[protocolconfigurationoptions->num_protocol_id_or_container_id], buffer + decoded, len - decoded)) < 0) {
return decode_result;
} else {
decoded += decode_result;
}
} else {
decoded += decode_result;
protocolconfigurationoptions->protocolidcontents[protocolconfigurationoptions->num_protocol_id_or_container_id].length = 0;
protocolconfigurationoptions->protocolidcontents[protocolconfigurationoptions->num_protocol_id_or_container_id].value = NULL;
}
protocolconfigurationoptions->num_protocol_id_or_container_id += 1;
}
#if defined (NAS_DEBUG)
......@@ -84,6 +91,7 @@ int decode_protocol_configuration_options(ProtocolConfigurationOptions *protocol
int encode_protocol_configuration_options(ProtocolConfigurationOptions *protocolconfigurationoptions, uint8_t iei, uint8_t *buffer, uint32_t len)
{
uint8_t *lenPtr;
uint8_t num_protocol_id_or_container_id = 0;
uint32_t encoded = 0;
int encode_result;
/* Checking IEI and pointer */
......@@ -102,21 +110,29 @@ int encode_protocol_configuration_options(ProtocolConfigurationOptions *protocol
*(buffer + encoded) = 0x00 | (1 << 7) |
(protocolconfigurationoptions->configurationprotol & 0x7);
encoded++;
IES_ENCODE_U16(buffer, encoded, protocolconfigurationoptions->protocolid);
*(buffer + encoded) = protocolconfigurationoptions->lengthofprotocolid;
encoded++;
if ((encode_result = encode_octet_string(&protocolconfigurationoptions->protocolidcontents, buffer + encoded, len - encoded)) < 0)
return encode_result;
else
encoded += encode_result;
while (num_protocol_id_or_container_id < protocolconfigurationoptions->num_protocol_id_or_container_id) {
IES_ENCODE_U16(buffer, encoded, protocolconfigurationoptions->protocolid[num_protocol_id_or_container_id]);
*(buffer + encoded) = protocolconfigurationoptions->lengthofprotocolid[num_protocol_id_or_container_id];
encoded++;
if ((encode_result = encode_octet_string(&protocolconfigurationoptions->protocolidcontents[num_protocol_id_or_container_id],
buffer + encoded,
len - encoded)) < 0)
return encode_result;
else
encoded += encode_result;
num_protocol_id_or_container_id += 1;
}
*lenPtr = encoded - 1 - ((iei > 0) ? 1 : 0);
return encoded;
}
void dump_protocol_configuration_options_xml(ProtocolConfigurationOptions *protocolconfigurationoptions, uint8_t iei)
{
int i;
printf("<Protocol Configuration Options>\n");
if (iei > 0)
......@@ -124,9 +140,13 @@ void dump_protocol_configuration_options_xml(ProtocolConfigurationOptions *proto
printf(" <IEI>0x%X</IEI>\n", iei);
printf(" <Configuration protol>%u</Configuration protol>\n", protocolconfigurationoptions->configurationprotol);
printf(" <Protocol ID>%u</Protocol ID>\n", protocolconfigurationoptions->protocolid);
printf(" <Length of protocol ID>%u</Length of protocol ID>\n", protocolconfigurationoptions->lengthofprotocolid);
printf("%s",dump_octet_string_xml(&protocolconfigurationoptions->protocolidcontents));
i = 0;
while (i < protocolconfigurationoptions->num_protocol_id_or_container_id) {
printf(" <Protocol ID>%u</Protocol ID>\n", protocolconfigurationoptions->protocolid[i]);
printf(" <Length of protocol ID>%u</Length of protocol ID>\n", protocolconfigurationoptions->lengthofprotocolid[i]);
printf(" %s",dump_octet_string_xml(&protocolconfigurationoptions->protocolidcontents[i]));
i++;
}
printf("</Protocol Configuration Options>\n");
}
......@@ -38,6 +38,10 @@
#define PROTOCOL_CONFIGURATION_OPTIONS_MINIMUM_LENGTH 3
#define PROTOCOL_CONFIGURATION_OPTIONS_MAXIMUM_LENGTH 253
// arbitrary value, theoricaly can be greater than defined (250/3)
#define PROTOCOL_CONFIGURATION_OPTIONS_MAXIMUM_PROTOCOL_ID_OR_CONTAINER_ID 16
/* 3GPP TS 24.008 Table 10.5.154
* MS to network table
*/
......@@ -58,10 +62,11 @@ typedef enum ProtocolConfigurationOptionsList_ids_tag {
*/
typedef struct ProtocolConfigurationOptions_tag {
uint8_t configurationprotol:3;
uint16_t protocolid;
uint8_t lengthofprotocolid;
OctetString protocolidcontents;
uint8_t configurationprotol:3;
uint8_t num_protocol_id_or_container_id;
uint16_t protocolid[PROTOCOL_CONFIGURATION_OPTIONS_MAXIMUM_PROTOCOL_ID_OR_CONTAINER_ID];
uint8_t lengthofprotocolid[PROTOCOL_CONFIGURATION_OPTIONS_MAXIMUM_PROTOCOL_ID_OR_CONTAINER_ID];
OctetString protocolidcontents[PROTOCOL_CONFIGURATION_OPTIONS_MAXIMUM_PROTOCOL_ID_OR_CONTAINER_ID];
} ProtocolConfigurationOptions;