acouzens
/
open5gs
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

update it

This commit is contained in:
Sukchan Lee 2017-02-07 13:52:34 +09:00
parent e35c45934e
commit f0e2dbafb7
2 changed files with 54 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/asn/src/s1ap_decoder.c
View File

@ -17,6 +17,8 @@ static void s1ap_xer_print_message(
int s1ap_decode_pdu(s1ap_message *message, pkbuf_t *pkb)
{
int ret = -1;
S1AP_PDU_t pdu = {0};
S1AP_PDU_t *pdu_p = &pdu;
asn_dec_rval_t dec_ret = {0};
@ -39,16 +41,19 @@ int s1ap_decode_pdu(s1ap_message *message, pkbuf_t *pkb)
switch (pdu_p->present)
{
case S1AP_PDU_PR_initiatingMessage:
return s1ap_decode_initiating(message,
ret = s1ap_decode_initiating(message,
&pdu_p->choice.initiatingMessage);
break;
case S1AP_PDU_PR_successfulOutcome:
return s1ap_decode_successfull_outcome(message,
ret = s1ap_decode_successfull_outcome(message,
&pdu_p->choice.successfulOutcome);
break;
case S1AP_PDU_PR_unsuccessfulOutcome:
return s1ap_decode_unsuccessfull_outcome(message,
ret = s1ap_decode_unsuccessfull_outcome(message,
&pdu_p->choice.unsuccessfulOutcome);
break;
default:
d_error("Unknown message outcome (%d) or not implemented",
@ -56,7 +61,9 @@ int s1ap_decode_pdu(s1ap_message *message, pkbuf_t *pkb)
break;
}
return -1;
ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_S1AP_PDU, &pdu);
return ret;
}

63
test/s1ap_test.c
View File

@ -16,16 +16,35 @@ static void s1ap_test1(abts_case *tc, void *data)
};
s1ap_message message;
pkbuf_t *pkb;
#if 0
S1ap_S1SetupRequestIEs_t *s1SetupRequestIEs =
&message.msg.s1ap_S1SetupRequestIEs;
#endif
pkbuf_t *pkbuf;
int result;
pkb = pkbuf_alloc(0, S1AP_SDU_SIZE);
ABTS_PTR_NOTNULL(tc, pkb);
pkb->len = 49;
memcpy(pkb->payload, payload[0], pkb->len);
pkbuf = pkbuf_alloc(0, S1AP_SDU_SIZE);
ABTS_PTR_NOTNULL(tc, pkbuf);
pkbuf->len = 49;
memcpy(pkbuf->payload, payload[0], pkbuf->len);
result = s1ap_decode_pdu(&message, pkb);
result = s1ap_decode_pdu(&message, pkbuf);
ABTS_INT_EQUAL(tc, 0, result);
#if 0
ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_S1ap_Global_ENB_ID,
&s1SetupRequestIEs->global_ENB_ID);
ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_S1ap_ENBname,
&s1SetupRequestIEs->eNBname);
ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_S1ap_SupportedTAs,
&s1SetupRequestIEs->supportedTAs);
ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_S1ap_PagingDRX,
&s1SetupRequestIEs->defaultPagingDRX);
ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_S1ap_CSG_IdList,
&s1SetupRequestIEs->csG_IdList);
#endif
pkbuf_free(pkbuf);
}
static void s1ap_test2(abts_case *tc, void *data)
@ -36,16 +55,18 @@ static void s1ap_test2(abts_case *tc, void *data)
};
s1ap_message message;
pkbuf_t *pkb;
pkbuf_t *pkbuf;
int result;
pkb = pkbuf_alloc(0, S1AP_SDU_SIZE);
ABTS_PTR_NOTNULL(tc, pkb);
pkb->len = 115;
memcpy(pkb->payload, payload[0], pkb->len);
pkbuf = pkbuf_alloc(0, S1AP_SDU_SIZE);
ABTS_PTR_NOTNULL(tc, pkbuf);
pkbuf->len = 115;
memcpy(pkbuf->payload, payload[0], pkbuf->len);
result = s1ap_decode_pdu(&message, pkb);
result = s1ap_decode_pdu(&message, pkbuf);
ABTS_INT_EQUAL(tc, 0, result);
pkbuf_free(pkbuf);
}
static void s1ap_test3(abts_case *tc, void *data)
@ -56,16 +77,18 @@ static void s1ap_test3(abts_case *tc, void *data)
};
s1ap_message message;
pkbuf_t *pkb;
pkbuf_t *pkbuf;
int result;
pkb = pkbuf_alloc(0, S1AP_SDU_SIZE);
ABTS_PTR_NOTNULL(tc, pkb);
pkb->len = 41;
memcpy(pkb->payload, payload[0], pkb->len);
pkbuf = pkbuf_alloc(0, S1AP_SDU_SIZE);
ABTS_PTR_NOTNULL(tc, pkbuf);
pkbuf->len = 41;
memcpy(pkbuf->payload, payload[0], pkbuf->len);
result = s1ap_decode_pdu(&message, pkb);
result = s1ap_decode_pdu(&message, pkbuf);
ABTS_INT_EQUAL(tc, 0, result);
pkbuf_free(pkbuf);
}
static void s1ap_test4(abts_case *tc, void *data)
@ -76,11 +99,11 @@ static void s1ap_test4(abts_case *tc, void *data)
rv = s1ap_build_setup_rsp(&pkbuf);
ABTS_INT_EQUAL(tc, CORE_OK, rv);
#if 0
ABTS_PTR_NOTNULL(tc, pkbuf);
ABTS_PTR_NOTNULL(tc, pkbuf->payload);
ABTS_INT_EQUAL(tc, 216, pkbuf->len);
#endif
pkbuf_free(pkbuf);
}
static void s1ap_test5(abts_case *tc, void *data)