From ab11220dcc3c6c17c60e5e0bbf08c11411911df1 Mon Sep 17 00:00:00 2001 From: Bostjan Meglic Date: Wed, 29 Jun 2022 12:15:51 +0000 Subject: [PATCH] [ALL] Fix differences in function parameter names between definition and declaration --- lib/app/ogs-config.h | 2 +- lib/core/ogs-process.h | 2 +- lib/core/ogs-sockaddr.h | 6 +- lib/crypt/ogs-base64.h | 10 +- lib/gtp/v1/message.c | 248 ++++++++++++++++----------------- lib/gtp/v1/message.h | 2 +- lib/gtp/v1/path.h | 2 +- lib/gtp/v1/support/gtp1-tlv.py | 26 ++-- lib/gtp/v2/message.c | 2 +- lib/gtp/v2/message.h | 6 +- lib/gtp/v2/path.h | 2 +- lib/gtp/v2/support/gtp-tlv.py | 4 +- lib/gtp/xact.c | 4 +- lib/nas/5gs/types.h | 10 +- lib/nas/common/types.h | 4 +- lib/pfcp/conv.h | 3 +- lib/pfcp/types.h | 4 +- lib/pfcp/xact.c | 2 +- lib/sbi/conv.h | 2 +- lib/sbi/nghttp2-server.c | 2 +- src/amf/ngap-path.h | 4 +- src/amf/nnssf-handler.h | 2 +- src/amf/npcf-handler.h | 2 +- src/amf/nsmf-handler.h | 2 +- src/amf/nudm-handler.h | 2 +- src/mme/esm-handler.h | 4 +- src/mme/mme-context.h | 2 +- src/mme/mme-s11-build.h | 2 +- src/mme/mme-s11-handler.h | 6 +- src/sgwc/sxa-handler.h | 4 +- src/smf/gy-handler.h | 2 +- src/smf/n4-handler.h | 2 +- src/smf/s5c-handler.h | 6 +- 33 files changed, 192 insertions(+), 191 deletions(-) diff --git a/lib/app/ogs-config.h b/lib/app/ogs-config.h index ce681edbb..c72e76a98 100644 --- a/lib/app/ogs-config.h +++ b/lib/app/ogs-config.h @@ -29,7 +29,7 @@ extern "C" { #endif int ogs_app_config_parse_sockopt( - ogs_yaml_iter_t *parent, ogs_sockopt_t *sockopt); + ogs_yaml_iter_t *parent, ogs_sockopt_t *option); #ifdef __cplusplus } diff --git a/lib/core/ogs-process.h b/lib/core/ogs-process.h index 46a468745..784488fd3 100644 --- a/lib/core/ogs-process.h +++ b/lib/core/ogs-process.h @@ -84,7 +84,7 @@ enum ogs_proc_option_e { ogs_proc_option_inherit_environment = 0x2 }; -int ogs_proc_create(const char *const command_line[], int options, +int ogs_proc_create(const char *const commandLine[], int options, ogs_proc_t *const out_process); FILE *ogs_proc_stdin(const ogs_proc_t *const process); diff --git a/lib/core/ogs-sockaddr.h b/lib/core/ogs-sockaddr.h index 85119866b..0d8910fc5 100644 --- a/lib/core/ogs-sockaddr.h +++ b/lib/core/ogs-sockaddr.h @@ -99,10 +99,10 @@ int ogs_filter_ip_version(ogs_sockaddr_t **addr, ogs_inet_ntop(__aDDR, __bUF, OGS_ADDRSTRLEN) #define OGS_PORT(__aDDR) \ be16toh((__aDDR)->ogs_sin_port) -const char *ogs_inet_ntop(void *addr, char *buf, int buflen); -int ogs_inet_pton(int family, const char *src, void *addr); +const char *ogs_inet_ntop(void *sa, char *buf, int buflen); +int ogs_inet_pton(int family, const char *src, void *sa); -socklen_t ogs_sockaddr_len(const void *addr); +socklen_t ogs_sockaddr_len(const void *sa); bool ogs_sockaddr_is_equal(void *p, void *q); int ogs_ipsubnet(ogs_ipsubnet_t *ipsub, diff --git a/lib/crypt/ogs-base64.h b/lib/crypt/ogs-base64.h index 33aa65299..59fe61233 100644 --- a/lib/crypt/ogs-base64.h +++ b/lib/crypt/ogs-base64.h @@ -43,16 +43,16 @@ extern "C" { #endif -int ogs_base64_decode_len(const char *coded_src); -int ogs_base64_decode(char *plain_dst, const char *coded_src); +int ogs_base64_decode_len(const char *bufcoded); +int ogs_base64_decode(char *bufplain, const char *bufcoded); int ogs_base64_decode_binary( - unsigned char *plain_dst, const char *coded_src); + unsigned char *bufplain, const char *bufcoded); int ogs_base64_encode_len(int len); int ogs_base64_encode( - char *coded_dst, const char *plain_src, int len_plain_src); + char *encoded, const char *string, int len); int ogs_base64_encode_binary( - char *coded_dst, const unsigned char *plain_src, int len_plain_src); + char *encoded, const unsigned char *string, int len); #ifdef __cplusplus } diff --git a/lib/gtp/v1/message.c b/lib/gtp/v1/message.c index 524fc3280..06b824a8f 100644 --- a/lib/gtp/v1/message.c +++ b/lib/gtp/v1/message.c @@ -21,7 +21,7 @@ /******************************************************************************* * This file had been created by gtp1-tlv.py script v0.1.0 * Please do not modify this file but regenerate it via script. - * Created on: 2022-05-12 14:42:38.611950 by pespin + * Created on: 2022-06-30 08:56:31.641366 by ubuntu * from 29060-g00.docx ******************************************************************************/ @@ -2264,20 +2264,20 @@ ogs_tlv_desc_t ogs_gtp1_tlv_desc_mbms_session_update_response = }}; -int ogs_gtp1_parse_msg(ogs_gtp1_message_t *gtp_message, ogs_pkbuf_t *pkbuf) +int ogs_gtp1_parse_msg(ogs_gtp1_message_t *gtp1_message, ogs_pkbuf_t *pkbuf) { int rv = OGS_ERROR; ogs_gtp1_header_t *h = NULL; uint16_t size = 0; - ogs_assert(gtp_message); + ogs_assert(gtp1_message); ogs_assert(pkbuf); ogs_assert(pkbuf->len); h = (ogs_gtp1_header_t *)pkbuf->data; ogs_assert(h); - memset(gtp_message, 0, sizeof(ogs_gtp1_message_t)); + memset(gtp1_message, 0, sizeof(ogs_gtp1_message_t)); if (h->e || h->s || h->pn) size = OGS_GTPV1C_HEADER_LEN; @@ -2285,242 +2285,242 @@ int ogs_gtp1_parse_msg(ogs_gtp1_message_t *gtp_message, ogs_pkbuf_t *pkbuf) size = OGS_GTPV1C_HEADER_LEN - 4; ogs_assert(ogs_pkbuf_pull(pkbuf, size)); - memcpy(>p_message->h, pkbuf->data - size, size); + memcpy(>p1_message->h, pkbuf->data - size, size); - gtp_message->h.teid = be32toh(gtp_message->h.teid); + gtp1_message->h.teid = be32toh(gtp1_message->h.teid); if (pkbuf->len == 0) { ogs_assert(ogs_pkbuf_push(pkbuf, size)); return OGS_OK; } - switch(gtp_message->h.type) { + switch(gtp1_message->h.type) { case OGS_GTP1_ECHO_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->echo_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->echo_request, &ogs_gtp1_tlv_desc_echo_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_ECHO_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->echo_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->echo_response, &ogs_gtp1_tlv_desc_echo_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_CREATE_PDP_CONTEXT_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->create_pdp_context_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->create_pdp_context_request, &ogs_gtp1_tlv_desc_create_pdp_context_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_CREATE_PDP_CONTEXT_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->create_pdp_context_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->create_pdp_context_response, &ogs_gtp1_tlv_desc_create_pdp_context_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_UPDATE_PDP_CONTEXT_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->update_pdp_context_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->update_pdp_context_request, &ogs_gtp1_tlv_desc_update_pdp_context_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_UPDATE_PDP_CONTEXT_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->update_pdp_context_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->update_pdp_context_response, &ogs_gtp1_tlv_desc_update_pdp_context_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_DELETE_PDP_CONTEXT_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->delete_pdp_context_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->delete_pdp_context_request, &ogs_gtp1_tlv_desc_delete_pdp_context_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_DELETE_PDP_CONTEXT_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->delete_pdp_context_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->delete_pdp_context_response, &ogs_gtp1_tlv_desc_delete_pdp_context_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_INITIATE_PDP_CONTEXT_ACTIVATION_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->initiate_pdp_context_activation_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->initiate_pdp_context_activation_request, &ogs_gtp1_tlv_desc_initiate_pdp_context_activation_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_INITIATE_PDP_CONTEXT_ACTIVATION_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->initiate_pdp_context_activation_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->initiate_pdp_context_activation_response, &ogs_gtp1_tlv_desc_initiate_pdp_context_activation_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_PDU_NOTIFICATION_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->pdu_notification_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->pdu_notification_request, &ogs_gtp1_tlv_desc_pdu_notification_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_PDU_NOTIFICATION_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->pdu_notification_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->pdu_notification_response, &ogs_gtp1_tlv_desc_pdu_notification_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_PDU_NOTIFICATION_REJECT_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->pdu_notification_reject_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->pdu_notification_reject_request, &ogs_gtp1_tlv_desc_pdu_notification_reject_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_PDU_NOTIFICATION_REJECT_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->pdu_notification_reject_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->pdu_notification_reject_response, &ogs_gtp1_tlv_desc_pdu_notification_reject_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_SUPPORTED_EXTENSION_HEADERS_NOTIFICATION_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->supported_extension_headers_notification, + rv = ogs_tlv_parse_msg_desc(>p1_message->supported_extension_headers_notification, &ogs_gtp1_tlv_desc_supported_extension_headers_notification, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_SEND_ROUTEING_INFORMATION_FOR_GPRS_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->send_routeing_information_for_gprs_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->send_routeing_information_for_gprs_request, &ogs_gtp1_tlv_desc_send_routeing_information_for_gprs_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_SEND_ROUTEING_INFORMATION_FOR_GPRS_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->send_routeing_information_for_gprs_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->send_routeing_information_for_gprs_response, &ogs_gtp1_tlv_desc_send_routeing_information_for_gprs_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_FAILURE_REPORT_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->failure_report_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->failure_report_request, &ogs_gtp1_tlv_desc_failure_report_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_FAILURE_REPORT_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->failure_report_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->failure_report_response, &ogs_gtp1_tlv_desc_failure_report_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_NOTE_MS_GPRS_PRESENT_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->note_ms_gprs_present_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->note_ms_gprs_present_request, &ogs_gtp1_tlv_desc_note_ms_gprs_present_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_NOTE_MS_GPRS_PRESENT_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->note_ms_gprs_present_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->note_ms_gprs_present_response, &ogs_gtp1_tlv_desc_note_ms_gprs_present_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_IDENTIFICATION_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->identification_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->identification_request, &ogs_gtp1_tlv_desc_identification_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_IDENTIFICATION_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->identification_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->identification_response, &ogs_gtp1_tlv_desc_identification_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_SGSN_CONTEXT_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->sgsn_context_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->sgsn_context_request, &ogs_gtp1_tlv_desc_sgsn_context_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_SGSN_CONTEXT_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->sgsn_context_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->sgsn_context_response, &ogs_gtp1_tlv_desc_sgsn_context_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_SGSN_CONTEXT_ACKNOWLEDGE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->sgsn_context_acknowledge, + rv = ogs_tlv_parse_msg_desc(>p1_message->sgsn_context_acknowledge, &ogs_gtp1_tlv_desc_sgsn_context_acknowledge, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_FORWARD_RELOCATION_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->forward_relocation_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->forward_relocation_request, &ogs_gtp1_tlv_desc_forward_relocation_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_FORWARD_RELOCATION_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->forward_relocation_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->forward_relocation_response, &ogs_gtp1_tlv_desc_forward_relocation_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_FORWARD_RELOCATION_COMPLETE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->forward_relocation_complete, + rv = ogs_tlv_parse_msg_desc(>p1_message->forward_relocation_complete, &ogs_gtp1_tlv_desc_forward_relocation_complete, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_RELOCATION_CANCEL_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->relocation_cancel_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->relocation_cancel_request, &ogs_gtp1_tlv_desc_relocation_cancel_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_RELOCATION_CANCEL_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->relocation_cancel_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->relocation_cancel_response, &ogs_gtp1_tlv_desc_relocation_cancel_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_FORWARD_SRNS_CONTEXT_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->forward_srns_context, + rv = ogs_tlv_parse_msg_desc(>p1_message->forward_srns_context, &ogs_gtp1_tlv_desc_forward_srns_context, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_FORWARD_RELOCATION_COMPLETE_ACKNOWLEDGE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->forward_relocation_complete_acknowledge, + rv = ogs_tlv_parse_msg_desc(>p1_message->forward_relocation_complete_acknowledge, &ogs_gtp1_tlv_desc_forward_relocation_complete_acknowledge, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_FORWARD_SRNS_CONTEXT_ACKNOWLEDGE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->forward_srns_context_acknowledge, + rv = ogs_tlv_parse_msg_desc(>p1_message->forward_srns_context_acknowledge, &ogs_gtp1_tlv_desc_forward_srns_context_acknowledge, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_UE_REGISTRATION_QUERY_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->ue_registration_query_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->ue_registration_query_request, &ogs_gtp1_tlv_desc_ue_registration_query_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_UE_REGISTRATION_QUERY_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->ue_registration_query_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->ue_registration_query_response, &ogs_gtp1_tlv_desc_ue_registration_query_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_RAN_INFORMATION_RELAY_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->ran_information_relay, + rv = ogs_tlv_parse_msg_desc(>p1_message->ran_information_relay, &ogs_gtp1_tlv_desc_ran_information_relay, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_NOTIFICATION_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->mbms_notification_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->mbms_notification_request, &ogs_gtp1_tlv_desc_mbms_notification_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_NOTIFICATION_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->mbms_notification_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->mbms_notification_response, &ogs_gtp1_tlv_desc_mbms_notification_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_NOTIFICATION_REJECT_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->mbms_notification_reject_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->mbms_notification_reject_request, &ogs_gtp1_tlv_desc_mbms_notification_reject_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_NOTIFICATION_REJECT_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->mbms_notification_reject_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->mbms_notification_reject_response, &ogs_gtp1_tlv_desc_mbms_notification_reject_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_CREATE_MBMS_CONTEXT_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->create_mbms_context_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->create_mbms_context_request, &ogs_gtp1_tlv_desc_create_mbms_context_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_CREATE_MBMS_CONTEXT_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->create_mbms_context_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->create_mbms_context_response, &ogs_gtp1_tlv_desc_create_mbms_context_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_UPDATE_MBMS_CONTEXT_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->update_mbms_context_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->update_mbms_context_request, &ogs_gtp1_tlv_desc_update_mbms_context_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_UPDATE_MBMS_CONTEXT_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->update_mbms_context_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->update_mbms_context_response, &ogs_gtp1_tlv_desc_update_mbms_context_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_DELETE_MBMS_CONTEXT_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->delete_mbms_context_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->delete_mbms_context_response, &ogs_gtp1_tlv_desc_delete_mbms_context_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_REGISTRATION_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->mbms_registration_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->mbms_registration_request, &ogs_gtp1_tlv_desc_mbms_registration_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_REGISTRATION_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->mbms_registration_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->mbms_registration_response, &ogs_gtp1_tlv_desc_mbms_registration_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_DE_REGISTRATION_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->mbms_de_registration_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->mbms_de_registration_request, &ogs_gtp1_tlv_desc_mbms_de_registration_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_DE_REGISTRATION_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->mbms_de_registration_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->mbms_de_registration_response, &ogs_gtp1_tlv_desc_mbms_de_registration_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_SESSION_START_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->mbms_session_start_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->mbms_session_start_request, &ogs_gtp1_tlv_desc_mbms_session_start_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_SESSION_START_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->mbms_session_start_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->mbms_session_start_response, &ogs_gtp1_tlv_desc_mbms_session_start_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_SESSION_STOP_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->mbms_session_stop_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->mbms_session_stop_request, &ogs_gtp1_tlv_desc_mbms_session_stop_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_SESSION_STOP_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->mbms_session_stop_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->mbms_session_stop_response, &ogs_gtp1_tlv_desc_mbms_session_stop_response, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_SESSION_UPDATE_REQUEST_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->mbms_session_update_request, + rv = ogs_tlv_parse_msg_desc(>p1_message->mbms_session_update_request, &ogs_gtp1_tlv_desc_mbms_session_update_request, pkbuf, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_SESSION_UPDATE_RESPONSE_TYPE: - rv = ogs_tlv_parse_msg_desc(>p_message->mbms_session_update_response, + rv = ogs_tlv_parse_msg_desc(>p1_message->mbms_session_update_response, &ogs_gtp1_tlv_desc_mbms_session_update_response, pkbuf, OGS_TLV_MODE_T1_L2); break; default: - ogs_warn("Not implmeneted(type:%d)", gtp_message->h.type); + ogs_warn("Not implmeneted(type:%d)", gtp1_message->h.type); break; } @@ -2529,238 +2529,238 @@ int ogs_gtp1_parse_msg(ogs_gtp1_message_t *gtp_message, ogs_pkbuf_t *pkbuf) return rv; } -ogs_pkbuf_t *ogs_gtp1_build_msg(ogs_gtp1_message_t *gtp_message) +ogs_pkbuf_t *ogs_gtp1_build_msg(ogs_gtp1_message_t *gtp1_message) { ogs_pkbuf_t *pkbuf = NULL; - ogs_assert(gtp_message); - switch(gtp_message->h.type) { + ogs_assert(gtp1_message); + switch(gtp1_message->h.type) { case OGS_GTP1_ECHO_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_echo_request, - >p_message->echo_request, OGS_TLV_MODE_T1_L2); + >p1_message->echo_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_ECHO_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_echo_response, - >p_message->echo_response, OGS_TLV_MODE_T1_L2); + >p1_message->echo_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_CREATE_PDP_CONTEXT_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_create_pdp_context_request, - >p_message->create_pdp_context_request, OGS_TLV_MODE_T1_L2); + >p1_message->create_pdp_context_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_CREATE_PDP_CONTEXT_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_create_pdp_context_response, - >p_message->create_pdp_context_response, OGS_TLV_MODE_T1_L2); + >p1_message->create_pdp_context_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_UPDATE_PDP_CONTEXT_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_update_pdp_context_request, - >p_message->update_pdp_context_request, OGS_TLV_MODE_T1_L2); + >p1_message->update_pdp_context_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_UPDATE_PDP_CONTEXT_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_update_pdp_context_response, - >p_message->update_pdp_context_response, OGS_TLV_MODE_T1_L2); + >p1_message->update_pdp_context_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_DELETE_PDP_CONTEXT_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_delete_pdp_context_request, - >p_message->delete_pdp_context_request, OGS_TLV_MODE_T1_L2); + >p1_message->delete_pdp_context_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_DELETE_PDP_CONTEXT_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_delete_pdp_context_response, - >p_message->delete_pdp_context_response, OGS_TLV_MODE_T1_L2); + >p1_message->delete_pdp_context_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_INITIATE_PDP_CONTEXT_ACTIVATION_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_initiate_pdp_context_activation_request, - >p_message->initiate_pdp_context_activation_request, OGS_TLV_MODE_T1_L2); + >p1_message->initiate_pdp_context_activation_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_INITIATE_PDP_CONTEXT_ACTIVATION_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_initiate_pdp_context_activation_response, - >p_message->initiate_pdp_context_activation_response, OGS_TLV_MODE_T1_L2); + >p1_message->initiate_pdp_context_activation_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_PDU_NOTIFICATION_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_pdu_notification_request, - >p_message->pdu_notification_request, OGS_TLV_MODE_T1_L2); + >p1_message->pdu_notification_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_PDU_NOTIFICATION_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_pdu_notification_response, - >p_message->pdu_notification_response, OGS_TLV_MODE_T1_L2); + >p1_message->pdu_notification_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_PDU_NOTIFICATION_REJECT_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_pdu_notification_reject_request, - >p_message->pdu_notification_reject_request, OGS_TLV_MODE_T1_L2); + >p1_message->pdu_notification_reject_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_PDU_NOTIFICATION_REJECT_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_pdu_notification_reject_response, - >p_message->pdu_notification_reject_response, OGS_TLV_MODE_T1_L2); + >p1_message->pdu_notification_reject_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_SUPPORTED_EXTENSION_HEADERS_NOTIFICATION_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_supported_extension_headers_notification, - >p_message->supported_extension_headers_notification, OGS_TLV_MODE_T1_L2); + >p1_message->supported_extension_headers_notification, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_SEND_ROUTEING_INFORMATION_FOR_GPRS_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_send_routeing_information_for_gprs_request, - >p_message->send_routeing_information_for_gprs_request, OGS_TLV_MODE_T1_L2); + >p1_message->send_routeing_information_for_gprs_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_SEND_ROUTEING_INFORMATION_FOR_GPRS_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_send_routeing_information_for_gprs_response, - >p_message->send_routeing_information_for_gprs_response, OGS_TLV_MODE_T1_L2); + >p1_message->send_routeing_information_for_gprs_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_FAILURE_REPORT_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_failure_report_request, - >p_message->failure_report_request, OGS_TLV_MODE_T1_L2); + >p1_message->failure_report_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_FAILURE_REPORT_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_failure_report_response, - >p_message->failure_report_response, OGS_TLV_MODE_T1_L2); + >p1_message->failure_report_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_NOTE_MS_GPRS_PRESENT_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_note_ms_gprs_present_request, - >p_message->note_ms_gprs_present_request, OGS_TLV_MODE_T1_L2); + >p1_message->note_ms_gprs_present_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_NOTE_MS_GPRS_PRESENT_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_note_ms_gprs_present_response, - >p_message->note_ms_gprs_present_response, OGS_TLV_MODE_T1_L2); + >p1_message->note_ms_gprs_present_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_IDENTIFICATION_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_identification_request, - >p_message->identification_request, OGS_TLV_MODE_T1_L2); + >p1_message->identification_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_IDENTIFICATION_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_identification_response, - >p_message->identification_response, OGS_TLV_MODE_T1_L2); + >p1_message->identification_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_SGSN_CONTEXT_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_sgsn_context_request, - >p_message->sgsn_context_request, OGS_TLV_MODE_T1_L2); + >p1_message->sgsn_context_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_SGSN_CONTEXT_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_sgsn_context_response, - >p_message->sgsn_context_response, OGS_TLV_MODE_T1_L2); + >p1_message->sgsn_context_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_SGSN_CONTEXT_ACKNOWLEDGE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_sgsn_context_acknowledge, - >p_message->sgsn_context_acknowledge, OGS_TLV_MODE_T1_L2); + >p1_message->sgsn_context_acknowledge, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_FORWARD_RELOCATION_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_forward_relocation_request, - >p_message->forward_relocation_request, OGS_TLV_MODE_T1_L2); + >p1_message->forward_relocation_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_FORWARD_RELOCATION_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_forward_relocation_response, - >p_message->forward_relocation_response, OGS_TLV_MODE_T1_L2); + >p1_message->forward_relocation_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_FORWARD_RELOCATION_COMPLETE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_forward_relocation_complete, - >p_message->forward_relocation_complete, OGS_TLV_MODE_T1_L2); + >p1_message->forward_relocation_complete, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_RELOCATION_CANCEL_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_relocation_cancel_request, - >p_message->relocation_cancel_request, OGS_TLV_MODE_T1_L2); + >p1_message->relocation_cancel_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_RELOCATION_CANCEL_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_relocation_cancel_response, - >p_message->relocation_cancel_response, OGS_TLV_MODE_T1_L2); + >p1_message->relocation_cancel_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_FORWARD_SRNS_CONTEXT_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_forward_srns_context, - >p_message->forward_srns_context, OGS_TLV_MODE_T1_L2); + >p1_message->forward_srns_context, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_FORWARD_RELOCATION_COMPLETE_ACKNOWLEDGE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_forward_relocation_complete_acknowledge, - >p_message->forward_relocation_complete_acknowledge, OGS_TLV_MODE_T1_L2); + >p1_message->forward_relocation_complete_acknowledge, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_FORWARD_SRNS_CONTEXT_ACKNOWLEDGE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_forward_srns_context_acknowledge, - >p_message->forward_srns_context_acknowledge, OGS_TLV_MODE_T1_L2); + >p1_message->forward_srns_context_acknowledge, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_UE_REGISTRATION_QUERY_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_ue_registration_query_request, - >p_message->ue_registration_query_request, OGS_TLV_MODE_T1_L2); + >p1_message->ue_registration_query_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_UE_REGISTRATION_QUERY_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_ue_registration_query_response, - >p_message->ue_registration_query_response, OGS_TLV_MODE_T1_L2); + >p1_message->ue_registration_query_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_RAN_INFORMATION_RELAY_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_ran_information_relay, - >p_message->ran_information_relay, OGS_TLV_MODE_T1_L2); + >p1_message->ran_information_relay, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_NOTIFICATION_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_mbms_notification_request, - >p_message->mbms_notification_request, OGS_TLV_MODE_T1_L2); + >p1_message->mbms_notification_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_NOTIFICATION_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_mbms_notification_response, - >p_message->mbms_notification_response, OGS_TLV_MODE_T1_L2); + >p1_message->mbms_notification_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_NOTIFICATION_REJECT_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_mbms_notification_reject_request, - >p_message->mbms_notification_reject_request, OGS_TLV_MODE_T1_L2); + >p1_message->mbms_notification_reject_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_NOTIFICATION_REJECT_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_mbms_notification_reject_response, - >p_message->mbms_notification_reject_response, OGS_TLV_MODE_T1_L2); + >p1_message->mbms_notification_reject_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_CREATE_MBMS_CONTEXT_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_create_mbms_context_request, - >p_message->create_mbms_context_request, OGS_TLV_MODE_T1_L2); + >p1_message->create_mbms_context_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_CREATE_MBMS_CONTEXT_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_create_mbms_context_response, - >p_message->create_mbms_context_response, OGS_TLV_MODE_T1_L2); + >p1_message->create_mbms_context_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_UPDATE_MBMS_CONTEXT_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_update_mbms_context_request, - >p_message->update_mbms_context_request, OGS_TLV_MODE_T1_L2); + >p1_message->update_mbms_context_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_UPDATE_MBMS_CONTEXT_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_update_mbms_context_response, - >p_message->update_mbms_context_response, OGS_TLV_MODE_T1_L2); + >p1_message->update_mbms_context_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_DELETE_MBMS_CONTEXT_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_delete_mbms_context_response, - >p_message->delete_mbms_context_response, OGS_TLV_MODE_T1_L2); + >p1_message->delete_mbms_context_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_REGISTRATION_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_mbms_registration_request, - >p_message->mbms_registration_request, OGS_TLV_MODE_T1_L2); + >p1_message->mbms_registration_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_REGISTRATION_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_mbms_registration_response, - >p_message->mbms_registration_response, OGS_TLV_MODE_T1_L2); + >p1_message->mbms_registration_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_DE_REGISTRATION_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_mbms_de_registration_request, - >p_message->mbms_de_registration_request, OGS_TLV_MODE_T1_L2); + >p1_message->mbms_de_registration_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_DE_REGISTRATION_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_mbms_de_registration_response, - >p_message->mbms_de_registration_response, OGS_TLV_MODE_T1_L2); + >p1_message->mbms_de_registration_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_SESSION_START_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_mbms_session_start_request, - >p_message->mbms_session_start_request, OGS_TLV_MODE_T1_L2); + >p1_message->mbms_session_start_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_SESSION_START_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_mbms_session_start_response, - >p_message->mbms_session_start_response, OGS_TLV_MODE_T1_L2); + >p1_message->mbms_session_start_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_SESSION_STOP_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_mbms_session_stop_request, - >p_message->mbms_session_stop_request, OGS_TLV_MODE_T1_L2); + >p1_message->mbms_session_stop_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_SESSION_STOP_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_mbms_session_stop_response, - >p_message->mbms_session_stop_response, OGS_TLV_MODE_T1_L2); + >p1_message->mbms_session_stop_response, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_SESSION_UPDATE_REQUEST_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_mbms_session_update_request, - >p_message->mbms_session_update_request, OGS_TLV_MODE_T1_L2); + >p1_message->mbms_session_update_request, OGS_TLV_MODE_T1_L2); break; case OGS_GTP1_MBMS_SESSION_UPDATE_RESPONSE_TYPE: pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_mbms_session_update_response, - >p_message->mbms_session_update_response, OGS_TLV_MODE_T1_L2); + >p1_message->mbms_session_update_response, OGS_TLV_MODE_T1_L2); break; default: - ogs_warn("Not implmeneted(type:%d)", gtp_message->h.type); + ogs_warn("Not implmeneted(type:%d)", gtp1_message->h.type); break; } diff --git a/lib/gtp/v1/message.h b/lib/gtp/v1/message.h index 98155e46e..43fd75829 100644 --- a/lib/gtp/v1/message.h +++ b/lib/gtp/v1/message.h @@ -21,7 +21,7 @@ /******************************************************************************* * This file had been created by gtp1-tlv.py script v0.1.0 * Please do not modify this file but regenerate it via script. - * Created on: 2022-05-12 14:42:38.599141 by pespin + * Created on: 2022-06-30 08:56:31.627300 by ubuntu * from 29060-g00.docx ******************************************************************************/ diff --git a/lib/gtp/v1/path.h b/lib/gtp/v1/path.h index 0c287cae1..cd4ea6b94 100644 --- a/lib/gtp/v1/path.h +++ b/lib/gtp/v1/path.h @@ -32,7 +32,7 @@ extern "C" { typedef struct ogs_gtp_xact_s ogs_gtp_xact_t; -ogs_pkbuf_t *ogs_gtp1_handle_echo_req(ogs_pkbuf_t *pkt); +ogs_pkbuf_t *ogs_gtp1_handle_echo_req(ogs_pkbuf_t *pkb); void ogs_gtp1_send_error_message( ogs_gtp_xact_t *xact, uint32_t teid, uint8_t type, uint8_t cause_value); diff --git a/lib/gtp/v1/support/gtp1-tlv.py b/lib/gtp/v1/support/gtp1-tlv.py index a46f7d505..2bc36f09c 100644 --- a/lib/gtp/v1/support/gtp1-tlv.py +++ b/lib/gtp/v1/support/gtp1-tlv.py @@ -594,20 +594,20 @@ for (k, v) in sorted_msg_list: f.write("}};\n\n") f.write("\n") -f.write("""int ogs_gtp1_parse_msg(ogs_gtp1_message_t *gtp_message, ogs_pkbuf_t *pkbuf) +f.write("""int ogs_gtp1_parse_msg(ogs_gtp1_message_t *gtp1_message, ogs_pkbuf_t *pkbuf) { int rv = OGS_ERROR; ogs_gtp1_header_t *h = NULL; uint16_t size = 0; - ogs_assert(gtp_message); + ogs_assert(gtp1_message); ogs_assert(pkbuf); ogs_assert(pkbuf->len); h = (ogs_gtp1_header_t *)pkbuf->data; ogs_assert(h); - memset(gtp_message, 0, sizeof(ogs_gtp1_message_t)); + memset(gtp1_message, 0, sizeof(ogs_gtp1_message_t)); if (h->e || h->s || h->pn) size = OGS_GTPV1C_HEADER_LEN; @@ -615,25 +615,25 @@ f.write("""int ogs_gtp1_parse_msg(ogs_gtp1_message_t *gtp_message, ogs_pkbuf_t * size = OGS_GTPV1C_HEADER_LEN - 4; ogs_assert(ogs_pkbuf_pull(pkbuf, size)); - memcpy(>p_message->h, pkbuf->data - size, size); + memcpy(>p1_message->h, pkbuf->data - size, size); - gtp_message->h.teid = be32toh(gtp_message->h.teid); + gtp1_message->h.teid = be32toh(gtp1_message->h.teid); if (pkbuf->len == 0) { ogs_assert(ogs_pkbuf_push(pkbuf, size)); return OGS_OK; } - switch(gtp_message->h.type) { + switch(gtp1_message->h.type) { """) for (k, v) in sorted_msg_list: if "ies" in msg_list[k]: f.write(" case OGS_GTP1_%s_TYPE:\n" % v_upper(k)) - f.write(" rv = ogs_tlv_parse_msg_desc(>p_message->%s,\n" % v_lower(k)) + f.write(" rv = ogs_tlv_parse_msg_desc(>p1_message->%s,\n" % v_lower(k)) f.write(" &ogs_gtp1_tlv_desc_%s, pkbuf, OGS_TLV_MODE_T1_L2);\n" % v_lower(k)) f.write(" break;\n") f.write(""" default: - ogs_warn("Not implmeneted(type:%d)", gtp_message->h.type); + ogs_warn("Not implmeneted(type:%d)", gtp1_message->h.type); break; } @@ -644,21 +644,21 @@ f.write(""" default: """) -f.write("""ogs_pkbuf_t *ogs_gtp1_build_msg(ogs_gtp1_message_t *gtp_message) +f.write("""ogs_pkbuf_t *ogs_gtp1_build_msg(ogs_gtp1_message_t *gtp1_message) { ogs_pkbuf_t *pkbuf = NULL; - ogs_assert(gtp_message); - switch(gtp_message->h.type) { + ogs_assert(gtp1_message); + switch(gtp1_message->h.type) { """) for (k, v) in sorted_msg_list: if "ies" in msg_list[k]: f.write(" case OGS_GTP1_%s_TYPE:\n" % v_upper(k)) f.write(" pkbuf = ogs_tlv_build_msg(&ogs_gtp1_tlv_desc_%s,\n" % v_lower(k)) - f.write(" >p_message->%s, OGS_TLV_MODE_T1_L2);\n" % v_lower(k)) + f.write(" >p1_message->%s, OGS_TLV_MODE_T1_L2);\n" % v_lower(k)) f.write(" break;\n") f.write(""" default: - ogs_warn("Not implmeneted(type:%d)", gtp_message->h.type); + ogs_warn("Not implmeneted(type:%d)", gtp1_message->h.type); break; } diff --git a/lib/gtp/v2/message.c b/lib/gtp/v2/message.c index aee9f7f9c..76060c10a 100644 --- a/lib/gtp/v2/message.c +++ b/lib/gtp/v2/message.c @@ -20,7 +20,7 @@ /******************************************************************************* * This file had been created by gtp-tlv.py script v0.1.0 * Please do not modify this file but regenerate it via script. - * Created on: 2022-06-11 20:06:47.872181 by acetcom + * Created on: 2022-06-30 08:56:57.201419 by ubuntu * from 29274-g30.docx ******************************************************************************/ diff --git a/lib/gtp/v2/message.h b/lib/gtp/v2/message.h index c0ed1499b..60f15fae2 100644 --- a/lib/gtp/v2/message.h +++ b/lib/gtp/v2/message.h @@ -20,7 +20,7 @@ /******************************************************************************* * This file had been created by gtp-tlv.py script v0.1.0 * Please do not modify this file but regenerate it via script. - * Created on: 2022-06-11 20:06:47.866971 by acetcom + * Created on: 2022-06-30 08:56:57.190289 by ubuntu * from 29274-g30.docx ******************************************************************************/ @@ -1274,8 +1274,8 @@ typedef struct ogs_gtp2_message_s { }; } ogs_gtp2_message_t; -int ogs_gtp2_parse_msg(ogs_gtp2_message_t *gtp_message, ogs_pkbuf_t *pkbuf); -ogs_pkbuf_t *ogs_gtp2_build_msg(ogs_gtp2_message_t *gtp_message); +int ogs_gtp2_parse_msg(ogs_gtp2_message_t *gtp2_message, ogs_pkbuf_t *pkbuf); +ogs_pkbuf_t *ogs_gtp2_build_msg(ogs_gtp2_message_t *gtp2_message); #ifdef __cplusplus } diff --git a/lib/gtp/v2/path.h b/lib/gtp/v2/path.h index 1cf18ba3f..b9bd26ad1 100644 --- a/lib/gtp/v2/path.h +++ b/lib/gtp/v2/path.h @@ -35,7 +35,7 @@ int ogs_gtp2_send_user_plane( ogs_gtp2_header_t *gtp_hdesc, ogs_gtp2_extension_header_t *ext_hdesc, ogs_pkbuf_t *pkbuf); -ogs_pkbuf_t *ogs_gtp2_handle_echo_req(ogs_pkbuf_t *pkt); +ogs_pkbuf_t *ogs_gtp2_handle_echo_req(ogs_pkbuf_t *pkb); void ogs_gtp2_send_error_message( ogs_gtp_xact_t *xact, uint32_t teid, uint8_t type, uint8_t cause_value); diff --git a/lib/gtp/v2/support/gtp-tlv.py b/lib/gtp/v2/support/gtp-tlv.py index 1f3553596..0aeef6cb2 100644 --- a/lib/gtp/v2/support/gtp-tlv.py +++ b/lib/gtp/v2/support/gtp-tlv.py @@ -603,8 +603,8 @@ for (k, v) in sorted_msg_list: f.write(" };\n"); f.write("} ogs_gtp2_message_t;\n\n") -f.write("""int ogs_gtp2_parse_msg(ogs_gtp2_message_t *gtp_message, ogs_pkbuf_t *pkbuf); -ogs_pkbuf_t *ogs_gtp2_build_msg(ogs_gtp2_message_t *gtp_message); +f.write("""int ogs_gtp2_parse_msg(ogs_gtp2_message_t *gtp2_message, ogs_pkbuf_t *pkbuf); +ogs_pkbuf_t *ogs_gtp2_build_msg(ogs_gtp2_message_t *gtp2_message); #ifdef __cplusplus } diff --git a/lib/gtp/xact.c b/lib/gtp/xact.c index dff1f9381..8a85a6fa2 100644 --- a/lib/gtp/xact.c +++ b/lib/gtp/xact.c @@ -34,8 +34,8 @@ static uint32_t g_xact_id = 0; static OGS_POOL(pool, ogs_gtp_xact_t); static ogs_gtp_xact_t *ogs_gtp_xact_remote_create(ogs_gtp_node_t *gnode, uint8_t gtp_version, uint32_t sqn); -static ogs_gtp_xact_stage_t ogs_gtp2_xact_get_stage(uint8_t type, uint32_t sqn); -static ogs_gtp_xact_stage_t ogs_gtp1_xact_get_stage(uint8_t type, uint32_t sqn); +static ogs_gtp_xact_stage_t ogs_gtp2_xact_get_stage(uint8_t type, uint32_t xid); +static ogs_gtp_xact_stage_t ogs_gtp1_xact_get_stage(uint8_t type, uint32_t xid); static int ogs_gtp_xact_delete(ogs_gtp_xact_t *xact); static int ogs_gtp_xact_update_rx(ogs_gtp_xact_t *xact, uint8_t type); static ogs_gtp_xact_t *ogs_gtp_xact_find_by_xid( diff --git a/lib/nas/5gs/types.h b/lib/nas/5gs/types.h index f26fef42b..dd8f5cb2a 100644 --- a/lib/nas/5gs/types.h +++ b/lib/nas/5gs/types.h @@ -554,12 +554,12 @@ ED2(uint8_t length_of_rejected_s_nssai:4;, } __attribute__ ((packed)) ogs_nas_rejected_s_nssai_t; void ogs_nas_build_rejected_nssai( - ogs_nas_rejected_nssai_t *nas_rejected_nssai, - ogs_nas_rejected_s_nssai_t *nas_rejected_s_nssai, - int num_of_nas_rejected_s_nssai); + ogs_nas_rejected_nssai_t *rejected_nssai, + ogs_nas_rejected_s_nssai_t *rejected_s_nssai, + int num_of_rejected_s_nssai); int ogs_nas_parse_rejected_nssai( - ogs_nas_rejected_s_nssai_t *nas_rejected_s_nssai, - ogs_nas_rejected_nssai_t *nas_rejected_nssai); + ogs_nas_rejected_s_nssai_t *rejected_s_nssai, + ogs_nas_rejected_nssai_t *rejected_nssai); /* 9.11.3.49 Service area list * O TLV 6-114 */ diff --git a/lib/nas/common/types.h b/lib/nas/common/types.h index 537a1a27a..e0ba2044d 100644 --- a/lib/nas/common/types.h +++ b/lib/nas/common/types.h @@ -748,8 +748,8 @@ typedef struct ogs_nas_apn_aggregate_maximum_bit_rate_s { } __attribute__ ((packed)) ogs_nas_apn_aggregate_maximum_bit_rate_t; void apn_ambr_build( - ogs_nas_apn_aggregate_maximum_bit_rate_t * apn_aggregate_maximum_bit_rate, - uint32_t dl_ambr, uint32_t ul_ambr); + ogs_nas_apn_aggregate_maximum_bit_rate_t *apn_aggregate_maximum_bit_rate, + uint32_t dl_apn_ambr, uint32_t ul_apn_ambr); /* 9.9.4.3 EPS quality of service * M LV 2-14 */ diff --git a/lib/pfcp/conv.h b/lib/pfcp/conv.h index 5ec085241..2b74fad0f 100644 --- a/lib/pfcp/conv.h +++ b/lib/pfcp/conv.h @@ -40,7 +40,8 @@ int ogs_pfcp_sockaddr_to_f_seid( int ogs_pfcp_f_seid_to_ip(ogs_pfcp_f_seid_t *f_seid, ogs_ip_t *ip); int ogs_pfcp_sockaddr_to_f_teid( - ogs_sockaddr_t *a, ogs_sockaddr_t *b, ogs_pfcp_f_teid_t *f_teid, int *len); + ogs_sockaddr_t *addr, ogs_sockaddr_t *addr6, + ogs_pfcp_f_teid_t *f_teid, int *len); int ogs_pfcp_f_teid_to_sockaddr( ogs_pfcp_f_teid_t *f_teid, int f_teid_len, ogs_sockaddr_t **addr, ogs_sockaddr_t **addr6); diff --git a/lib/pfcp/types.h b/lib/pfcp/types.h index 285f0cfa4..03d6fdc79 100644 --- a/lib/pfcp/types.h +++ b/lib/pfcp/types.h @@ -838,10 +838,10 @@ ED6(uint8_t spare1:3;, } __attribute__ ((packed)) ogs_pfcp_sdf_filter_t; int16_t ogs_pfcp_build_sdf_filter( - ogs_tlv_octet_t *octet, ogs_pfcp_sdf_filter_t *info, + ogs_tlv_octet_t *octet, ogs_pfcp_sdf_filter_t *filter, void *data, int data_len); int16_t ogs_pfcp_parse_sdf_filter( - ogs_pfcp_sdf_filter_t *info, ogs_tlv_octet_t *octet); + ogs_pfcp_sdf_filter_t *filter, ogs_tlv_octet_t *octet); /* * 8.2.8 MBR diff --git a/lib/pfcp/xact.c b/lib/pfcp/xact.c index af72213d9..b56c2c301 100644 --- a/lib/pfcp/xact.c +++ b/lib/pfcp/xact.c @@ -38,7 +38,7 @@ static OGS_POOL(pool, ogs_pfcp_xact_t); static ogs_pfcp_xact_t *ogs_pfcp_xact_remote_create( ogs_pfcp_node_t *node, uint32_t sqn); static ogs_pfcp_xact_stage_t ogs_pfcp_xact_get_stage( - uint8_t type, uint32_t sqn); + uint8_t type, uint32_t xid); static int ogs_pfcp_xact_delete(ogs_pfcp_xact_t *xact); static int ogs_pfcp_xact_update_rx(ogs_pfcp_xact_t *xact, uint8_t type); static ogs_pfcp_xact_t *ogs_pfcp_xact_find_by_xid( diff --git a/lib/sbi/conv.h b/lib/sbi/conv.h index ab3ee14ef..774ef7b79 100644 --- a/lib/sbi/conv.h +++ b/lib/sbi/conv.h @@ -50,7 +50,7 @@ uint64_t ogs_sbi_bitrate_from_string(char *str); int ogs_strftimezone(char *str, size_t size, int tm_gmtoff); char *ogs_sbi_localtime_string(ogs_time_t time); char *ogs_sbi_gmtime_string(ogs_time_t time); -char *ogs_sbi_timezone_string(int tm_offset); +char *ogs_sbi_timezone_string(int tm_gmtoff); bool ogs_sbi_time_from_string(ogs_time_t *time, char *str); char *ogs_sbi_s_nssai_to_string(ogs_s_nssai_t *s_nssai); diff --git a/lib/sbi/nghttp2-server.c b/lib/sbi/nghttp2-server.c index 2306ac01c..eb0247b5f 100644 --- a/lib/sbi/nghttp2-server.c +++ b/lib/sbi/nghttp2-server.c @@ -36,7 +36,7 @@ static void server_stop(ogs_sbi_server_t *server); static bool server_send_response( ogs_sbi_stream_t *stream, ogs_sbi_response_t *response); -static ogs_sbi_server_t *server_from_stream(ogs_sbi_stream_t *data); +static ogs_sbi_server_t *server_from_stream(ogs_sbi_stream_t *stream); const ogs_sbi_server_actions_t ogs_nghttp2_server_actions = { server_init, diff --git a/src/amf/ngap-path.h b/src/amf/ngap-path.h index c752fbbb3..a05a7271e 100644 --- a/src/amf/ngap-path.h +++ b/src/amf/ngap-path.h @@ -56,10 +56,10 @@ int ngap_send_ran_configuration_update_failure( int ngap_send_ran_ue_context_release_command( ran_ue_t *ran_ue, NGAP_Cause_PR group, long cause, - uint8_t action, ogs_time_t delay); + uint8_t action, ogs_time_t duration); int ngap_send_amf_ue_context_release_command( amf_ue_t *amf_ue, NGAP_Cause_PR group, long cause, - uint8_t action, ogs_time_t delay); + uint8_t action, ogs_time_t duration); int ngap_send_paging(amf_ue_t *amf_ue); int ngap_send_pdu_resource_setup_request( diff --git a/src/amf/nnssf-handler.h b/src/amf/nnssf-handler.h index bf53700ba..5e81a599e 100644 --- a/src/amf/nnssf-handler.h +++ b/src/amf/nnssf-handler.h @@ -27,7 +27,7 @@ extern "C" { #include "context.h" int amf_nnssf_nsselection_handle_get( - amf_sess_t *sess, ogs_sbi_message_t *message); + amf_sess_t *sess, ogs_sbi_message_t *recvmsg); #ifdef __cplusplus } diff --git a/src/amf/npcf-handler.h b/src/amf/npcf-handler.h index 999b74bf4..67a4d56f2 100644 --- a/src/amf/npcf-handler.h +++ b/src/amf/npcf-handler.h @@ -27,7 +27,7 @@ extern "C" { #include "context.h" int amf_npcf_am_policy_control_handle_create( - amf_ue_t *amf_ue, ogs_sbi_message_t *message); + amf_ue_t *amf_ue, ogs_sbi_message_t *recvmsg); #ifdef __cplusplus } diff --git a/src/amf/nsmf-handler.h b/src/amf/nsmf-handler.h index 16810f598..893209dc2 100644 --- a/src/amf/nsmf-handler.h +++ b/src/amf/nsmf-handler.h @@ -27,7 +27,7 @@ extern "C" { #include "context.h" int amf_nsmf_pdusession_handle_create_sm_context( - amf_sess_t *sess, ogs_sbi_message_t *message); + amf_sess_t *sess, ogs_sbi_message_t *recvmsg); int amf_nsmf_pdusession_handle_update_sm_context( amf_sess_t *sess, int state, ogs_sbi_message_t *recvmsg); int amf_nsmf_pdusession_handle_release_sm_context(amf_sess_t *sess, int state); diff --git a/src/amf/nudm-handler.h b/src/amf/nudm-handler.h index 4797bbba3..ed213de00 100644 --- a/src/amf/nudm-handler.h +++ b/src/amf/nudm-handler.h @@ -27,7 +27,7 @@ extern "C" { #include "context.h" int amf_nudm_sdm_handle_provisioned( - amf_ue_t *amf_ue, ogs_sbi_message_t *message); + amf_ue_t *amf_ue, ogs_sbi_message_t *recvmsg); #ifdef __cplusplus } diff --git a/src/mme/esm-handler.h b/src/mme/esm-handler.h index 51caaa2b8..d27d9ff1a 100644 --- a/src/mme/esm-handler.h +++ b/src/mme/esm-handler.h @@ -27,10 +27,10 @@ extern "C" { #endif int esm_handle_pdn_connectivity_request(mme_bearer_t *bearer, - ogs_nas_eps_pdn_connectivity_request_t *pdn_connectivity_request, + ogs_nas_eps_pdn_connectivity_request_t *req, int create_action); int esm_handle_information_response(mme_sess_t *sess, - ogs_nas_eps_esm_information_response_t *bearer_information_response); + ogs_nas_eps_esm_information_response_t *rsp); int esm_handle_bearer_resource_allocation_request( mme_bearer_t *bearer, ogs_nas_eps_message_t *message); int esm_handle_bearer_resource_modification_request( diff --git a/src/mme/mme-context.h b/src/mme/mme-context.h index 03e44d87f..aecfee3c0 100644 --- a/src/mme/mme-context.h +++ b/src/mme/mme-context.h @@ -704,7 +704,7 @@ void mme_pgw_remove_all(void); ogs_sockaddr_t *mme_pgw_addr_find_by_apn( ogs_list_t *list, int family, char *apn); -mme_vlr_t *mme_vlr_add(ogs_sockaddr_t *addr, ogs_sockopt_t *option); +mme_vlr_t *mme_vlr_add(ogs_sockaddr_t *sa_list, ogs_sockopt_t *option); void mme_vlr_remove(mme_vlr_t *vlr); void mme_vlr_remove_all(void); void mme_vlr_close(mme_vlr_t *vlr); diff --git a/src/mme/mme-s11-build.h b/src/mme/mme-s11-build.h index f979cd12c..a39c6a60c 100644 --- a/src/mme/mme-s11-build.h +++ b/src/mme/mme-s11-build.h @@ -27,7 +27,7 @@ extern "C" { ogs_pkbuf_t *mme_s11_build_create_session_request( uint8_t type, mme_sess_t *sess, int create_action); ogs_pkbuf_t *mme_s11_build_modify_bearer_request( - uint8_t type, mme_ue_t *mme_ue, int uli_presense); + uint8_t type, mme_ue_t *mme_ue, int uli_presence); ogs_pkbuf_t *mme_s11_build_delete_session_request( uint8_t type, mme_sess_t *sess, int action); ogs_pkbuf_t *mme_s11_build_create_bearer_response( diff --git a/src/mme/mme-s11-handler.h b/src/mme/mme-s11-handler.h index 63126bcbc..c9b62f9f6 100644 --- a/src/mme/mme-s11-handler.h +++ b/src/mme/mme-s11-handler.h @@ -41,13 +41,13 @@ void mme_s11_handle_delete_session_response( ogs_gtp2_delete_session_response_t *rsp); void mme_s11_handle_create_bearer_request( ogs_gtp_xact_t *xact, mme_ue_t *mme_ue, - ogs_gtp2_create_bearer_request_t *rsp); + ogs_gtp2_create_bearer_request_t *req); void mme_s11_handle_update_bearer_request( ogs_gtp_xact_t *xact, mme_ue_t *mme_ue, - ogs_gtp2_update_bearer_request_t *rsp); + ogs_gtp2_update_bearer_request_t *req); void mme_s11_handle_delete_bearer_request( ogs_gtp_xact_t *xact, mme_ue_t *mme_ue, - ogs_gtp2_delete_bearer_request_t *rsp); + ogs_gtp2_delete_bearer_request_t *req); void mme_s11_handle_release_access_bearers_response( ogs_gtp_xact_t *xact, mme_ue_t *mme_ue, diff --git a/src/sgwc/sxa-handler.h b/src/sgwc/sxa-handler.h index 8c5597e4d..045f6bcf3 100644 --- a/src/sgwc/sxa-handler.h +++ b/src/sgwc/sxa-handler.h @@ -28,11 +28,11 @@ extern "C" { void sgwc_sxa_handle_session_establishment_response( sgwc_sess_t *sess, ogs_pfcp_xact_t *pfcp_xact, - ogs_gtp2_message_t *gtp_message, + ogs_gtp2_message_t *recv_message, ogs_pfcp_session_establishment_response_t *pfcp_rsp); void sgwc_sxa_handle_session_modification_response( sgwc_sess_t *sess, ogs_pfcp_xact_t *pfcp_xact, - ogs_gtp2_message_t *gtp_message, + ogs_gtp2_message_t *recv_message, ogs_pfcp_session_modification_response_t *pfcp_rsp); void sgwc_sxa_handle_session_deletion_response( sgwc_sess_t *sess, ogs_pfcp_xact_t *pfcp_xact, diff --git a/src/smf/gy-handler.h b/src/smf/gy-handler.h index 7ad47e467..360cee643 100644 --- a/src/smf/gy-handler.h +++ b/src/smf/gy-handler.h @@ -32,7 +32,7 @@ uint32_t smf_gy_handle_cca_initial_request( ogs_gtp_xact_t *gtp_xact); void smf_gy_handle_cca_update_request( smf_sess_t *sess, ogs_diam_gy_message_t *gy_message, - ogs_pfcp_xact_t *gtp_xact); + ogs_pfcp_xact_t *pfcp_xact); uint32_t smf_gy_handle_cca_termination_request( smf_sess_t *sess, ogs_diam_gy_message_t *gy_message, ogs_gtp_xact_t *gtp_xact); diff --git a/src/smf/n4-handler.h b/src/smf/n4-handler.h index 40c38c70a..76a257d12 100644 --- a/src/smf/n4-handler.h +++ b/src/smf/n4-handler.h @@ -41,7 +41,7 @@ uint8_t smf_epc_n4_handle_session_establishment_response( ogs_pfcp_session_establishment_response_t *rsp); void smf_epc_n4_handle_session_modification_response( smf_sess_t *sess, ogs_pfcp_xact_t *xact, - ogs_gtp2_message_t *gtp2_message, + ogs_gtp2_message_t *recv_message, ogs_pfcp_session_modification_response_t *rsp); uint8_t smf_epc_n4_handle_session_deletion_response( smf_sess_t *sess, ogs_pfcp_xact_t *xact, diff --git a/src/smf/s5c-handler.h b/src/smf/s5c-handler.h index f57e8b2b4..0312c5077 100644 --- a/src/smf/s5c-handler.h +++ b/src/smf/s5c-handler.h @@ -42,13 +42,13 @@ void smf_s5c_handle_modify_bearer_request( ogs_pkbuf_t *gtpbuf, ogs_gtp2_modify_bearer_request_t *req); void smf_s5c_handle_create_bearer_response( smf_sess_t *sess, ogs_gtp_xact_t *xact, - ogs_gtp2_create_bearer_response_t *req); + ogs_gtp2_create_bearer_response_t *rsp); void smf_s5c_handle_update_bearer_response( smf_sess_t *sess, ogs_gtp_xact_t *xact, - ogs_gtp2_update_bearer_response_t *req); + ogs_gtp2_update_bearer_response_t *rsp); bool smf_s5c_handle_delete_bearer_response( smf_sess_t *sess, ogs_gtp_xact_t *xact, - ogs_gtp2_delete_bearer_response_t *req); + ogs_gtp2_delete_bearer_response_t *rsp); void smf_s5c_handle_bearer_resource_command( smf_sess_t *sess, ogs_gtp_xact_t *xact, ogs_gtp2_bearer_resource_command_t *cmd);