Osmocom Open Build Service

commit_59391d8d5ce23835456d4cebbd23c52a18d8a276.txt Added

commit_da27d6eab9cdaa42f18aa7774da55225cadeea5b.txt Deleted

open5gs_2.7.6.4747.da27.dsc -> open5gs_2.7.6.4751.5939.dsc Changed

@@ -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-scp, open5gs-sepp, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg
 Architecture: any
-Version: 2.7.6.4747.da27
+Version: 2.7.6.4751.5939
 Maintainer: Harald Welte <laforge@gnumonks.org>
 Uploaders: Sukchan Lee <acetcom@gmail.com>
 Homepage: https://open5gs.org
@@ -32,8 +32,8 @@
  open5gs-udr deb net optional arch=any
  open5gs-upf deb net optional arch=any
 Checksums-Sha1:
- 06b71e6239fb0211ae55acb8c45691defdadf59a 15036356 open5gs_2.7.6.4747.da27.tar.xz
+ ccf47ce30cd8826737acaf0cca8e43b85d2e768b 15038444 open5gs_2.7.6.4751.5939.tar.xz
 Checksums-Sha256:
- ac95444eeccbda4a4cd37acd72bb4fe3f7b5c46e38b2d56f2606fd4b30dce0f6 15036356 open5gs_2.7.6.4747.da27.tar.xz
+ c52bf24d4d4e59e71dce00855ea62dc67d362a954e4bf15a4fb70bf80b170900 15038444 open5gs_2.7.6.4751.5939.tar.xz
 Files:
- 7b4f8aab62c8cbc7ab377a9d246ade47 15036356 open5gs_2.7.6.4747.da27.tar.xz
+ a9fe595119f9951748387abe58f0548f 15038444 open5gs_2.7.6.4751.5939.tar.xz

open5gs_2.7.6.4747.da27.tar.xz/.tarball-version -> open5gs_2.7.6.4751.5939.tar.xz/.tarball-version Changed

open5gs_2.7.6.4747.da27.tar.xz/debian/changelog -> open5gs_2.7.6.4751.5939.tar.xz/debian/changelog Changed

open5gs_2.7.6.4747.da27.tar.xz/lib/nas/5gs/types.c -> open5gs_2.7.6.4751.5939.tar.xz/lib/nas/5gs/types.c Changed

@@ -273,7 +273,7 @@
             ogs_nas_build_s_nssai(&nas_s_nssai, nas_s_nssai_ie + i);
             memcpy(nas_nssai->buffer + nas_nssai->length, &nas_s_nssai,
                     sizeof(nas_s_nssai.length) + nas_s_nssai.length);
-            nas_nssai->length += 
+            nas_nssai->length +=
                     (sizeof(nas_s_nssai.length) + nas_s_nssai.length);
         }
     }
@@ -805,14 +805,216 @@
     return OGS_OK;
 }
 
+/* Parse "Packet filter list", 3GPP TS 24.501 Figure 9.11.4.13.3 and Figure 9.11.4.13. */
+static int parse_qos_rules_packet_filter_list(ogs_nas_qos_rule_t *rule, const uint8_t *buffer, uint16_t length) {
+    uint16_t size = 0;
+    int i, j, len = 0;
+
+    for (i = 0; i < rule->num_of_packet_filter && i < OGS_MAX_NUM_OF_FLOW_IN_GTP; i++) {
+        if (size+sizeof(rule->pfi.flags) > length) {
+            ogs_error("PF%d Overflow: size%d length%d", i, size, length);
+            goto cleanup;
+        }
+        memcpy(&rule->pfi.flags, buffer+size, sizeof(rule->pfi.flags));
+        size += sizeof(rule->pfi.flags);
+
+        if (rule->code ==
+            OGS_NAS_QOS_CODE_MODIFY_EXISTING_QOS_RULE_AND_DELETE_PACKET_FILTERS)
+            continue;
+
+        if (size+sizeof(rule->pfi.content.length) > length) {
+            ogs_error("PF%d Overflow: size%d length%d", i, size, length);
+            goto cleanup;
+        }
+        memcpy(&rule->pfi.content.length, buffer+size,
+                sizeof(rule->pfi.content.length));
+        size += sizeof(rule->pfi.content.length);
+
+        j = 0; len = 0;
+        while(len < rule->pfi.content.length) {
+            if (size+len+
+                sizeof(rule->pfi.content.componentj.type) > length) {
+                ogs_error("PF%d Overflow: size%d len%d length%d",
+                          i, size, len, length);
+                goto cleanup;
+            }
+            memcpy(&rule->pfi.content.componentj.type,
+                    buffer+size+len,
+                    sizeof(rule->pfi.content.componentj.type));
+            len += sizeof(rule->pfi.content.componentj.type);
+            switch(rule->pfi.content.componentj.type) {
+            case OGS_PACKET_FILTER_MATCH_ALL:
+                break;
+            case OGS_PACKET_FILTER_PROTOCOL_IDENTIFIER_NEXT_HEADER_TYPE:
+                if (size+len+
+                    sizeof(rule->pfi.content.componentj.proto) >
+                    length) {
+                    ogs_error("PF%d Overflow: size%d len%d length%d",
+                              i, size, len, length);
+                    goto cleanup;
+                }
+                memcpy(&rule->pfi.content.componentj.proto,
+                    buffer+size+len,
+                    sizeof(rule->pfi.content.componentj.proto));
+                len += sizeof(rule->pfi.content.componentj.proto);
+                break;
+            case OGS_PACKET_FILTER_IPV4_REMOTE_ADDRESS_TYPE:
+            case OGS_PACKET_FILTER_IPV4_LOCAL_ADDRESS_TYPE:
+                if (size+len+
+                    sizeof(rule->pfi.content.componentj.ipv4.addr) >
+                    length) {
+                    ogs_error("PF%d Overflow: size%d len%d length%d",
+                              i, size, len, length);
+                    goto cleanup;
+                }
+                memcpy(&rule->pfi.content.componentj.ipv4.addr,
+                    buffer+size+len,
+                    sizeof(rule->pfi.content.componentj.ipv4.addr));
+                len += sizeof(rule->pfi.content.componentj.ipv4.addr);
+
+                if (size+len+
+                    sizeof(rule->pfi.content.componentj.ipv4.mask) >
+                    length) {
+                    ogs_error("PF%d Overflow: size%d len%d length%d",
+                              i, size, len, length);
+                    goto cleanup;
+                }
+                memcpy(&rule->pfi.content.componentj.ipv4.mask,
+                    buffer+size+len,
+                    sizeof(rule->pfi.content.componentj.ipv4.mask));
+                len += sizeof(rule->pfi.content.componentj.ipv4.mask);
+                break;
+            case OGS_PACKET_FILTER_IPV6_LOCAL_ADDRESS_PREFIX_LENGTH_TYPE:
+            case OGS_PACKET_FILTER_IPV6_REMOTE_ADDRESS_PREFIX_LENGTH_TYPE:
+                if (size+len+
+                    sizeof(rule->pfi.content.componentj.ipv6.addr) >
+                    length) {
+                    ogs_error("PF%d Overflow: size%d len%d length%d",
+                              i, size, len, length);
+                    goto cleanup;
+                }
+                memcpy(&rule->pfi.content.componentj.ipv6.addr,
+                    buffer+size+len,
+                    sizeof(rule->pfi.content.componentj.ipv6.addr));
+                len += sizeof(rule->pfi.content.componentj.ipv6.addr);
+
+                if (size+len+
+                    sizeof(
+                        rule->pfi.content.componentj.ipv6.prefixlen) >
+                    length) {
+                    ogs_error("PF%d Overflow: size%d len%d length%d",
+                              i, size, len, length);
+                    goto cleanup;
+                }
+                memcpy(&rule->pfi.content.componentj.ipv6.prefixlen,
+                    buffer+size+len,
+                    sizeof(
+                        rule->pfi.content.componentj.ipv6.prefixlen));
+                len += sizeof(
+                        rule->pfi.content.componentj.ipv6.prefixlen);
+                break;
+            case OGS_PACKET_FILTER_IPV6_LOCAL_ADDRESS_TYPE:
+            case OGS_PACKET_FILTER_IPV6_REMOTE_ADDRESS_TYPE:
+                if (size+len+
+                    sizeof(
+                        rule->pfi.content.componentj.ipv6_mask.addr) >
+                        length) {
+                    ogs_error("PF%d Overflow: size%d len%d length%d",
+                              i, size, len, length);
+                    goto cleanup;
+                }
+                memcpy(&rule->pfi.content.componentj.ipv6_mask.addr,
+                    buffer+size+len,
+                    sizeof(
+                        rule->pfi.content.componentj.ipv6_mask.addr));
+                len += sizeof(
+                        rule->pfi.content.componentj.ipv6_mask.addr);
+
+                if (size+len+
+                    sizeof(
+                        rule->pfi.content.componentj.ipv6_mask.mask) >
+                        length) {
+                    ogs_error("PF%d Overflow: size%d len%d length%d",
+                              i, size, len, length);
+                    goto cleanup;
+                }
+                memcpy(&rule->pfi.content.componentj.ipv6_mask.mask,
+                    buffer+size+len,
+                    sizeof(
+                        rule->pfi.content.componentj.ipv6_mask.mask));
+                len += sizeof(
+                        rule->pfi.content.componentj.ipv6_mask.mask);
+                break;
+            case OGS_PACKET_FILTER_SINGLE_LOCAL_PORT_TYPE:
+            case OGS_PACKET_FILTER_SINGLE_REMOTE_PORT_TYPE:
+                if (size+len+
+                    sizeof(rule->pfi.content.componentj.port.low) >
+                        length) {
+                    ogs_error("PF%d Overflow: size%d len%d length%d",
+                              i, size, len, length);
+                    goto cleanup;
+                }
+                memcpy(&rule->pfi.content.componentj.port.low,
+                    buffer+size+len,
+                    sizeof(rule->pfi.content.componentj.port.low));
+                rule->pfi.content.componentj.port.low =
+                    be16toh(rule->pfi.content.componentj.port.low);
+                len += sizeof(rule->pfi.content.componentj.port.low);
+                break;
+            case OGS_PACKET_FILTER_LOCAL_PORT_RANGE_TYPE:
+            case OGS_PACKET_FILTER_REMOTE_PORT_RANGE_TYPE:
+                if (size+len+
+                    sizeof(rule->pfi.content.componentj.port.low) >
+                        length) {
+                    ogs_error("PF%d Overflow: size%d len%d length%d",
+                              i, size, len, length);
+                    goto cleanup;
+                }
+                memcpy(&rule->pfi.content.componentj.port.low,
+                    buffer+size+len,
+                    sizeof(rule->pfi.content.componentj.port.low));
+                rule->pfi.content.componentj.port.low =
+                    be16toh(rule->pfi.content.componentj.port.low);
+                len += sizeof(rule->pfi.content.componentj.port.low);
+
+                if (size+len+
+                    sizeof(rule->pfi.content.componentj.port.high) >
+                        length) {
+                    ogs_error("PF%d Overflow: size%d len%d length%d",
+                              i, size, len, length);
+                    goto cleanup;
+                }
+                memcpy(&rule->pfi.content.componentj.port.high,
+                    buffer+size+len,
+                    sizeof(rule->pfi.content.componentj.port.high));
+                rule->pfi.content.componentj.port.high =
+                    be16toh(rule->pfi.content.componentj.port.high);
+                len += sizeof(rule->pfi.content.componentj.port.high);
+                break;
+            default:

open5gs_2.7.6.4747.da27.tar.xz/src/smf/gsm-build.c -> open5gs_2.7.6.4751.5939.tar.xz/src/smf/gsm-build.c Changed

open5gs_2.7.6.4747.da27.tar.xz/src/smf/gsm-handler.c -> open5gs_2.7.6.4751.5939.tar.xz/src/smf/gsm-handler.c Changed

Changes of Revision 676