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-03-25 11:16:18 +09:00
parent 18e78913b6
commit 810da83b3b
3 changed files with 52 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/gtp/gtp_types.c
View File

@ -28,14 +28,16 @@
#include "core_debug.h"
#include "gtp_types.h"
c_uint16_t gtp_decode_uli(gtp_uli_t *uli, tlv_octet_t *octet)
c_int16_t gtp_decode_uli(gtp_uli_t *uli, tlv_octet_t *octet)
{
gtp_uli_t *source = (gtp_uli_t *)octet->data;
int size = 0;
c_int16_t size = 0;
d_assert(uli, return -1, "Null param");
d_assert(octet, return -1, "Null param");
memset(uli, 0, sizeof(gtp_uli_t));
uli->flags = source->flags;
size++;
@ -95,21 +97,29 @@ c_uint16_t gtp_decode_uli(gtp_uli_t *uli, tlv_octet_t *octet)
return size;
}
c_uint16_t gtp_encode_uli(tlv_octet_t *octet, gtp_uli_t *uli)
c_int16_t gtp_encode_uli(
tlv_octet_t *octet, gtp_uli_t *uli, void *data, int data_len)
{
gtp_uli_t target;
int size = 0;
c_int16_t size = 0;
d_assert(uli, return -1, "Null param");
d_assert(octet, return -1, "Null param");
d_assert(data, return -1, "Null param");
d_assert(data_len, return -1, "Null param");
octet->data = data;
memcpy(&target, uli, sizeof(gtp_uli_t));
d_assert(size + sizeof(target.flags) <= data_len,
return -1, "encode error");
memcpy(&octet->data[size], &target.flags, sizeof(target.flags));
size += sizeof(target.flags);
if (target.flags.cgi)
{
d_assert(size + sizeof(target.cgi) <= data_len,
return -1, "encode error");
target.cgi.lac = htons(target.cgi.lac);
target.cgi.ci = htons(target.cgi.ci);
memcpy(&octet->data[size], &target.cgi, sizeof(target.cgi));
@ -117,6 +127,8 @@ c_uint16_t gtp_encode_uli(tlv_octet_t *octet, gtp_uli_t *uli)
}
if (target.flags.sai)
{
d_assert(size + sizeof(target.sai) <= data_len,
return -1, "encode error");
target.sai.lac = htons(target.sai.lac);
target.sai.sac = htons(target.sai.sac);
memcpy(&octet->data[size], &target.sai, sizeof(target.sai));
@ -124,6 +136,8 @@ c_uint16_t gtp_encode_uli(tlv_octet_t *octet, gtp_uli_t *uli)
}
if (target.flags.rai)
{
d_assert(size + sizeof(target.rai) <= data_len,
return -1, "encode error");
target.rai.lac = htons(target.rai.lac);
target.rai.rac = htons(target.rai.rac);
memcpy(&octet->data[size], &target.rai, sizeof(target.rai));
@ -131,18 +145,24 @@ c_uint16_t gtp_encode_uli(tlv_octet_t *octet, gtp_uli_t *uli)
}
if (target.flags.tai)
{
d_assert(size + sizeof(target.tai) <= data_len,
return -1, "encode error");
target.tai.tac = htons(target.tai.tac);
memcpy(&octet->data[size], &target.tai, sizeof(target.tai));
size += sizeof(target.tai);
}
if (target.flags.ecgi)
{
d_assert(size + sizeof(target.ecgi) <= data_len,
return -1, "encode error");
target.ecgi.eci = htonl(target.ecgi.eci);
memcpy(&octet->data[size], &target.ecgi, sizeof(target.ecgi));
size += sizeof(target.ecgi);
}
if (target.flags.lai)
{
d_assert(size + sizeof(target.lai) <= data_len,
return -1, "encode error");
target.lai.lac = htons(target.lai.lac);
memcpy(&octet->data[size], &target.lai, sizeof(target.lai));
size += sizeof(target.lai);

5
lib/gtp/gtp_types.h
View File

@ -60,8 +60,9 @@ typedef struct _gtp_uli_t {
gtp_uli_lai_t lai;
} gtp_uli_t;
c_uint16_t gtp_decode_uli(gtp_uli_t *uli, tlv_octet_t *octet);
c_uint16_t gtp_encode_uli(tlv_octet_t *octet, gtp_uli_t *uli);
CORE_DECLARE(c_int16_t) gtp_decode_uli(gtp_uli_t *uli, tlv_octet_t *octet);
CORE_DECLARE(c_int16_t) gtp_encode_uli(
tlv_octet_t *octet, gtp_uli_t *uli, void *data, int data_len);
#ifdef __cplusplus
}

47
test/gtp_message_test.c
View File

@ -22,11 +22,14 @@ static void gtp_message_test1(abts_case *tc, void *data)
"005d001f00490001 0005500016004505 0000000000000000 0000000000000000"
"0000000072000200 40005f0002005400";
char *_value = NULL;
gtp_create_session_request_t req;
c_uint8_t tmp[256];
pkbuf_t *pkbuf = NULL;
char hexbuf[MAX_SDU_LEN];
gtp_create_session_request_t req;
gtp_uli_t uli;
c_int16_t size = 0;
pkbuf_t *pkbuf = NULL;
pkbuf = pkbuf_alloc(0, 240);
ABTS_PTR_NOTNULL(tc, pkbuf);
memcpy(pkbuf->payload,
@ -42,22 +45,33 @@ static void gtp_message_test1(abts_case *tc, void *data)
ABTS_INT_EQUAL(tc, 1, req.imsi.presence);
ABTS_INT_EQUAL(tc, 8, req.imsi.len);
_value = "55153011 340010f4";
ABTS_TRUE(tc, memcmp(CORE_HEX(_value, strlen(_value), tmp),
ABTS_TRUE(tc, memcmp(CORE_HEX(_value, strlen(_value), hexbuf),
req.imsi.data, req.imsi.len) == 0);
ABTS_INT_EQUAL(tc, 1, req.msisdn.presence);
ABTS_INT_EQUAL(tc, 6, req.msisdn.len);
_value = "94715276 0041";
ABTS_TRUE(tc, memcmp(CORE_HEX(_value, strlen(_value), tmp),
ABTS_TRUE(tc, memcmp(CORE_HEX(_value, strlen(_value), hexbuf),
req.msisdn.data, req.msisdn.len) == 0);
ABTS_INT_EQUAL(tc, 1, req.me_identity.presence);
ABTS_INT_EQUAL(tc, 8, req.me_identity.len);
_value = "53612000 91788400";
ABTS_TRUE(tc, memcmp(CORE_HEX(_value, strlen(_value), tmp),
ABTS_TRUE(tc, memcmp(CORE_HEX(_value, strlen(_value), hexbuf),
req.me_identity.data, req.me_identity.len) == 0);
ABTS_INT_EQUAL(tc, 1, req.user_location_information.presence);
size = gtp_decode_uli(&uli, &req.user_location_information);
ABTS_INT_EQUAL(tc, 13, size);
ABTS_INT_EQUAL(tc, 0, uli.flags.lai);
ABTS_INT_EQUAL(tc, 1, uli.flags.ecgi);
ABTS_INT_EQUAL(tc, 105729, uli.ecgi.eci);
ABTS_INT_EQUAL(tc, 1, uli.flags.tai);
ABTS_INT_EQUAL(tc, 4130, uli.tai.tac);
ABTS_INT_EQUAL(tc, 0, uli.flags.rai);
ABTS_INT_EQUAL(tc, 0, uli.flags.sai);
ABTS_INT_EQUAL(tc, 0, uli.flags.cgi);
ABTS_INT_EQUAL(tc, 1, req.serving_network.presence);
ABTS_INT_EQUAL(tc, 1, req.rat_type.presence);
ABTS_INT_EQUAL(tc, 0, req.indication_flags.presence);
@ -91,7 +105,7 @@ static void gtp_message_test1(abts_case *tc, void *data)
ABTS_INT_EQUAL(tc, 22,
req.bearer_contexts_to_be_created.bearer_level_qos.len);
_value = "45050000 00000000 00000000 00000000 00000000 0000";
ABTS_TRUE(tc, memcmp(CORE_HEX(_value, strlen(_value), tmp),
ABTS_TRUE(tc, memcmp(CORE_HEX(_value, strlen(_value), hexbuf),
req.bearer_contexts_to_be_created.bearer_level_qos.data,
req.bearer_contexts_to_be_created.bearer_level_qos.len)
== 0);
@ -125,8 +139,8 @@ static void gtp_message_test2(abts_case *tc, void *data)
pkbuf_t *pkbuf = NULL;
gtp_create_session_request_t req;
gtp_uli_t uli;
c_uint8_t buffer[20];
c_uint16_t size = 0;
char ulibuf[sizeof(uli)];
c_int16_t size = 0;
memset(&req, 0, sizeof(gtp_create_session_request_t));
@ -150,20 +164,9 @@ static void gtp_message_test2(abts_case *tc, void *data)
uli.tai.tac = 4130;
plmn_id_build(&uli.ecgi.plmn_id, 555, 10, 2);
uli.ecgi.eci = 105729;
req.user_location_information.data = buffer;
size = gtp_encode_uli(&req.user_location_information, &uli);
size = gtp_encode_uli(&req.user_location_information, &uli,
ulibuf, sizeof(ulibuf));
ABTS_INT_EQUAL(tc, 13, req.user_location_information.len);
memset(&uli, 0, sizeof(gtp_uli_t));
size = gtp_decode_uli(&uli, &req.user_location_information);
ABTS_INT_EQUAL(tc, 13, size);
ABTS_INT_EQUAL(tc, 0, uli.flags.lai);
ABTS_INT_EQUAL(tc, 1, uli.flags.ecgi);
ABTS_INT_EQUAL(tc, 105729, uli.ecgi.eci);
ABTS_INT_EQUAL(tc, 1, uli.flags.tai);
ABTS_INT_EQUAL(tc, 4130, uli.tai.tac);
ABTS_INT_EQUAL(tc, 0, uli.flags.rai);
ABTS_INT_EQUAL(tc, 0, uli.flags.sai);
ABTS_INT_EQUAL(tc, 0, uli.flags.cgi);
rv = tlv_build_msg(&pkbuf, &tlv_desc_create_session_request, &req,
TLV_MODE_T1_L2_I1);