Changes of Revision 226
commit_34f3faba47ec42771e0c3524e7b2f4bf24643139.txt
Deleted
commit_81a261c200d87b0ccc55a03fe46ce160624a5878.txt
Added
open5gs_2.6.4.1.34f3.dsc
Deleted
x
1
2
-Format: 3.0 (native)
3
-Source: open5gs
4
-Binary: open5gs-common, open5gs-mme, open5gs-sgwc, open5gs-smf, open5gs-amf, open5gs-sgwu, open5gs-upf, open5gs-hss, open5gs-pcrf, open5gs-nrf, open5gs-scp, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg
5
-Architecture: any
6
-Version: 2.6.4.1.34f3
7
-Maintainer: Harald Welte <laforge@gnumonks.org>
8
-Uploaders: Sukchan Lee <acetcom@gmail.com>
9
-Homepage: https://open5gs.org
10
-Standards-Version: 4.3.0
11
-Vcs-Browser: https://github.com/open5gs/open5gs
12
-Vcs-Git: git://github.com/open5gs/open5gs
13
-Build-Depends: debhelper (>= 11), git, pkg-config, meson (>= 0.43.0), cmake, flex, bison, libgnutls28-dev, libgcrypt-dev, libssl-dev, libidn11-dev, libmongoc-dev, libbson-dev, libsctp-dev, libyaml-dev, libmicrohttpd-dev, libcurl4-gnutls-dev, libnghttp2-dev, libtins-dev, libtalloc-dev
14
-Package-List:
15
- open5gs deb net optional arch=any
16
- open5gs-amf deb net optional arch=any
17
- open5gs-ausf deb net optional arch=any
18
- open5gs-bsf deb net optional arch=any
19
- open5gs-common deb net optional arch=any
20
- open5gs-dbg deb net optional arch=any
21
- open5gs-hss deb net optional arch=any
22
- open5gs-mme deb net optional arch=any
23
- open5gs-nrf deb net optional arch=any
24
- open5gs-nssf deb net optional arch=any
25
- open5gs-pcf deb net optional arch=any
26
- open5gs-pcrf deb net optional arch=any
27
- open5gs-scp deb net optional arch=any
28
- open5gs-sgwc deb net optional arch=any
29
- open5gs-sgwu deb net optional arch=any
30
- open5gs-smf deb net optional arch=any
31
- open5gs-udm deb net optional arch=any
32
- open5gs-udr deb net optional arch=any
33
- open5gs-upf deb net optional arch=any
34
-Checksums-Sha1:
35
- e9e0aafaacddb8b6fff734ba1b1b0e9bb6b7865a 14122536 open5gs_2.6.4.1.34f3.tar.xz
36
-Checksums-Sha256:
37
- 5ebe412423ee87b63bc1966d5c369582491451b69b43975774094e2a6fdfa3d0 14122536 open5gs_2.6.4.1.34f3.tar.xz
38
-Files:
39
- 472e87c1ecfd53f8a1aa5042da41bf3c 14122536 open5gs_2.6.4.1.34f3.tar.xz
40
open5gs_2.6.4.6.81a26.dsc
Added
40
1
2
+Format: 3.0 (native)
3
+Source: open5gs
4
+Binary: open5gs-common, open5gs-mme, open5gs-sgwc, open5gs-smf, open5gs-amf, open5gs-sgwu, open5gs-upf, open5gs-hss, open5gs-pcrf, open5gs-nrf, open5gs-scp, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg
5
+Architecture: any
6
+Version: 2.6.4.6.81a26
7
+Maintainer: Harald Welte <laforge@gnumonks.org>
8
+Uploaders: Sukchan Lee <acetcom@gmail.com>
9
+Homepage: https://open5gs.org
10
+Standards-Version: 4.3.0
11
+Vcs-Browser: https://github.com/open5gs/open5gs
12
+Vcs-Git: git://github.com/open5gs/open5gs
13
+Build-Depends: debhelper (>= 11), git, pkg-config, meson (>= 0.43.0), cmake, flex, bison, libgnutls28-dev, libgcrypt-dev, libssl-dev, libidn11-dev, libmongoc-dev, libbson-dev, libsctp-dev, libyaml-dev, libmicrohttpd-dev, libcurl4-gnutls-dev, libnghttp2-dev, libtins-dev, libtalloc-dev
14
+Package-List:
15
+ open5gs deb net optional arch=any
16
+ open5gs-amf deb net optional arch=any
17
+ open5gs-ausf deb net optional arch=any
18
+ open5gs-bsf deb net optional arch=any
19
+ open5gs-common deb net optional arch=any
20
+ open5gs-dbg deb net optional arch=any
21
+ open5gs-hss deb net optional arch=any
22
+ open5gs-mme deb net optional arch=any
23
+ open5gs-nrf deb net optional arch=any
24
+ open5gs-nssf deb net optional arch=any
25
+ open5gs-pcf deb net optional arch=any
26
+ open5gs-pcrf deb net optional arch=any
27
+ open5gs-scp deb net optional arch=any
28
+ open5gs-sgwc deb net optional arch=any
29
+ open5gs-sgwu deb net optional arch=any
30
+ open5gs-smf deb net optional arch=any
31
+ open5gs-udm deb net optional arch=any
32
+ open5gs-udr deb net optional arch=any
33
+ open5gs-upf deb net optional arch=any
34
+Checksums-Sha1:
35
+ 4e4896e0eb307716d873e1fa61000aad3ffa5eea 14123952 open5gs_2.6.4.6.81a26.tar.xz
36
+Checksums-Sha256:
37
+ 87bfd05699d4d0ba2ddf627f2ec9725a0180ef975af533a82f00055d6ea27bbc 14123952 open5gs_2.6.4.6.81a26.tar.xz
38
+Files:
39
+ fc48816f144154e435b2c08eb5c0c319 14123952 open5gs_2.6.4.6.81a26.tar.xz
40
open5gs_2.6.4.1.34f3.tar.xz/.tarball-version -> open5gs_2.6.4.6.81a26.tar.xz/.tarball-version
Changed
4
1
2
-2.6.4.1-34f3
3
+2.6.4.6-81a26
4
open5gs_2.6.4.1.34f3.tar.xz/debian/changelog -> open5gs_2.6.4.6.81a26.tar.xz/debian/changelog
Changed
12
1
2
-open5gs (2.6.4.1.34f3) unstable; urgency=medium
3
+open5gs (2.6.4.6.81a26) unstable; urgency=medium
4
5
* Automatically generated changelog entry for building the Osmocom master feed
6
7
- -- Osmocom OBS scripts <info@osmocom.org> Thu, 25 May 2023 12:27:09 +0000
8
+ -- Osmocom OBS scripts <info@osmocom.org> Thu, 25 May 2023 13:48:47 +0000
9
10
open5gs (2.6.4) unstable; urgency=medium
11
12
open5gs_2.6.4.1.34f3.tar.xz/lib/pfcp/context.c -> open5gs_2.6.4.6.81a26.tar.xz/lib/pfcp/context.c
Changed
10
1
2
if (ogs_app()->parameter.no_ipv6 == 0 &&
3
!self.pfcp_advertise6) {
4
ogs_copyaddrinfo(&self.pfcp_advertise6, addr);
5
- ogs_filteraddrinfo(&self.pfcp_advertise6, AF_INET);
6
+ ogs_filteraddrinfo(&self.pfcp_advertise6, AF_INET6);
7
}
8
ogs_freeaddrinfo(addr);
9
}
10
open5gs_2.6.4.1.34f3.tar.xz/lib/pfcp/conv.c -> open5gs_2.6.4.6.81a26.tar.xz/lib/pfcp/conv.c
Changed
18
1
2
return OGS_OK;
3
}
4
5
-int ogs_pfcp_sockaddr_to_f_seid(
6
- ogs_sockaddr_t *addr, ogs_sockaddr_t *addr6,
7
- ogs_pfcp_f_seid_t *f_seid, int *len)
8
+int ogs_pfcp_sockaddr_to_f_seid(ogs_pfcp_f_seid_t *f_seid, int *len)
9
{
10
const int hdr_len = 9;
11
+ ogs_sockaddr_t *advertise = ogs_pfcp_self()->pfcp_advertise;
12
+ ogs_sockaddr_t *advertise6 = ogs_pfcp_self()->pfcp_advertise6;
13
+ ogs_sockaddr_t *addr = advertise ? advertise : ogs_pfcp_self()->pfcp_addr;
14
+ ogs_sockaddr_t *addr6 = advertise6 ? advertise6 : ogs_pfcp_self()->pfcp_addr6;
15
16
ogs_assert(f_seid);
17
18
open5gs_2.6.4.1.34f3.tar.xz/lib/pfcp/conv.h -> open5gs_2.6.4.6.81a26.tar.xz/lib/pfcp/conv.h
Changed
12
1
2
3
int ogs_pfcp_f_seid_to_sockaddr(
4
ogs_pfcp_f_seid_t *f_seid, uint16_t port, ogs_sockaddr_t **list);
5
-int ogs_pfcp_sockaddr_to_f_seid(
6
- ogs_sockaddr_t *addr, ogs_sockaddr_t *addr6,
7
- ogs_pfcp_f_seid_t *f_seid, int *len);
8
+int ogs_pfcp_sockaddr_to_f_seid(ogs_pfcp_f_seid_t *f_seid, int *len);
9
int ogs_pfcp_f_seid_to_ip(ogs_pfcp_f_seid_t *f_seid, ogs_ip_t *ip);
10
11
int ogs_pfcp_sockaddr_to_f_teid(
12
open5gs_2.6.4.1.34f3.tar.xz/src/sgwc/sxa-build.c -> open5gs_2.6.4.6.81a26.tar.xz/src/sgwc/sxa-build.c
Changed
12
1
2
req->node_id.len = len;
3
4
/* F-SEID */
5
- rv = ogs_pfcp_sockaddr_to_f_seid(
6
- ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6,
7
- &f_seid, &len);
8
+ rv = ogs_pfcp_sockaddr_to_f_seid(&f_seid, &len);
9
if (rv != OGS_OK) {
10
ogs_error("ogs_pfcp_sockaddr_to_f_seid() failed");
11
ogs_free(pfcp_message);
12
open5gs_2.6.4.1.34f3.tar.xz/src/sgwu/sxa-build.c -> open5gs_2.6.4.6.81a26.tar.xz/src/sgwu/sxa-build.c
Changed
12
1
2
rsp->cause.u8 = OGS_PFCP_CAUSE_REQUEST_ACCEPTED;
3
4
/* F-SEID */
5
- rv = ogs_pfcp_sockaddr_to_f_seid(
6
- ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6,
7
- &f_seid, &len);
8
+ rv = ogs_pfcp_sockaddr_to_f_seid(&f_seid, &len);
9
if (rv != OGS_OK) {
10
ogs_error("ogs_pfcp_sockaddr_to_f_seid() failed");
11
ogs_free(pfcp_message);
12
open5gs_2.6.4.1.34f3.tar.xz/src/smf/fd-path.c -> open5gs_2.6.4.6.81a26.tar.xz/src/smf/fd-path.c
Changed
28
1
2
}
3
4
/* Append 3GPP-User-Location-Info, 3GPP TS 29.061 16.4.7.2 22 */
5
-void smf_fd_msg_avp_add_3gpp_uli(smf_sess_t *sess, struct avp *avp)
6
+void smf_fd_msg_avp_add_3gpp_uli(smf_sess_t *sess, struct msg *req)
7
{
8
struct avp *avpch1;
9
union avp_value val;
10
11
val.os.len = sess->gtp.user_location_information.len;
12
ret = fd_msg_avp_setvalue(avpch1, &val);
13
ogs_assert(ret == 0);
14
- ret = fd_msg_avp_add(avp, MSG_BRW_LAST_CHILD, avpch1);
15
+ ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avpch1);
16
ogs_assert(ret == 0);
17
return;
18
}
19
20
val.os.len = uli_len;
21
ret = fd_msg_avp_setvalue(avpch1, &val);
22
ogs_assert(ret == 0);
23
- ret = fd_msg_avp_add(avp, MSG_BRW_LAST_CHILD, avpch1);
24
+ ret = fd_msg_avp_add(req, MSG_BRW_LAST_CHILD, avpch1);
25
ogs_assert(ret == 0);
26
27
}
28
open5gs_2.6.4.1.34f3.tar.xz/src/smf/fd-path.h -> open5gs_2.6.4.6.81a26.tar.xz/src/smf/fd-path.h
Changed
10
1
2
void smf_s6b_send_aar(smf_sess_t *sess, ogs_gtp_xact_t *xact);
3
void smf_s6b_send_str(smf_sess_t *sess, ogs_gtp_xact_t *xact, uint32_t cause);
4
5
-void smf_fd_msg_avp_add_3gpp_uli(smf_sess_t *sess, struct avp *avp);
6
+void smf_fd_msg_avp_add_3gpp_uli(smf_sess_t *sess, struct msg *req);
7
8
#ifdef __cplusplus
9
}
10
open5gs_2.6.4.1.34f3.tar.xz/src/smf/gx-path.c -> open5gs_2.6.4.6.81a26.tar.xz/src/smf/gx-path.c
Changed
10
1
2
ogs_assert(ret == 0);
3
4
/* 3GPP-User-Location-Info, 3GPP TS 29.061 16.4.7.2 22 */
5
- smf_fd_msg_avp_add_3gpp_uli(sess, avpch1);
6
+ smf_fd_msg_avp_add_3gpp_uli(sess, req);
7
8
/* Set 3GPP-MS-Timezone */
9
if (sess->gtp.ue_timezone.presence &&
10
open5gs_2.6.4.1.34f3.tar.xz/src/smf/gy-path.c -> open5gs_2.6.4.6.81a26.tar.xz/src/smf/gy-path.c
Changed
10
1
2
}
3
4
/* 3GPP-User-Location-Info, 3GPP TS 29.061 16.4.7.2 22 */
5
- smf_fd_msg_avp_add_3gpp_uli(sess, avpch1);
6
+ smf_fd_msg_avp_add_3gpp_uli(sess, req);
7
8
if (sess->smf_ue->imeisv_len > 0) {
9
/* User-Equipment-Info, 3GPP TS 32.299 7.1.17 */
10
open5gs_2.6.4.1.34f3.tar.xz/src/smf/metrics.c -> open5gs_2.6.4.6.81a26.tar.xz/src/smf/metrics.c
Changed
57
1
2
.num_labels = OGS_ARRAY_SIZE(labels_slice), \
3
.labels = labels_slice, \
4
},
5
+#define SMF_METR_BY_SLICE_CTR_ENTRY(_id, _name, _desc) \
6
+ _id = { \
7
+ .type = OGS_METRICS_METRIC_TYPE_COUNTER, \
8
+ .name = _name, \
9
+ .description = _desc, \
10
+ .num_labels = OGS_ARRAY_SIZE(labels_slice), \
11
+ .labels = labels_slice, \
12
+ },
13
ogs_metrics_spec_t *smf_metrics_spec_by_slice_SMF_METR_BY_SLICE_MAX;
14
ogs_hash_t *metrics_hash_by_slice = NULL; /* hash table for SLICE labels */
15
smf_metrics_spec_def_t smf_metrics_spec_def_by_slice_SMF_METR_BY_SLICE_MAX = {
16
17
SMF_METR_GAUGE_SM_SESSIONNBR,
18
"fivegs_smffunction_sm_sessionnbr",
19
"Active Sessions")
20
+SMF_METR_BY_SLICE_CTR_ENTRY(
21
+ SMF_METR_CTR_SM_PDUSESSIONCREATIONREQ,
22
+ "fivegs_smffunction_sm_pdusessioncreationreq",
23
+ "Number of PDU sessions requested to be created by the SMF")
24
+SMF_METR_BY_SLICE_CTR_ENTRY(
25
+ SMF_METR_CTR_SM_PDUSESSIONCREATIONSUCC,
26
+ "fivegs_smffunction_sm_pdusessioncreationsucc",
27
+ "Number of PDU sessions successfully created by the SMF")
28
};
29
void smf_metrics_init_by_slice(void);
30
int smf_metrics_free_inst_by_slice(ogs_metrics_inst_t **inst);
31
32
SMF_METR_CTR_SM_N4SESSIONESTABFAIL,
33
"fivegs_smffunction_sm_n4sessionestabfail",
34
"Number of failed N4 session establishments evidented by SMF")
35
+SMF_METR_BY_CAUSE_CTR_ENTRY(
36
+ SMF_METR_CTR_SM_PDUSESSIONCREATIONFAIL,
37
+ "fivegs_smffunction_sm_pdusessioncreationfail",
38
+ "Number of PDU sessions failed to be created by the SMF")
39
};
40
void smf_metrics_init_by_cause(void);
41
int smf_metrics_free_inst_by_cause(ogs_metrics_inst_t **inst);
42
typedef struct smf_metric_key_by_cause_s {
43
- uint8_t cause;
44
+ int cause;
45
smf_metric_type_by_cause_t t;
46
} smf_metric_key_by_cause_t;
47
48
49
ogs_assert(metrics_hash_by_cause);
50
}
51
52
-void smf_metrics_inst_by_cause_add(uint8_t cause,
53
+void smf_metrics_inst_by_cause_add(int cause,
54
smf_metric_type_by_cause_t t, int val)
55
{
56
ogs_metrics_inst_t *metrics = NULL;
57
open5gs_2.6.4.1.34f3.tar.xz/src/smf/metrics.h -> open5gs_2.6.4.6.81a26.tar.xz/src/smf/metrics.h
Changed
24
1
2
/* BY SLICE */
3
typedef enum smf_metric_type_by_slice_s {
4
SMF_METR_GAUGE_SM_SESSIONNBR = 0,
5
+ SMF_METR_CTR_SM_PDUSESSIONCREATIONREQ,
6
+ SMF_METR_CTR_SM_PDUSESSIONCREATIONSUCC,
7
_SMF_METR_BY_SLICE_MAX,
8
} smf_metric_type_by_slice_t;
9
10
11
/* BY CAUSE */
12
typedef enum smf_metric_type_by_cause_s {
13
SMF_METR_CTR_SM_N4SESSIONESTABFAIL = 0,
14
+ SMF_METR_CTR_SM_PDUSESSIONCREATIONFAIL,
15
_SMF_METR_BY_CAUSE_MAX,
16
} smf_metric_type_by_cause_t;
17
18
void smf_metrics_inst_by_cause_add(
19
- uint8_t cause, smf_metric_type_by_cause_t t, int val);
20
+ int cause, smf_metric_type_by_cause_t t, int val);
21
void smf_metrics_init(void);
22
void smf_metrics_final(void);
23
24
open5gs_2.6.4.1.34f3.tar.xz/src/smf/n4-build.c -> open5gs_2.6.4.6.81a26.tar.xz/src/smf/n4-build.c
Changed
12
1
2
req->node_id.len = len;
3
4
/* F-SEID */
5
- rv = ogs_pfcp_sockaddr_to_f_seid(
6
- ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6,
7
- &f_seid, &len);
8
+ rv = ogs_pfcp_sockaddr_to_f_seid(&f_seid, &len);
9
if (rv != OGS_OK) {
10
ogs_error("ogs_pfcp_sockaddr_to_f_seid() failed");
11
ogs_free(pfcp_message);
12
open5gs_2.6.4.1.34f3.tar.xz/src/smf/nsmf-handler.c -> open5gs_2.6.4.6.81a26.tar.xz/src/smf/nsmf-handler.c
Changed
10
1
2
3
smf_metrics_inst_by_slice_add(&sess->plmn_id, &sess->s_nssai,
4
SMF_METR_GAUGE_SM_SESSIONNBR, 1);
5
+ smf_metrics_inst_by_slice_add(&sess->plmn_id, &sess->s_nssai,
6
+ SMF_METR_CTR_SM_PDUSESSIONCREATIONREQ, 1);
7
8
if (sess->sm_context_status_uri)
9
ogs_free(sess->sm_context_status_uri);
10
open5gs_2.6.4.1.34f3.tar.xz/src/smf/nudm-handler.c -> open5gs_2.6.4.6.81a26.tar.xz/src/smf/nudm-handler.c
Changed
11
1
2
ogs_assert(response);
3
ogs_assert(true == ogs_sbi_server_send_response(stream, response));
4
5
+ smf_metrics_inst_by_slice_add(&sess->plmn_id, &sess->s_nssai,
6
+ SMF_METR_CTR_SM_PDUSESSIONCREATIONSUCC, 1);
7
+
8
ogs_free(sendmsg.http.location);
9
10
r = smf_sbi_discover_and_send(
11
open5gs_2.6.4.1.34f3.tar.xz/src/smf/sbi-path.c -> open5gs_2.6.4.6.81a26.tar.xz/src/smf/sbi-path.c
Changed
11
1
2
ogs_assert(response);
3
ogs_assert(true == ogs_sbi_server_send_response(stream, response));
4
5
+ smf_metrics_inst_by_cause_add(problem.status,
6
+ SMF_METR_CTR_SM_PDUSESSIONCREATIONFAIL, 1);
7
+
8
if (n1smbuf)
9
ogs_pkbuf_free(n1smbuf);
10
}
11
open5gs_2.6.4.1.34f3.tar.xz/src/smf/smf-sm.c -> open5gs_2.6.4.6.81a26.tar.xz/src/smf/smf-sm.c
Changed
11
1
2
DEFAULT
3
sess = smf_sess_add_by_sbi_message(&sbi_message);
4
ogs_assert(sess);
5
+
6
+ smf_metrics_inst_by_slice_add(NULL, NULL,
7
+ SMF_METR_CTR_SM_PDUSESSIONCREATIONREQ, 1);
8
END
9
break;
10
11
open5gs_2.6.4.1.34f3.tar.xz/src/upf/n4-build.c -> open5gs_2.6.4.6.81a26.tar.xz/src/upf/n4-build.c
Changed
12
1
2
rsp->cause.u8 = OGS_PFCP_CAUSE_REQUEST_ACCEPTED;
3
4
/* F-SEID */
5
- ogs_pfcp_sockaddr_to_f_seid(
6
- ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6,
7
- &f_seid, &len);
8
+ ogs_pfcp_sockaddr_to_f_seid(&f_seid, &len);
9
f_seid.seid = htobe64(sess->upf_n4_seid);
10
rsp->up_f_seid.presence = 1;
11
rsp->up_f_seid.data = &f_seid;
12
open5gs_2.6.4.1.34f3.tar.xz/tests/fuzzing/gtp-message-fuzz.c -> open5gs_2.6.4.6.81a26.tar.xz/tests/fuzzing/gtp-message-fuzz.c
Changed
32
1
2
#define kMaxInputLength 1024
3
4
extern int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
5
-{ /* open5gs/tests/unit/gtp-message-test.c */
6
+{ /* open5gs/tests/non3gpp/gtp-path.c */
7
8
if (Size < kMinInputLength || Size > kMaxInputLength) {
9
return 1;
10
11
ogs_log_install_domain(&__ogs_tlv_domain, "tlv", OGS_LOG_NONE);
12
}
13
14
- int result;
15
ogs_pkbuf_t *pkbuf;
16
- ogs_gtp2_create_session_request_t req;
17
-
18
pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN);
19
+
20
if (pkbuf == NULL) {
21
return 1;
22
}
23
-
24
ogs_pkbuf_put_data(pkbuf, Data, Size);
25
26
- ogs_tlv_parse_msg(&req, &ogs_gtp2_tlv_desc_create_session_request, pkbuf, OGS_TLV_MODE_T1_L2_I1);
27
+ ogs_gtp2_message_t gtp_message;
28
+ ogs_gtp2_parse_msg(>p_message, pkbuf);
29
30
ogs_pkbuf_free(pkbuf);
31
32