mirror of
https://github.com/open5gs/open5gs.git
synced 2026-04-28 03:19:31 +00:00
Rename GTPv2C specifics to gtp2 prefix (#1485)
In the past only GTPv2C was supported, and had the "gtp" generic prefix. Later on, GTPv1C support was added, and "gtp1" prefix was used. Let's move GTPv2C specific bits to have "gtp2" prefix too, and leave "gtp" prefix for generic stuff among different GTP versions.
This commit is contained in:
Pau Espin Pedrol
GitHub
parent
8c22d8a20c
commit
e3da7c9934
94 changed files with 4319 additions and 4321 deletions
|
|
@ -24,7 +24,7 @@ static void gtp_message_test1(abts_case *tc, void *data)
|
|||
{
|
||||
int rv;
|
||||
/* Create Session Request */
|
||||
const char *_payload =
|
||||
const char *_payload =
|
||||
"0100080055153011 340010f44c000600 9471527600414b00 0800536120009178"
|
||||
"840056000d001855 f501102255f50100 019d015300030055 f501520001000657"
|
||||
"0009008a80000084 0a32360a57000901 87000000000a3236 254700220005766f"
|
||||
|
|
@ -36,25 +36,25 @@ static void gtp_message_test1(abts_case *tc, void *data)
|
|||
char *_value = NULL;
|
||||
char hexbuf[OGS_MAX_SDU_LEN];
|
||||
|
||||
ogs_gtp_create_session_request_t req;
|
||||
ogs_gtp_uli_t uli;
|
||||
char ulibuf[OGS_GTP_MAX_ULI_LEN];
|
||||
ogs_gtp2_create_session_request_t req;
|
||||
ogs_gtp2_uli_t uli;
|
||||
char ulibuf[OGS_GTP2_MAX_ULI_LEN];
|
||||
ogs_plmn_id_t serving_network;
|
||||
char apnbuf[34];
|
||||
ogs_gtp_f_teid_t s11, s5;
|
||||
ogs_gtp2_f_teid_t s11, s5;
|
||||
ogs_paa_t paa;
|
||||
ogs_gtp_ambr_t ambr;
|
||||
ogs_gtp2_ambr_t ambr;
|
||||
ogs_pco_t pco;
|
||||
unsigned char pcobuf[OGS_MAX_PCO_LEN];
|
||||
ogs_gtp_bearer_qos_t bearer_qos;
|
||||
char bearer_qos_buf[GTP_BEARER_QOS_LEN];
|
||||
ogs_gtp_ue_timezone_t ue_timezone;
|
||||
ogs_gtp2_bearer_qos_t bearer_qos;
|
||||
char bearer_qos_buf[GTP2_BEARER_QOS_LEN];
|
||||
ogs_gtp2_ue_timezone_t ue_timezone;
|
||||
int size = 0;
|
||||
|
||||
ogs_pkbuf_t *pkbuf = NULL;
|
||||
ogs_sockaddr_t sa;
|
||||
|
||||
memset(&req, 0, sizeof(ogs_gtp_create_session_request_t));
|
||||
memset(&req, 0, sizeof(ogs_gtp2_create_session_request_t));
|
||||
|
||||
req.imsi.presence = 1;
|
||||
req.imsi.data = (uint8_t *)"\x55\x15\x30\x11\x34\x00\x10\xf4";
|
||||
|
|
@ -68,7 +68,7 @@ static void gtp_message_test1(abts_case *tc, void *data)
|
|||
req.me_identity.data = (uint8_t *)"\x53\x61\x20\x00\x91\x78\x84\x00";
|
||||
req.me_identity.len = 8;
|
||||
|
||||
memset(&uli, 0, sizeof(ogs_gtp_uli_t));
|
||||
memset(&uli, 0, sizeof(ogs_gtp2_uli_t));
|
||||
uli.flags.e_cgi = 1;
|
||||
uli.flags.tai = 1;
|
||||
ogs_plmn_id_build(&uli.tai.nas_plmn_id, 555, 10, 2);
|
||||
|
|
@ -76,8 +76,8 @@ static void gtp_message_test1(abts_case *tc, void *data)
|
|||
ogs_plmn_id_build(&uli.e_cgi.nas_plmn_id, 555, 10, 2);
|
||||
uli.e_cgi.cell_id = 105729;
|
||||
req.user_location_information.presence = 1;
|
||||
size = ogs_gtp_build_uli(&req.user_location_information, &uli,
|
||||
ulibuf, OGS_GTP_MAX_ULI_LEN);
|
||||
size = ogs_gtp2_build_uli(&req.user_location_information, &uli,
|
||||
ulibuf, OGS_GTP2_MAX_ULI_LEN);
|
||||
ABTS_INT_EQUAL(tc, 13, req.user_location_information.len);
|
||||
|
||||
req.serving_network.presence = 1;
|
||||
|
|
@ -85,27 +85,27 @@ static void gtp_message_test1(abts_case *tc, void *data)
|
|||
req.serving_network.len = sizeof(serving_network);
|
||||
|
||||
req.rat_type.presence = 1;
|
||||
req.rat_type.u8 = OGS_GTP_RAT_TYPE_EUTRAN;
|
||||
req.rat_type.u8 = OGS_GTP2_RAT_TYPE_EUTRAN;
|
||||
|
||||
memset(&s11, 0, sizeof(ogs_gtp_f_teid_t));
|
||||
memset(&s11, 0, sizeof(ogs_gtp2_f_teid_t));
|
||||
s11.ipv4 = 1;
|
||||
s11.interface_type = OGS_GTP_F_TEID_S11_MME_GTP_C;
|
||||
s11.interface_type = OGS_GTP2_F_TEID_S11_MME_GTP_C;
|
||||
s11.teid = htonl(0x80000084);
|
||||
ogs_inet_pton(AF_INET, "10.50.54.10", &sa);
|
||||
s11.addr = sa.sin.sin_addr.s_addr;
|
||||
req.sender_f_teid_for_control_plane.presence = 1;
|
||||
req.sender_f_teid_for_control_plane.data = &s11;
|
||||
req.sender_f_teid_for_control_plane.len = OGS_GTP_F_TEID_IPV4_LEN;
|
||||
req.sender_f_teid_for_control_plane.len = OGS_GTP2_F_TEID_IPV4_LEN;
|
||||
|
||||
memset(&s5, 0, sizeof(ogs_gtp_f_teid_t));
|
||||
memset(&s5, 0, sizeof(ogs_gtp2_f_teid_t));
|
||||
s5.ipv4 = 1;
|
||||
s5.interface_type = OGS_GTP_F_TEID_S5_S8_PGW_GTP_C;
|
||||
s5.interface_type = OGS_GTP2_F_TEID_S5_S8_PGW_GTP_C;
|
||||
ogs_inet_pton(AF_INET, "10.50.54.37", &sa);
|
||||
s5.addr = sa.sin.sin_addr.s_addr;
|
||||
req.pgw_s5_s8_address_for_control_plane_or_pmip.presence = 1;
|
||||
req.pgw_s5_s8_address_for_control_plane_or_pmip.data = &s5;
|
||||
req.pgw_s5_s8_address_for_control_plane_or_pmip.len =
|
||||
OGS_GTP_F_TEID_IPV4_LEN;
|
||||
OGS_GTP2_F_TEID_IPV4_LEN;
|
||||
|
||||
_value = (char*)"05766f6c7465036e 6732046d6e657406 6d6e63303130066d 6363353535046770 7273";
|
||||
req.access_point_name.presence = 1;
|
||||
|
|
@ -113,8 +113,8 @@ static void gtp_message_test1(abts_case *tc, void *data)
|
|||
req.access_point_name.len = sizeof(apnbuf);
|
||||
|
||||
req.selection_mode.presence = 1;
|
||||
req.selection_mode.u8 =
|
||||
OGS_GTP_SELECTION_MODE_MS_OR_NETWORK_PROVIDED_APN | 0xfc;
|
||||
req.selection_mode.u8 =
|
||||
OGS_GTP2_SELECTION_MODE_MS_OR_NETWORK_PROVIDED_APN | 0xfc;
|
||||
|
||||
req.pdn_type.presence = 1;
|
||||
req.pdn_type.u8 = OGS_PDU_SESSION_TYPE_IPV4;
|
||||
|
|
@ -126,9 +126,9 @@ static void gtp_message_test1(abts_case *tc, void *data)
|
|||
req.pdn_address_allocation.len = OGS_PAA_IPV4_LEN;
|
||||
|
||||
req.maximum_apn_restriction.presence = 1;
|
||||
req.maximum_apn_restriction.u8 = OGS_GTP_APN_NO_RESTRICTION;
|
||||
req.maximum_apn_restriction.u8 = OGS_GTP2_APN_NO_RESTRICTION;
|
||||
|
||||
memset(&ambr, 0, sizeof(ogs_gtp_ambr_t));
|
||||
memset(&ambr, 0, sizeof(ogs_gtp2_ambr_t));
|
||||
ambr.uplink = htonl(1000);
|
||||
ambr.downlink = htonl(2000);
|
||||
req.aggregate_maximum_bit_rate.presence = 1;
|
||||
|
|
@ -137,7 +137,7 @@ static void gtp_message_test1(abts_case *tc, void *data)
|
|||
|
||||
memset(&pco, 0, sizeof(ogs_pco_t));
|
||||
pco.ext = 1;
|
||||
pco.configuration_protocol =
|
||||
pco.configuration_protocol =
|
||||
OGS_PCO_PPP_FOR_USE_WITH_IP_PDP_TYPE_OR_IP_PDN_TYPE;
|
||||
pco.num_of_id = 3;
|
||||
pco.ids[0].id = OGS_PCO_ID_INTERNET_PROTOCOL_CONTROL_PROTOCOL;
|
||||
|
|
@ -150,7 +150,7 @@ static void gtp_message_test1(abts_case *tc, void *data)
|
|||
|
||||
req.protocol_configuration_options.presence = 1;
|
||||
req.protocol_configuration_options.data = &pcobuf;
|
||||
req.protocol_configuration_options.len =
|
||||
req.protocol_configuration_options.len =
|
||||
ogs_pco_build(pcobuf, OGS_MAX_PCO_LEN, &pco);
|
||||
|
||||
req.bearer_contexts_to_be_created.presence = 1;
|
||||
|
|
@ -163,14 +163,14 @@ static void gtp_message_test1(abts_case *tc, void *data)
|
|||
bearer_qos.pre_emption_capability = 1;
|
||||
bearer_qos.qci = 5;
|
||||
req.bearer_contexts_to_be_created.bearer_level_qos.presence = 1;
|
||||
size = ogs_gtp_build_bearer_qos(
|
||||
size = ogs_gtp2_build_bearer_qos(
|
||||
&req.bearer_contexts_to_be_created.bearer_level_qos,
|
||||
&bearer_qos, bearer_qos_buf, GTP_BEARER_QOS_LEN);
|
||||
&bearer_qos, bearer_qos_buf, GTP2_BEARER_QOS_LEN);
|
||||
|
||||
memset(&ue_timezone, 0, sizeof(ue_timezone));
|
||||
ue_timezone.timezone = 0x40;
|
||||
ue_timezone.daylight_saving_time =
|
||||
OGS_GTP_UE_TIME_ZONE_NO_ADJUSTMENT_FOR_DAYLIGHT_SAVING_TIME;
|
||||
ue_timezone.daylight_saving_time =
|
||||
OGS_GTP2_UE_TIME_ZONE_NO_ADJUSTMENT_FOR_DAYLIGHT_SAVING_TIME;
|
||||
req.ue_time_zone.presence = 1;
|
||||
req.ue_time_zone.data = &ue_timezone;
|
||||
req.ue_time_zone.len = sizeof(ue_timezone);
|
||||
|
|
@ -179,15 +179,15 @@ static void gtp_message_test1(abts_case *tc, void *data)
|
|||
req.charging_characteristics.data = (uint8_t *)"\x54\x00";
|
||||
req.charging_characteristics.len = 2;
|
||||
|
||||
pkbuf = ogs_tlv_build_msg(&ogs_gtp_tlv_desc_create_session_request,
|
||||
pkbuf = ogs_tlv_build_msg(&ogs_gtp2_tlv_desc_create_session_request,
|
||||
&req, OGS_TLV_MODE_T1_L2_I1);
|
||||
ABTS_PTR_NOTNULL(tc, pkbuf);
|
||||
|
||||
ABTS_TRUE(tc, memcmp(pkbuf->data,
|
||||
ABTS_TRUE(tc, memcmp(pkbuf->data,
|
||||
OGS_HEX(_payload, strlen(_payload), hexbuf), pkbuf->len) == 0);
|
||||
|
||||
memset(&req, 0, sizeof(req));
|
||||
rv = ogs_tlv_parse_msg(&req, &ogs_gtp_tlv_desc_create_session_request,
|
||||
rv = ogs_tlv_parse_msg(&req, &ogs_gtp2_tlv_desc_create_session_request,
|
||||
pkbuf, OGS_TLV_MODE_T1_L2_I1);
|
||||
ABTS_INT_EQUAL(tc, OGS_OK, rv);
|
||||
|
||||
|
|
@ -196,13 +196,13 @@ 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 = (char*)"55153011 340010f4";
|
||||
ABTS_TRUE(tc, memcmp(OGS_HEX(_value, strlen(_value), hexbuf),
|
||||
ABTS_TRUE(tc, memcmp(OGS_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 = (char*)"94715276 0041";
|
||||
ABTS_TRUE(tc, memcmp(OGS_HEX(_value, strlen(_value), hexbuf),
|
||||
ABTS_TRUE(tc, memcmp(OGS_HEX(_value, strlen(_value), hexbuf),
|
||||
req.msisdn.data, req.msisdn.len) == 0);
|
||||
|
||||
ABTS_INT_EQUAL(tc, 1, req.me_identity.presence);
|
||||
|
|
@ -212,7 +212,7 @@ static void gtp_message_test1(abts_case *tc, void *data)
|
|||
req.me_identity.data, req.me_identity.len) == 0);
|
||||
|
||||
ABTS_INT_EQUAL(tc, 1, req.user_location_information.presence);
|
||||
size = ogs_gtp_parse_uli(&uli, &req.user_location_information);
|
||||
size = ogs_gtp2_parse_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.e_cgi);
|
||||
|
|
@ -244,25 +244,25 @@ static void gtp_message_test1(abts_case *tc, void *data)
|
|||
ABTS_INT_EQUAL(tc, 1, pco.ext);
|
||||
ABTS_INT_EQUAL(tc, 0, pco.configuration_protocol);
|
||||
ABTS_INT_EQUAL(tc, 3, pco.num_of_id);
|
||||
ABTS_INT_EQUAL(tc,
|
||||
OGS_PCO_ID_INTERNET_PROTOCOL_CONTROL_PROTOCOL,
|
||||
ABTS_INT_EQUAL(tc,
|
||||
OGS_PCO_ID_INTERNET_PROTOCOL_CONTROL_PROTOCOL,
|
||||
pco.ids[0].id);
|
||||
ABTS_INT_EQUAL(tc, 16, pco.ids[0].len);
|
||||
ABTS_INT_EQUAL(tc, 16, pco.ids[0].len);
|
||||
ABTS_TRUE(tc, memcmp(
|
||||
"\x01\x00\x00\x10\x81\x06\x00\x00\x00\x00\x83\x06\x00\x00\x00\x00",
|
||||
pco.ids[0].data, pco.ids[0].len) == 0);
|
||||
ABTS_INT_EQUAL(tc,
|
||||
OGS_PCO_ID_DNS_SERVER_IPV4_ADDRESS_REQUEST,
|
||||
ABTS_INT_EQUAL(tc,
|
||||
OGS_PCO_ID_DNS_SERVER_IPV4_ADDRESS_REQUEST,
|
||||
pco.ids[1].id);
|
||||
ABTS_INT_EQUAL(tc, 0, pco.ids[1].len);
|
||||
ABTS_INT_EQUAL(tc,
|
||||
OGS_PCO_ID_IP_ADDRESS_ALLOCATION_VIA_NAS_SIGNALLING,
|
||||
ABTS_INT_EQUAL(tc, 0, pco.ids[1].len);
|
||||
ABTS_INT_EQUAL(tc,
|
||||
OGS_PCO_ID_IP_ADDRESS_ALLOCATION_VIA_NAS_SIGNALLING,
|
||||
pco.ids[2].id);
|
||||
ABTS_INT_EQUAL(tc, 0, pco.ids[2].len);
|
||||
ABTS_INT_EQUAL(tc, 0, pco.ids[2].len);
|
||||
ABTS_INT_EQUAL(tc, 1, req.bearer_contexts_to_be_created.presence);
|
||||
ABTS_INT_EQUAL(tc, 1, req.
|
||||
bearer_contexts_to_be_created.eps_bearer_id.presence);
|
||||
ABTS_INT_EQUAL(tc, 0x05,
|
||||
ABTS_INT_EQUAL(tc, 0x05,
|
||||
req.bearer_contexts_to_be_created.eps_bearer_id.u8);
|
||||
ABTS_INT_EQUAL(tc, 0, req.
|
||||
bearer_contexts_to_be_created.tft.presence);
|
||||
|
|
@ -276,7 +276,7 @@ static void gtp_message_test1(abts_case *tc, void *data)
|
|||
bearer_contexts_to_be_created.bearer_level_qos.presence);
|
||||
ABTS_INT_EQUAL(tc, 22,
|
||||
req.bearer_contexts_to_be_created.bearer_level_qos.len);
|
||||
size = ogs_gtp_parse_bearer_qos(&bearer_qos,
|
||||
size = ogs_gtp2_parse_bearer_qos(&bearer_qos,
|
||||
&req.bearer_contexts_to_be_created.bearer_level_qos);
|
||||
ABTS_INT_EQUAL(tc, 22, size);
|
||||
ABTS_INT_EQUAL(tc, 1, bearer_qos.pre_emption_vulnerability);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue