sysmocom
/
open5gs
forked from acouzens/open5gs
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use asn1c library interface(CALLOC) for s1ap memory

This commit is contained in:
Sukchan Lee 2019-07-24 21:03:36 +09:00
parent d791f0034d
commit dba1fcac5c
5 changed files with 214 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/asn1c/s1ap-message.h
View File

@ -35,7 +35,7 @@ extern "C" {
ogs_assert((__dATA)); \
if ((__dATA)->buf) \
{ \
ogs_free((__dATA)->buf); \
FREEMEM((__dATA)->buf); \
(__dATA)->buf = NULL; \
(__dATA)->size = 0; \
} \
@ -47,7 +47,7 @@ extern "C" {
ogs_assert((__dST)); \
S1AP_CLEAR_DATA(__dST); \
(__dST)->size = (__sRC)->size; \
(__dST)->buf = ogs_calloc((__dST)->size, sizeof(uint8_t)); \
(__dST)->buf = CALLOC((__dST)->size, sizeof(uint8_t)); \
memcpy((__dST)->buf, (__sRC)->buf, (__dST)->size); \
} while(0)

306
src/mme/s1ap-build.c
View File

File diff suppressed because it is too large Load Diff

18
src/mme/s1ap-conv.c
View File

@ -23,7 +23,7 @@
void s1ap_uint8_to_OCTET_STRING(uint8_t uint8, OCTET_STRING_t *octet_string)
{
octet_string->size = 1;
octet_string->buf = ogs_calloc(octet_string->size, sizeof(uint8_t));
octet_string->buf = CALLOC(octet_string->size, sizeof(uint8_t));
octet_string->buf[0] = uint8;
}
@ -31,7 +31,7 @@ void s1ap_uint8_to_OCTET_STRING(uint8_t uint8, OCTET_STRING_t *octet_string)
void s1ap_uint16_to_OCTET_STRING(uint16_t uint16, OCTET_STRING_t *octet_string)
{
octet_string->size = 2;
octet_string->buf = ogs_calloc(octet_string->size, sizeof(uint8_t));
octet_string->buf = CALLOC(octet_string->size, sizeof(uint8_t));
octet_string->buf[0] = uint16 >> 8;
octet_string->buf[1] = uint16;
@ -40,7 +40,7 @@ void s1ap_uint16_to_OCTET_STRING(uint16_t uint16, OCTET_STRING_t *octet_string)
void s1ap_uint32_to_OCTET_STRING(uint32_t uint32, OCTET_STRING_t *octet_string)
{
octet_string->size = 4;
octet_string->buf = ogs_calloc(octet_string->size, sizeof(uint8_t));
octet_string->buf = CALLOC(octet_string->size, sizeof(uint8_t));
octet_string->buf[0] = uint32 >> 24;
octet_string->buf[1] = uint32 >> 16;
@ -52,7 +52,7 @@ void s1ap_buffer_to_OCTET_STRING(
void *buf, int size, S1AP_TBCD_STRING_t *tbcd_string)
{
tbcd_string->size = size;
tbcd_string->buf = ogs_calloc(tbcd_string->size, sizeof(uint8_t));
tbcd_string->buf = CALLOC(tbcd_string->size, sizeof(uint8_t));
memcpy(tbcd_string->buf, buf, size);
}
@ -68,7 +68,7 @@ void s1ap_uint32_to_ENB_ID(
ogs_assert(bit_string);
bit_string->size = 3;
bit_string->buf = ogs_calloc(bit_string->size, sizeof(uint8_t));
bit_string->buf = CALLOC(bit_string->size, sizeof(uint8_t));
bit_string->buf[0] = enb_id >> 12;
bit_string->buf[1] = enb_id >> 4;
@ -80,7 +80,7 @@ void s1ap_uint32_to_ENB_ID(
ogs_assert(bit_string);
bit_string->size = 4;
bit_string->buf = ogs_calloc(bit_string->size, sizeof(uint8_t));
bit_string->buf = CALLOC(bit_string->size, sizeof(uint8_t));
bit_string->buf[0] = enb_id >> 20;
bit_string->buf[1] = enb_id >> 12;
@ -152,19 +152,19 @@ int s1ap_ip_to_BIT_STRING(ip_t *ip, BIT_STRING_t *bit_string)
if (ip->ipv4 && ip->ipv6) {
bit_string->size = IPV4V6_LEN;
bit_string->buf = ogs_calloc(bit_string->size, sizeof(uint8_t));
bit_string->buf = CALLOC(bit_string->size, sizeof(uint8_t));
memcpy(bit_string->buf, &ip->both.addr, IPV4_LEN);
memcpy(bit_string->buf+IPV4_LEN, &ip->both.addr6, IPV6_LEN);
ogs_debug(" IPv4[%s] IPv6[%s]",
INET_NTOP(&ip->both.addr, buf), INET6_NTOP(&ip->both.addr6, buf2));
} else if (ip->ipv4) {
bit_string->size = IPV4_LEN;
bit_string->buf = ogs_calloc(bit_string->size, sizeof(uint8_t));
bit_string->buf = CALLOC(bit_string->size, sizeof(uint8_t));
memcpy(bit_string->buf, &ip->addr, IPV4_LEN);
ogs_debug(" IPv4[%s]", INET_NTOP(&ip->addr, buf));
} else if (ip->ipv6) {
bit_string->size = IPV6_LEN;
bit_string->buf = ogs_calloc(bit_string->size, sizeof(uint8_t));
bit_string->buf = CALLOC(bit_string->size, sizeof(uint8_t));
memcpy(bit_string->buf, &ip->addr6, IPV6_LEN);
ogs_debug(" IPv6[%s]", INET_NTOP(&ip->addr6, buf));
} else

80
tests/common/test-packet.c
View File

@ -249,7 +249,7 @@ int tests1ap_build_setup_req(
memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t));
pdu.present = S1AP_S1AP_PDU_PR_initiatingMessage;
pdu.choice.initiatingMessage =
ogs_calloc(1, sizeof(S1AP_InitiatingMessage_t));
CALLOC(1, sizeof(S1AP_InitiatingMessage_t));
initiatingMessage = pdu.choice.initiatingMessage;
initiatingMessage->procedureCode = S1AP_ProcedureCode_id_S1Setup;
@ -259,7 +259,7 @@ int tests1ap_build_setup_req(
S1SetupRequest = &initiatingMessage->value.choice.S1SetupRequest;
ie = ogs_calloc(1, sizeof(S1AP_S1SetupRequestIEs_t));
ie = CALLOC(1, sizeof(S1AP_S1SetupRequestIEs_t));
ASN_SEQUENCE_ADD(&S1SetupRequest->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_Global_ENB_ID;
@ -268,7 +268,7 @@ int tests1ap_build_setup_req(
Global_ENB_ID = &ie->value.choice.Global_ENB_ID;
ie = ogs_calloc(1, sizeof(S1AP_S1SetupRequestIEs_t));
ie = CALLOC(1, sizeof(S1AP_S1SetupRequestIEs_t));
ASN_SEQUENCE_ADD(&S1SetupRequest->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_SupportedTAs;
@ -277,7 +277,7 @@ int tests1ap_build_setup_req(
SupportedTAs = &ie->value.choice.SupportedTAs;
ie = ogs_calloc(1, sizeof(S1AP_S1SetupRequestIEs_t));
ie = CALLOC(1, sizeof(S1AP_S1SetupRequestIEs_t));
ASN_SEQUENCE_ADD(&S1SetupRequest->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_DefaultPagingDRX;
@ -293,10 +293,10 @@ int tests1ap_build_setup_req(
&plmn_id, PLMN_ID_LEN, &Global_ENB_ID->pLMNidentity);
SupportedTAs_Item = (S1AP_SupportedTAs_Item_t *)
ogs_calloc(1, sizeof(S1AP_SupportedTAs_Item_t));
CALLOC(1, sizeof(S1AP_SupportedTAs_Item_t));
s1ap_uint16_to_OCTET_STRING(tac, &SupportedTAs_Item->tAC);
PLMNidentity = (S1AP_PLMNidentity_t *)
ogs_calloc(1, sizeof(S1AP_PLMNidentity_t));
CALLOC(1, sizeof(S1AP_PLMNidentity_t));
s1ap_buffer_to_OCTET_STRING(
&plmn_id, PLMN_ID_LEN, PLMNidentity);
ASN_SEQUENCE_ADD(&SupportedTAs_Item->broadcastPLMNs.list, PLMNidentity);
@ -1115,7 +1115,7 @@ int tests1ap_build_initial_context_setup_response(
memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t));
pdu.present = S1AP_S1AP_PDU_PR_successfulOutcome;
pdu.choice.successfulOutcome =
ogs_calloc(1, sizeof(S1AP_SuccessfulOutcome_t));
CALLOC(1, sizeof(S1AP_SuccessfulOutcome_t));
successfulOutcome = pdu.choice.successfulOutcome;
successfulOutcome->procedureCode =
@ -1127,7 +1127,7 @@ int tests1ap_build_initial_context_setup_response(
InitialContextSetupResponse =
&successfulOutcome->value.choice.InitialContextSetupResponse;
ie = ogs_calloc(1, sizeof(S1AP_InitialContextSetupResponseIEs_t));
ie = CALLOC(1, sizeof(S1AP_InitialContextSetupResponseIEs_t));
ASN_SEQUENCE_ADD(&InitialContextSetupResponse->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_MME_UE_S1AP_ID;
@ -1137,7 +1137,7 @@ int tests1ap_build_initial_context_setup_response(
MME_UE_S1AP_ID = &ie->value.choice.MME_UE_S1AP_ID;
ie = ogs_calloc(1, sizeof(S1AP_InitialContextSetupResponseIEs_t));
ie = CALLOC(1, sizeof(S1AP_InitialContextSetupResponseIEs_t));
ASN_SEQUENCE_ADD(&InitialContextSetupResponse->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_eNB_UE_S1AP_ID;
@ -1147,7 +1147,7 @@ int tests1ap_build_initial_context_setup_response(
ENB_UE_S1AP_ID = &ie->value.choice.ENB_UE_S1AP_ID;
ie = ogs_calloc(1, sizeof(S1AP_InitialContextSetupResponseIEs_t));
ie = CALLOC(1, sizeof(S1AP_InitialContextSetupResponseIEs_t));
ASN_SEQUENCE_ADD(&InitialContextSetupResponse->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_E_RABSetupListCtxtSURes;
@ -1160,7 +1160,7 @@ int tests1ap_build_initial_context_setup_response(
*MME_UE_S1AP_ID = mme_ue_s1ap_id;
*ENB_UE_S1AP_ID = enb_ue_s1ap_id;
item = ogs_calloc(1, sizeof(S1AP_E_RABSetupItemCtxtSUResIEs_t));
item = CALLOC(1, sizeof(S1AP_E_RABSetupItemCtxtSUResIEs_t));
ASN_SEQUENCE_ADD(&E_RABSetupListCtxtSURes->list, item);
item->id = S1AP_ProtocolIE_ID_id_E_RABSetupItemCtxtSURes;
@ -1214,7 +1214,7 @@ int tests1ap_build_ue_context_modification_response(
memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t));
pdu.present = S1AP_S1AP_PDU_PR_successfulOutcome;
pdu.choice.successfulOutcome =
ogs_calloc(1, sizeof(S1AP_SuccessfulOutcome_t));
CALLOC(1, sizeof(S1AP_SuccessfulOutcome_t));
successfulOutcome = pdu.choice.successfulOutcome;
successfulOutcome->procedureCode =
@ -1226,7 +1226,7 @@ int tests1ap_build_ue_context_modification_response(
UEContextModificationResponse =
&successfulOutcome->value.choice.UEContextModificationResponse;
ie = ogs_calloc(1, sizeof(S1AP_UEContextModificationResponseIEs_t));
ie = CALLOC(1, sizeof(S1AP_UEContextModificationResponseIEs_t));
ASN_SEQUENCE_ADD(&UEContextModificationResponse->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_MME_UE_S1AP_ID;
@ -1236,7 +1236,7 @@ int tests1ap_build_ue_context_modification_response(
MME_UE_S1AP_ID = &ie->value.choice.MME_UE_S1AP_ID;
ie = ogs_calloc(1, sizeof(S1AP_UEContextModificationResponseIEs_t));
ie = CALLOC(1, sizeof(S1AP_UEContextModificationResponseIEs_t));
ASN_SEQUENCE_ADD(&UEContextModificationResponse->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_eNB_UE_S1AP_ID;
@ -2090,7 +2090,7 @@ int tests1ap_build_e_rab_setup_response(
memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t));
pdu.present = S1AP_S1AP_PDU_PR_successfulOutcome;
pdu.choice.successfulOutcome =
ogs_calloc(1, sizeof(S1AP_SuccessfulOutcome_t));
CALLOC(1, sizeof(S1AP_SuccessfulOutcome_t));
successfulOutcome = pdu.choice.successfulOutcome;
successfulOutcome->procedureCode = S1AP_ProcedureCode_id_E_RABSetup;
@ -2100,7 +2100,7 @@ int tests1ap_build_e_rab_setup_response(
E_RABSetupResponse = &successfulOutcome->value.choice.E_RABSetupResponse;
ie = ogs_calloc(1, sizeof(S1AP_E_RABSetupResponseIEs_t));
ie = CALLOC(1, sizeof(S1AP_E_RABSetupResponseIEs_t));
ASN_SEQUENCE_ADD(&E_RABSetupResponse->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_MME_UE_S1AP_ID;
@ -2109,7 +2109,7 @@ int tests1ap_build_e_rab_setup_response(
MME_UE_S1AP_ID = &ie->value.choice.MME_UE_S1AP_ID;
ie = ogs_calloc(1, sizeof(S1AP_E_RABSetupResponseIEs_t));
ie = CALLOC(1, sizeof(S1AP_E_RABSetupResponseIEs_t));
ASN_SEQUENCE_ADD(&E_RABSetupResponse->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_eNB_UE_S1AP_ID;
@ -2118,7 +2118,7 @@ int tests1ap_build_e_rab_setup_response(
ENB_UE_S1AP_ID = &ie->value.choice.ENB_UE_S1AP_ID;
ie = ogs_calloc(1, sizeof(S1AP_E_RABSetupResponseIEs_t));
ie = CALLOC(1, sizeof(S1AP_E_RABSetupResponseIEs_t));
ASN_SEQUENCE_ADD(&E_RABSetupResponse->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_E_RABSetupListBearerSURes;
@ -2131,7 +2131,7 @@ int tests1ap_build_e_rab_setup_response(
*MME_UE_S1AP_ID = mme_ue_s1ap_id;
*ENB_UE_S1AP_ID = enb_ue_s1ap_id;
item = ogs_calloc(1, sizeof(S1AP_E_RABSetupItemBearerSUResIEs_t));
item = CALLOC(1, sizeof(S1AP_E_RABSetupItemBearerSUResIEs_t));
ASN_SEQUENCE_ADD(&E_RABSetupListBearerSURes->list, item);
item->id = S1AP_ProtocolIE_ID_id_E_RABSetupItemBearerSURes;
@ -2458,7 +2458,7 @@ int tests1ap_build_path_switch_request(
memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t));
pdu.present = S1AP_S1AP_PDU_PR_initiatingMessage;
pdu.choice.initiatingMessage =
ogs_calloc(1, sizeof(S1AP_InitiatingMessage_t));
CALLOC(1, sizeof(S1AP_InitiatingMessage_t));
initiatingMessage = pdu.choice.initiatingMessage;
initiatingMessage->procedureCode = S1AP_ProcedureCode_id_PathSwitchRequest;
@ -2468,7 +2468,7 @@ int tests1ap_build_path_switch_request(
PathSwitchRequest = &initiatingMessage->value.choice.PathSwitchRequest;
ie = ogs_calloc(1, sizeof(S1AP_PathSwitchRequestIEs_t));
ie = CALLOC(1, sizeof(S1AP_PathSwitchRequestIEs_t));
ASN_SEQUENCE_ADD(&PathSwitchRequest->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_eNB_UE_S1AP_ID;
@ -2477,7 +2477,7 @@ int tests1ap_build_path_switch_request(
ENB_UE_S1AP_ID = &ie->value.choice.ENB_UE_S1AP_ID;
ie = ogs_calloc(1, sizeof(S1AP_PathSwitchRequestIEs_t));
ie = CALLOC(1, sizeof(S1AP_PathSwitchRequestIEs_t));
ASN_SEQUENCE_ADD(&PathSwitchRequest->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_E_RABToBeSwitchedDLList;
@ -2487,7 +2487,7 @@ int tests1ap_build_path_switch_request(
E_RABToBeSwitchedDLList = &ie->value.choice.E_RABToBeSwitchedDLList;
ie = ogs_calloc(1, sizeof(S1AP_PathSwitchRequestIEs_t));
ie = CALLOC(1, sizeof(S1AP_PathSwitchRequestIEs_t));
ASN_SEQUENCE_ADD(&PathSwitchRequest->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_SourceMME_UE_S1AP_ID;
@ -2496,7 +2496,7 @@ int tests1ap_build_path_switch_request(
MME_UE_S1AP_ID = &ie->value.choice.MME_UE_S1AP_ID;
ie = ogs_calloc(1, sizeof(S1AP_PathSwitchRequestIEs_t));
ie = CALLOC(1, sizeof(S1AP_PathSwitchRequestIEs_t));
ASN_SEQUENCE_ADD(&PathSwitchRequest->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_EUTRAN_CGI;
@ -2505,7 +2505,7 @@ int tests1ap_build_path_switch_request(
EUTRAN_CGI = &ie->value.choice.EUTRAN_CGI;
ie = ogs_calloc(1, sizeof(S1AP_PathSwitchRequestIEs_t));
ie = CALLOC(1, sizeof(S1AP_PathSwitchRequestIEs_t));
ASN_SEQUENCE_ADD(&PathSwitchRequest->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_TAI;
@ -2514,7 +2514,7 @@ int tests1ap_build_path_switch_request(
TAI = &ie->value.choice.TAI;
ie = ogs_calloc(1, sizeof(S1AP_PathSwitchRequestIEs_t));
ie = CALLOC(1, sizeof(S1AP_PathSwitchRequestIEs_t));
ASN_SEQUENCE_ADD(&PathSwitchRequest->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_UESecurityCapabilities;
@ -2541,7 +2541,7 @@ int tests1ap_build_path_switch_request(
ip_t ip;
int len;
item = ogs_calloc(1, sizeof(S1AP_E_RABToBeSwitchedDLItemIEs_t));
item = CALLOC(1, sizeof(S1AP_E_RABToBeSwitchedDLItemIEs_t));
ASN_SEQUENCE_ADD(&E_RABToBeSwitchedDLList->list, item);
item->id = S1AP_ProtocolIE_ID_id_E_RABToBeSwitchedDLItem;
@ -2576,7 +2576,7 @@ int tests1ap_build_path_switch_request(
s1ap_buffer_to_OCTET_STRING(
&mme_ue->e_cgi.plmn_id, PLMN_ID_LEN, &EUTRAN_CGI->pLMNidentity);
EUTRAN_CGI->cell_ID.size = 4;
EUTRAN_CGI->cell_ID.buf = ogs_calloc(
EUTRAN_CGI->cell_ID.buf = CALLOC(
EUTRAN_CGI->cell_ID.size, sizeof(uint8_t));
ogs_assert(EUTRAN_CGI->cell_ID.buf);
EUTRAN_CGI->cell_ID.buf[0] = (mme_ue->e_cgi.cell_id >> 24);
@ -2592,7 +2592,7 @@ int tests1ap_build_path_switch_request(
UESecurityCapabilities->encryptionAlgorithms.size = 2;
UESecurityCapabilities->encryptionAlgorithms.buf =
ogs_calloc(UESecurityCapabilities->encryptionAlgorithms.size,
CALLOC(UESecurityCapabilities->encryptionAlgorithms.size,
sizeof(uint8_t));
UESecurityCapabilities->encryptionAlgorithms.bits_unused = 0;
UESecurityCapabilities->encryptionAlgorithms.buf[0] =
@ -2600,7 +2600,7 @@ int tests1ap_build_path_switch_request(
UESecurityCapabilities->integrityProtectionAlgorithms.size = 2;
UESecurityCapabilities->integrityProtectionAlgorithms.buf =
ogs_calloc(UESecurityCapabilities->
CALLOC(UESecurityCapabilities->
integrityProtectionAlgorithms.size, sizeof(uint8_t));
UESecurityCapabilities->integrityProtectionAlgorithms.bits_unused = 0;
UESecurityCapabilities->integrityProtectionAlgorithms.buf[0] =
@ -2740,7 +2740,7 @@ int tests1ap_build_handover_request_ack(
memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t));
pdu.present = S1AP_S1AP_PDU_PR_successfulOutcome;
pdu.choice.successfulOutcome =
ogs_calloc(1, sizeof(S1AP_SuccessfulOutcome_t));
CALLOC(1, sizeof(S1AP_SuccessfulOutcome_t));
successfulOutcome = pdu.choice.successfulOutcome;
successfulOutcome->procedureCode = S1AP_ProcedureCode_id_HandoverResourceAllocation;
@ -2751,7 +2751,7 @@ int tests1ap_build_handover_request_ack(
HandoverRequestAcknowledge =
&successfulOutcome->value.choice.HandoverRequestAcknowledge;
ie = ogs_calloc(1, sizeof(S1AP_HandoverRequestAcknowledgeIEs_t));
ie = CALLOC(1, sizeof(S1AP_HandoverRequestAcknowledgeIEs_t));
ASN_SEQUENCE_ADD(&HandoverRequestAcknowledge->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_MME_UE_S1AP_ID;
@ -2761,7 +2761,7 @@ int tests1ap_build_handover_request_ack(
MME_UE_S1AP_ID = &ie->value.choice.MME_UE_S1AP_ID;
ie = ogs_calloc(1, sizeof(S1AP_HandoverRequestAcknowledgeIEs_t));
ie = CALLOC(1, sizeof(S1AP_HandoverRequestAcknowledgeIEs_t));
ASN_SEQUENCE_ADD(&HandoverRequestAcknowledge->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_eNB_UE_S1AP_ID;
@ -2771,7 +2771,7 @@ int tests1ap_build_handover_request_ack(
ENB_UE_S1AP_ID = &ie->value.choice.ENB_UE_S1AP_ID;
ie = ogs_calloc(1, sizeof(S1AP_HandoverRequestAcknowledgeIEs_t));
ie = CALLOC(1, sizeof(S1AP_HandoverRequestAcknowledgeIEs_t));
ASN_SEQUENCE_ADD(&HandoverRequestAcknowledge->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_E_RABAdmittedList;
@ -2781,7 +2781,7 @@ int tests1ap_build_handover_request_ack(
E_RABAdmittedList = &ie->value.choice.E_RABAdmittedList;
ie = ogs_calloc(1, sizeof(S1AP_HandoverRequestAcknowledgeIEs_t));
ie = CALLOC(1, sizeof(S1AP_HandoverRequestAcknowledgeIEs_t));
ASN_SEQUENCE_ADD(&HandoverRequestAcknowledge->protocolIEs, ie);
ie->id = S1AP_ProtocolIE_ID_id_Target_ToSource_TransparentContainer;
@ -2803,7 +2803,7 @@ int tests1ap_build_handover_request_ack(
ip_t ip;
int len;
item = ogs_calloc(1, sizeof(S1AP_E_RABAdmittedItemIEs_t));
item = CALLOC(1, sizeof(S1AP_E_RABAdmittedItemIEs_t));
ASN_SEQUENCE_ADD(&E_RABAdmittedList->list, item);
item->id = S1AP_ProtocolIE_ID_id_E_RABAdmittedItem;
@ -2836,20 +2836,20 @@ int tests1ap_build_handover_request_ack(
e_rab->dL_transportLayerAddress =
(S1AP_TransportLayerAddress_t *)
ogs_calloc(1, sizeof(S1AP_TransportLayerAddress_t));
CALLOC(1, sizeof(S1AP_TransportLayerAddress_t));
rv = s1ap_ip_to_BIT_STRING(&ip, e_rab->dL_transportLayerAddress);
ogs_assert(rv == OGS_OK);
e_rab->dL_gTP_TEID = (S1AP_GTP_TEID_t *)
ogs_calloc(1, sizeof(S1AP_GTP_TEID_t));
CALLOC(1, sizeof(S1AP_GTP_TEID_t));
s1ap_uint32_to_OCTET_STRING(teid+i+10, e_rab->dL_gTP_TEID);
e_rab->uL_TransportLayerAddress =
(S1AP_TransportLayerAddress_t *)
ogs_calloc(1, sizeof(S1AP_TransportLayerAddress_t));
CALLOC(1, sizeof(S1AP_TransportLayerAddress_t));
rv = s1ap_ip_to_BIT_STRING(&ip, e_rab->uL_TransportLayerAddress);
ogs_assert(rv == OGS_OK);
e_rab->uL_GTP_TEID = (S1AP_GTP_TEID_t *)
ogs_calloc(1, sizeof(S1AP_GTP_TEID_t));
CALLOC(1, sizeof(S1AP_GTP_TEID_t));
s1ap_uint32_to_OCTET_STRING(teid+i+20, e_rab->uL_GTP_TEID);
}

20
tests/complex/attach-test.c
View File

@ -1494,11 +1494,11 @@ static void attach_test5(abts_case *tc, void *data)
S1AP_UE_associatedLogicalS1_ConnectionItemRes_t *ie = NULL;
S1AP_UE_associatedLogicalS1_ConnectionItem_t *item = NULL;
partOfS1_Interface = ogs_calloc(1,
partOfS1_Interface = CALLOC(1,
sizeof(S1AP_UE_associatedLogicalS1_ConnectionListRes_t));
ogs_assert(partOfS1_Interface);
ie = ogs_calloc(1,
ie = CALLOC(1,
sizeof(S1AP_UE_associatedLogicalS1_ConnectionItemRes_t));
ASN_SEQUENCE_ADD(&partOfS1_Interface->list, ie);
@ -1508,14 +1508,14 @@ static void attach_test5(abts_case *tc, void *data)
item = &ie->value.choice.UE_associatedLogicalS1_ConnectionItem;
item->mME_UE_S1AP_ID = ogs_calloc(1, sizeof(S1AP_MME_UE_S1AP_ID_t));
item->mME_UE_S1AP_ID = CALLOC(1, sizeof(S1AP_MME_UE_S1AP_ID_t));
ogs_assert(item->mME_UE_S1AP_ID);
*item->mME_UE_S1AP_ID = 100;
item->eNB_UE_S1AP_ID = ogs_calloc(1, sizeof(S1AP_ENB_UE_S1AP_ID_t));
item->eNB_UE_S1AP_ID = CALLOC(1, sizeof(S1AP_ENB_UE_S1AP_ID_t));
ogs_assert(item->eNB_UE_S1AP_ID);
*item->eNB_UE_S1AP_ID = 4;
ie = ogs_calloc(1,
ie = CALLOC(1,
sizeof(S1AP_UE_associatedLogicalS1_ConnectionItemRes_t));
ASN_SEQUENCE_ADD(&partOfS1_Interface->list, ie);
@ -1525,14 +1525,14 @@ static void attach_test5(abts_case *tc, void *data)
item = &ie->value.choice.UE_associatedLogicalS1_ConnectionItem;
item->mME_UE_S1AP_ID = ogs_calloc(1, sizeof(S1AP_MME_UE_S1AP_ID_t));
item->mME_UE_S1AP_ID = CALLOC(1, sizeof(S1AP_MME_UE_S1AP_ID_t));
ogs_assert(item->mME_UE_S1AP_ID);
*item->mME_UE_S1AP_ID = 2;
item->eNB_UE_S1AP_ID = ogs_calloc(1, sizeof(S1AP_ENB_UE_S1AP_ID_t));
item->eNB_UE_S1AP_ID = CALLOC(1, sizeof(S1AP_ENB_UE_S1AP_ID_t));
ogs_assert(item->eNB_UE_S1AP_ID);
*item->eNB_UE_S1AP_ID = 3;
ie = ogs_calloc(1,
ie = CALLOC(1,
sizeof(S1AP_UE_associatedLogicalS1_ConnectionItemRes_t));
ASN_SEQUENCE_ADD(&partOfS1_Interface->list, ie);
@ -1542,7 +1542,7 @@ static void attach_test5(abts_case *tc, void *data)
item = &ie->value.choice.UE_associatedLogicalS1_ConnectionItem;
item->mME_UE_S1AP_ID = ogs_calloc(1, sizeof(S1AP_MME_UE_S1AP_ID_t));
item->mME_UE_S1AP_ID = CALLOC(1, sizeof(S1AP_MME_UE_S1AP_ID_t));
ogs_assert(item->mME_UE_S1AP_ID);
*item->mME_UE_S1AP_ID = 44;
@ -1555,7 +1555,7 @@ static void attach_test5(abts_case *tc, void *data)
{
S1AP_MME_UE_S1AP_ID_t *mme_ue_s1ap_id = NULL;
mme_ue_s1ap_id = ogs_calloc(1, sizeof(S1AP_MME_UE_S1AP_ID_t));
mme_ue_s1ap_id = CALLOC(1, sizeof(S1AP_MME_UE_S1AP_ID_t));
ogs_assert(mme_ue_s1ap_id);
*mme_ue_s1ap_id = 2;
rv = s1ap_build_s1_reset_partial(&sendbuf,