@@ -2,7 +2,7 @@

 Source: open5gs

 Binary: open5gs-common, open5gs-mme, open5gs-sgwc, open5gs-smf, open5gs-amf, open5gs-sgwu, open5gs-upf, open5gs-hss, open5gs-pcrf, open5gs-nrf, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg

 Architecture: any

-Version: 2.4.8.202207010002

+Version: 2.4.8.202207020002

 Maintainer: Harald Welte <laforge@gnumonks.org>

 Uploaders: Sukchan Lee <acetcom@gmail.com>

 Homepage: https://open5gs.org

@@ -30,8 +30,8 @@

  open5gs-udr deb net optional arch=any

  open5gs-upf deb net optional arch=any

 Checksums-Sha1:

- fc5dd83e6e1531f4819b9b29515e9a95b6679fd5 11444060 open5gs_2.4.8.202207010002.tar.xz

+ 21d4477859f767e7d0d5facb3f3217e7afe1263f 11444376 open5gs_2.4.8.202207020002.tar.xz

 Checksums-Sha256:

- 52963ee9bf7ce27f5fe1de65b86b152cdcc0ff54d6811302976f0cffa73e2d01 11444060 open5gs_2.4.8.202207010002.tar.xz

+ f45d52e0c66b18a60cb5d2b663c092fa43e657421799e3175be99d5e0347014d 11444376 open5gs_2.4.8.202207020002.tar.xz

 Files:

- 00282b87d56da28014e0d41348c65f67 11444060 open5gs_2.4.8.202207010002.tar.xz

+ 400768a21f9864506213981a76393e16 11444376 open5gs_2.4.8.202207020002.tar.xz

​

@@ -0,0 +1,69 @@

+---

+Checks: '*,

+  -altera-id-dependent-backward-branch,

+  -altera-struct-pack-align,

+  -altera-unroll-loops,

+  -android-cloexec-*,

+  -bugprone-branch-clone,

+  -bugprone-easily-swappable-parameters,

+  -bugprone-macro-parentheses,

+  -bugprone-reserved-identifier,

+  -bugprone-sizeof-expression,

+  -cert-dcl37-c,

+  -cert-dcl51-cpp,

+  -cert-err33-c,

+  -cert-err34-c,

+  -clang-analyzer-optin.performance.Padding,

+  -clang-analyzer-security.insecureAPI.bcmp,

+  -clang-analyzer-security.insecureAPI.bcopy,

+  -clang-analyzer-security.insecureAPI.bzero,

+  -clang-diagnostic-error,

+  -clang-diagnostic-typedef-redefinition,

+  -clang-diagnostic-unknown-warning-option,

+  -concurrency-mt-unsafe,

+  -cppcoreguidelines-avoid-magic-numbers,

+  -cppcoreguidelines-avoid-non-const-global-variables,

+  -cppcoreguidelines-init-variables,

+  -google-readability-braces-around-statements,

+  -google-readability-casting,

+  -google-readability-function-size,

+  -google-readability-todo,

+  -hicpp-braces-around-statements,

+  -hicpp-function-size,

+  -hicpp-multiway-paths-covered,

+  -llvm-else-after-return,

+  -llvm-header-guard,

+  -llvm-include-order,

+  -llvmlibc-restrict-system-libc-headers,

+  -misc-no-recursion,

+  -misc-unused-parameters,

+  -performance-no-int-to-ptr,

+  -readability-avoid-const-params-in-decls,

+  -readability-braces-around-statements,

+  -readability-duplicate-include,

+  -readability-else-after-return,

+  -readability-function-cognitive-complexity,

+  -readability-function-size,

+  -readability-identifier-length,

+  -readability-isolate-declaration,

+  -readability-magic-numbers,

+  -readability-non-const-parameter,

+  -readability-redundant-control-flow,

+  -readability-redundant-declaration,

+  -readability-suspicious-call-argument,

+

+

+  -bugprone-implicit-widening-of-multiplication-result,

+  -bugprone-narrowing-conversions,

+  -cert-exp42-c,

+  -cert-flp37-c,

+  -clang-analyzer-core.NullDereference,

+  -clang-analyzer-deadcode.DeadStores,

+  -clang-analyzer-security.insecureAPI.strcpy,

+  -cppcoreguidelines-interfaces-global-init,

+  -cppcoreguidelines-narrowing-conversions,

+  -hicpp-signed-bitwise,

+  '

+

+WarningsAsErrors: false

+HeaderFilterRegex: '(.*\.h)'

​

@@ -1,8 +1,8 @@

-open5gs (2.4.8.202207010002) UNRELEASED; urgency=medium

+open5gs (2.4.8.202207020002) UNRELEASED; urgency=medium

   * Snapshot build

- -- Sukchan Lee <acetcom@gmail.com>  Fri, 01 Jul 2022 00:09:11 +0000

+ -- Sukchan Lee <acetcom@gmail.com>  Sat, 02 Jul 2022 00:09:11 +0000

 open5gs (2.4.8) unstable; urgency=medium

​

@@ -31,7 +31,7 @@

 Package: open5gs-common

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207010002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207020002), ${shlibs:Depends},

          ${misc:Depends}

 Description: 5G Core and EPC (Shared Files)

  Open5GS is a C-language implementation of 5G Core and EPC

@@ -43,7 +43,7 @@

 Package: open5gs-mme

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207010002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207020002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: MME (Mobility Management Entity)

@@ -58,7 +58,7 @@

 Package: open5gs-sgwc

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207010002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207020002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: SGW-C (Serving Gateway - Control Plane)

@@ -72,7 +72,7 @@

 Package: open5gs-smf

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207010002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207020002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: SMF (Session Management Function)

@@ -84,7 +84,7 @@

 Package: open5gs-amf

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207010002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207020002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: AMF (Access and Mobility Management Function)

@@ -96,7 +96,7 @@

 Package: open5gs-sgwu

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207010002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207020002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: SGW-U (Serving Gateway - User Plane)

@@ -110,7 +110,7 @@

 Package: open5gs-upf

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207010002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207020002), ${shlibs:Depends},

          ${misc:Depends},

          udev,

          open5gs-common (= ${binary:Version})

@@ -123,7 +123,7 @@

 Package: open5gs-hss

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207010002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207020002), ${shlibs:Depends},

          ${misc:Depends},

          mongodb-org | mongodb,

          open5gs-common (= ${binary:Version})

@@ -140,7 +140,7 @@

 Package: open5gs-pcrf

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207010002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207020002), ${shlibs:Depends},

          ${misc:Depends},

          mongodb-org | mongodb,

          open5gs-common (= ${binary:Version})

@@ -156,7 +156,7 @@

 Package: open5gs-nrf

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207010002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207020002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: NRF (Network Repository Function)

@@ -168,7 +168,7 @@

 Package: open5gs-ausf

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207010002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207020002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: AUSF (Authentication Server Function)

@@ -180,7 +180,7 @@

 Package: open5gs-udm

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207010002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207020002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: UDM (Unified Data Management)

@@ -192,7 +192,7 @@

 Package: open5gs-pcf

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207010002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207020002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: PCF (Policy Control Function)

@@ -204,7 +204,7 @@

 Package: open5gs-nssf

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207010002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207020002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: NSSF (Network Slice Selection Function)

@@ -216,7 +216,7 @@

 Package: open5gs-bsf

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207010002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207020002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: BSF (Binding Support Function)

@@ -228,7 +228,7 @@

 Package: open5gs-udr

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207010002), ${shlibs:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207020002), ${shlibs:Depends},

          ${misc:Depends},

          open5gs-common (= ${binary:Version})

 Description: UDR (Unified Data Repository)

@@ -240,7 +240,7 @@

 Package: open5gs

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207010002), ${misc:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207020002), ${misc:Depends},

          open5gs-common (= ${binary:Version}),

          open5gs-mme (= ${binary:Version}),

          open5gs-sgwc (= ${binary:Version}),

@@ -266,7 +266,7 @@

 Package: open5gs-dbg

 Architecture: any

 Multi-Arch: same

-Depends: osmocom-nightly (= 1.0.0.202207010002), ${misc:Depends},

+Depends: osmocom-nightly (= 1.0.0.202207020002), ${misc:Depends},

          open5gs (= ${binary:Version})

 Description: Debug symbols for Open5GS

  Open5GS is a C-language implementation of 5G Core and EPC

​

@@ -29,7 +29,7 @@

 #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

 }

​

@@ -297,11 +297,13 @@

 {

 #if OGS_USE_TALLOC

     ogs_pkbuf_t *newbuf;

-    int size = pkbuf->end - pkbuf->head;

+    int size = 0;

+    ogs_assert(pkbuf);

+    size = pkbuf->end - pkbuf->head;

     ogs_assert(size > 0);

     newbuf = ogs_pkbuf_alloc_debug(NULL, size, file_line);

-    if (!pkbuf) {

+    if (!newbuf) {

         ogs_error("ogs_pkbuf_alloc() failed size=%d", size);

         return NULL;

     }

​

@@ -84,7 +84,7 @@

     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);

​

@@ -99,10 +99,10 @@

     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,

​

@@ -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

 }

​

@@ -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 @@

 }};

-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 @@

         size = OGS_GTPV1C_HEADER_LEN - 4;

     ogs_assert(ogs_pkbuf_pull(pkbuf, size));

-    memcpy(&gtp_message->h, pkbuf->data - size, size);

+    memcpy(&gtp1_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(&gtp_message->echo_request,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->echo_response,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->create_pdp_context_request,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->create_pdp_context_response,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->update_pdp_context_request,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->update_pdp_context_response,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->delete_pdp_context_request,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->delete_pdp_context_response,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->initiate_pdp_context_activation_request,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->initiate_pdp_context_activation_response,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->pdu_notification_request,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->pdu_notification_response,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->pdu_notification_reject_request,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->pdu_notification_reject_response,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->supported_extension_headers_notification,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->send_routeing_information_for_gprs_request,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->send_routeing_information_for_gprs_response,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->failure_report_request,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->failure_report_response,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->note_ms_gprs_present_request,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->note_ms_gprs_present_response,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->identification_request,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->identification_response,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->sgsn_context_request,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->sgsn_context_response,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->sgsn_context_acknowledge,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->forward_relocation_request,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->forward_relocation_response,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->forward_relocation_complete,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_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(&gtp_message->relocation_cancel_request,

+        rv = ogs_tlv_parse_msg_desc(&gtp1_message->relocation_cancel_request,

                 &ogs_gtp1_tlv_desc_relocation_cancel_request, pkbuf, OGS_TLV_MODE_T1_L2);

         break;

​

@@ -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

  ******************************************************************************/

​

@@ -32,7 +32,7 @@

 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);

​

@@ -594,20 +594,20 @@

         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 @@

         size = OGS_GTPV1C_HEADER_LEN - 4;

     ogs_assert(ogs_pkbuf_pull(pkbuf, size));

-    memcpy(&gtp_message->h, pkbuf->data - size, size);

+    memcpy(&gtp1_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_listk:

         f.write("    case OGS_GTP1_%s_TYPE:\n" % v_upper(k))

-        f.write("        rv = ogs_tlv_parse_msg_desc(&gtp_message->%s,\n" % v_lower(k))

+        f.write("        rv = ogs_tlv_parse_msg_desc(&gtp1_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("""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_listk:

         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("                &gtp_message->%s, OGS_TLV_MODE_T1_L2);\n" % v_lower(k))

+        f.write("                &gtp1_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;

     }

​

@@ -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

  ******************************************************************************/

​

@@ -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 @@

    };

 } 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

 }

​

@@ -35,7 +35,7 @@

         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);

​

@@ -603,8 +603,8 @@

 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

 }

​

@@ -34,8 +34,8 @@

 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(

​

@@ -554,12 +554,12 @@

 } __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 */

​

@@ -748,8 +748,8 @@

 } __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 */

​

@@ -40,7 +40,8 @@

 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);

​

@@ -838,10 +838,10 @@

 } __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

​

@@ -38,7 +38,7 @@

 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(

​

@@ -50,7 +50,7 @@

 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);

​

@@ -36,7 +36,7 @@

 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,

​

@@ -42,6 +42,12 @@

 python3_exe = join_paths(python3.path())

 mkdir_p = 'import os; os.makedirs("@0@", exist_ok=True) if not os.environ.get("DESTDIR") else False;'

 install_conf = 'import os; import shutil; shutil.copy("@0@", "@1@") if not os.environ.get("DESTDIR") and not os.path.isfile(os.path.join("@1@", os.path.split("@0@")1)) else False;'

+cppcheck = find_program('cppcheck', required: false)

+clangtidy = find_program('run-clang-tidy', required: false) # requires clang-tools package

+if clangtidy.found() != true

+    clangtidy = find_program('clang-tidy', required: false)

+endif

+

 meson.add_install_script(python3_exe, '-c',

         mkdir_p.format(join_paths(localstatedir, 'log', 'open5gs')))

@@ -131,3 +137,24 @@

   '        debugging support:            ' + get_option('buildtype'),

   '',

 ))

+

+

+if cppcheck.found()

+    run_target('analyze-cppcheck',

+    command :  'misc/static_code_analyze.sh',

+        cppcheck.path(),

+        meson.build_root(),

+        meson.source_root()

+        

+    )

+endif

+

+if clangtidy.found()

+    run_target('analyze-clang-tidy',

+    command :  'misc/static_code_analyze.sh',

+        clangtidy.path(),

+        meson.build_root(),

+        meson.source_root()

+        

+    )

+endif

​

@@ -0,0 +1,40 @@

+#!/usr/bin/env bash

+

+ANALYZE_TOOL="${1}" && shift

+BUILD_DIR="${1}" && shift

+SOURCES_DIR="${1}" && shift

+

+SOURCES=$(find ${SOURCES_DIR}/src ${SOURCES_DIR}/lib -not -path *asn1c* -not -path *ipfw* -name *.c)

+#SOURCES=$(find ${SOURCES_DIR}/src ${SOURCES_DIR}/lib ${SOURCES_DIR}/subprojects -name *.c)

+

+if  ${ANALYZE_TOOL} == *"clang-tidy"* ;

+then

+    if  ${ANALYZE_TOOL} == *"run-clang-tidy"* ; then

+        OPTS="${OPTS} -j $(nproc)"

+    fi

+

+    OPTS="${OPTS} -quiet"

+    OPTS="${OPTS} -p=${BUILD_DIR}"

+

+    ${ANALYZE_TOOL} ${OPTS} ${SOURCES} 2>/dev/null

+

+elif  ${ANALYZE_TOOL} == *"cppcheck"* ;

+then

+    OPTS="${OPTS} -j $(nproc)"

+#    OPTS="${OPTS} --quiet"

+    OPTS="${OPTS} --verbose"

+    OPTS="${OPTS} --enable=all"

+    OPTS="${OPTS} --verbose"

+    OPTS="${OPTS} --suppress=variableScope"

+    OPTS="${OPTS} --suppress=preprocessorErrorDirective"

+    OPTS="${OPTS} --suppress=unusedVariable"

+    OPTS="${OPTS} --output-file=cppchecklog.log"

+    OPTS="${OPTS} --cppcheck-build-dir=${BUILD_DIR}/cppcheck"

+    OPTS="${OPTS} --project=${BUILD_DIR}/compile_commands.json"

+

+    ${ANALYZE_TOOL} ${OPTS} ${SOURCES}

+

+else

+    echo "Unknown static code analysis tool: ${ANALYZE_TOOL}"

+    exit 1

+fi

​

@@ -56,10 +56,10 @@

 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(

​

@@ -27,7 +27,7 @@

 #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

 }

​

@@ -27,7 +27,7 @@

 #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

 }

​

@@ -27,7 +27,7 @@

 #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);

​

@@ -27,7 +27,7 @@

 #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

 }

​

@@ -27,10 +27,10 @@

 #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(

​

@@ -704,7 +704,7 @@

 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);

​

@@ -27,7 +27,7 @@

 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(

​

@@ -41,13 +41,13 @@

         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,

​

@@ -28,11 +28,11 @@

 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,

​

@@ -32,7 +32,7 @@

         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);

​

@@ -41,7 +41,7 @@

         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,

​

@@ -42,13 +42,13 @@

         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);

​