fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/29562 )
Change subject: mncc: move MNCC_F_ALL from mncc.c to mncc.h
......................................................................
mncc: move MNCC_F_ALL from mncc.c to mncc.h
Move it closer to the other MNCC_F_* entries, so that it's more
likely that it gets updated when new flags are added.
Change-Id: If1a12a696b87184c9eee14f475594c317927427b
Related: OS#5282
---
M include/osmocom/msc/mncc.h
M src/libmsc/mncc.c
2 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
keith: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Objections:
pespin: I would prefer this is not merged as is
diff --git a/include/osmocom/msc/mncc.h b/include/osmocom/msc/mncc.h
index 06a5dcc..8a1e4ad 100644
--- a/include/osmocom/msc/mncc.h
+++ b/include/osmocom/msc/mncc.h
@@ -126,6 +126,9 @@
#define MNCC_F_SIGNAL 0x2000
#define MNCC_F_GCR 0x4000
+/* UPDATEME when adding new MNCC_F_* entries above */
+#define MNCC_F_ALL 0x7fff
+
struct gsm_mncc {
/* context based information */
uint32_t msg_type;
diff --git a/src/libmsc/mncc.c b/src/libmsc/mncc.c
index f446f98..24e79a7 100644
--- a/src/libmsc/mncc.c
+++ b/src/libmsc/mncc.c
@@ -110,8 +110,6 @@
* MNCC validation code. Move to libosmocore once headers are merged
************************************************************************/
-#define MNCC_F_ALL 0x7fff
-
static int check_string_terminated(const char *str, unsigned int size)
{
int i;
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29562
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: If1a12a696b87184c9eee14f475594c317927427b
Gerrit-Change-Number: 29562
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: keith <keith(a)rhizomatica.org>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29564 )
Change subject: ggsn: Fix TC_gy_charging_volume_quota_threshold expectations
......................................................................
ggsn: Fix TC_gy_charging_volume_quota_threshold expectations
in Diameter, the CC-Input/Output direction is defined as follows in
RFC4006:
"""
8.24. CC-Input-Octets AVP
The CC-Input-Octets AVP (AVP Code 412) is of type Unsigned64 and
contains the number of requested, granted, or used octets that can
be/have been received from the end user.
8.25. CC-Output-Octets AVP
The CC-Output-Octets AVP (AVP Code 414) is of type Unsigned64 and
contains the number of requested, granted, or used octets that can
be/have been sent to the end user.
"""
So:
* 3GPP uplink is from end user to PGW, and hence 'CC-Input-Octets'
* 3GPP downlink is to end user to PGW, and hence 'CC-Output-Octets'
This test started failing a few days ago since a bug was recently
fixed in open5gs which was swapping the counters in open5gs-upfd:
https://github.com/open5gs/open5gs/pull/1793https://github.com/open5gs/open5gs/commit/f72a1edc6ed35cf5289243d660a73beb0…
Change-Id: I2f64649ce70d85634f14b84eff98731f7711cbad
---
M ggsn_tests/GGSN_Tests.ttcn
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn
index 0a3bad0..21fdec7 100644
--- a/ggsn_tests/GGSN_Tests.ttcn
+++ b/ggsn_tests/GGSN_Tests.ttcn
@@ -2465,11 +2465,11 @@
"TImeout waiting for Gy UPDATE triggered by Volume-Quota-Threshold");
}
}
- f_validate_gy_cc_report(g_rx_gy, THRESHOLD, (0..6), 0, (1200..1400));
+ f_validate_gy_cc_report(g_rx_gy, THRESHOLD, (0..6), (1200..1400), 0);
/* ICMP Resp (echo back) generates one report: */
as_DIA_Gy_CCR(ctx, UPDATE_REQUEST);
- f_validate_gy_cc_report(g_rx_gy, THRESHOLD, (0..1), (1200..1400), 0);
+ f_validate_gy_cc_report(g_rx_gy, THRESHOLD, (0..1), 0, (1200..1400));
/* Second update: 0 ul/dl pkt/octet should be reported, since nothing was sent */
as_DIA_Gy_CCR(ctx, UPDATE_REQUEST);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29564
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I2f64649ce70d85634f14b84eff98731f7711cbad
Gerrit-Change-Number: 29564
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged