September 2025 - gerrit-log - lists.osmocom.org

[L] Change in ...osmo-epdg[master]: dia/diameter_3ggp_ts32_299.dia: Inherit RFC4005 instead of RFC7155

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/41014?usp=email ) Change subject: dia/diameter_3ggp_ts32_299.dia: Inherit RFC4005 instead of RFC7155 ...................................................................... dia/diameter_3ggp_ts32_299.dia: Inherit RFC4005 instead of RFC7155 While it's true that RFC7155 obsolets RFC4005, latest release 18.0.1 of 3GPP TS 32.299 explicitly references RFC4005 and never RFC7155. Since they are both incompatible, inherit the referenced RFC4005. Same goes for 3GPP TS 29.273, but since we actually doesn't really use it in the subset defined there, simply drop it. As a result, nobody is using rfc7155.dia related stuff, so we can drop it. Change-Id: I7742d1523026e260b8501550977a41ebd3ad1b09 --- M dia/diameter_3gpp_ts29_273_swx.dia M dia/diameter_3gpp_ts32_299.dia D dia/diameter_rfc7155.dia D dia/diameter_rfc7155_nasreq.dia 4 files changed, 1 insertion(+), 408 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/14/41014/1 diff --git a/dia/diameter_3gpp_ts29_273_swx.dia b/dia/diameter_3gpp_ts29_273_swx.dia index 890aa4e..6db8958 100644 --- a/dia/diameter_3gpp_ts29_273_swx.dia +++ b/dia/diameter_3gpp_ts29_273_swx.dia @@ -47,7 +47,6 @@ @inherits diameter_rfc5447 @inherits diameter_rfc5580 @inherits diameter_rfc5778 -@inherits diameter_rfc7155 @inherits diameter_rfc7683 @inherits diameter_rfc7944 @inherits diameter_rfc8583 diff --git a/dia/diameter_3gpp_ts32_299.dia b/dia/diameter_3gpp_ts32_299.dia index a845ad7..d6b020c 100644 --- a/dia/diameter_3gpp_ts32_299.dia +++ b/dia/diameter_3gpp_ts32_299.dia @@ -25,7 +25,7 @@ @inherits diameter_gen_base_rfc6733 @inherits diameter_gen_acct_rfc6733 -@inherits diameter_rfc7155_nasreq +@inherits diameter_rfc4005_nasreq @inherits diameter_rfc4006_cc @inherits diameter_etsi_es283_034 @inherits diameter_3gpp_base diff --git a/dia/diameter_rfc7155.dia b/dia/diameter_rfc7155.dia deleted file mode 100644 index dabee98..0000000 --- a/dia/diameter_rfc7155.dia +++ /dev/null @@ -1,44 +0,0 @@ - -;; Copyright 2017, Travelping GmbH <info(a)travelping.com> - -;; This program is free software; you can redistribute it and/or -;; modify it under the terms of the GNU General Public License -;; as published by the Free Software Foundation; either version -;; 2 of the License, or (at your option) any later version. - -;; -;; RFC 7155, Diameter Network Access Server Application -;; -;; -;; Edits: -;; -;; - Framed-Appletalk-Link -> Framed-AppleTalk-Link -;; - Framed-Appletalk-Network -> Framed-AppleTalk-Network -;; - Framed-Appletalk-Zone -> Framed-AppleTalk-Zone -;; - -@id 1 -@name diameter_rfc7155 -@prefix diameter -@vendor 0 IETF - -@inherits diameter_gen_base_rfc6733 - -@avp_types - - Framed-AppleTalk-Link 37 Unsigned32 M - Framed-AppleTalk-Network 38 Unsigned32 M - Framed-AppleTalk-Zone 39 OctetString M - Framed-Compression 13 Enumerated M - Framed-IP-Address 8 OctetString M - Framed-IP-Netmask 9 OctetString M - Framed-IPX-Network 23 Unsigned32 M - Framed-IPv6-Pool 100 OctetString M - Framed-IPv6-Prefix 97 OctetString M - Framed-IPv6-Route 99 UTF8String M - Framed-Interface-Id 96 Unsigned64 M - Framed-MTU 12 Unsigned32 M - Framed-Pool 88 OctetString M - Framed-Protocol 7 Enumerated M - Framed-Route 22 UTF8String M - Framed-Routing 10 Enumerated M diff --git a/dia/diameter_rfc7155_nasreq.dia b/dia/diameter_rfc7155_nasreq.dia deleted file mode 100644 index 7f09512..0000000 --- a/dia/diameter_rfc7155_nasreq.dia +++ /dev/null @@ -1,362 +0,0 @@ -;; Copyright 2017, Travelping GmbH <info(a)travelping.com> - -;; This program is free software; you can redistribute it and/or -;; modify it under the terms of the GNU General Public License -;; as published by the Free Software Foundation; either version -;; 2 of the License, or (at your option) any later version. - -;; -;; RFC 7155, Diameter Network Access Server Application -;; -;; -;; Edits: -;; -;; - Framed-Appletalk-Link -> Framed-AppleTalk-Link -;; - Framed-Appletalk-Network -> Framed-AppleTalk-Network -;; - Framed-Appletalk-Zone -> Framed-AppleTalk-Zone -;; - -@id 1 -@name diameter_rfc7155_nasreq -@prefix diameter_nasreq -@vendor 0 IETF - -@inherits diameter_gen_base_rfc6733 -@inherits diameter_rfc7155 - -@avp_types - - Accounting-Auth-Method 406 Enumerated M - Accounting-Input-Octets 363 Unsigned64 M - Accounting-Input-Packets 365 Unsigned64 M - Accounting-Output-Octets 364 Unsigned64 M - Accounting-Output-Packets 366 Unsigned64 M - Acct-Authentic 45 Enumerated M - Acct-Delay-Time 41 Unsigned32 M - Acct-Link-Count 51 Unsigned32 M - Acct-Session-Time 46 Unsigned32 M - Acct-Tunnel-Connection 68 OctetString M - Acct-Tunnel-Packets-Lost 86 Unsigned32 M - Callback-Id 20 UTF8String M - Callback-Number 19 UTF8String M - Called-Station-Id 30 UTF8String M - Calling-Station-Id 31 UTF8String M - Connect-Info 77 UTF8String M - Filter-Id 11 UTF8String M - Idle-Timeout 28 Unsigned32 M - Login-IP-Host 14 OctetString M - Login-IPv6-Host 98 OctetString M - Login-LAT-Group 36 OctetString M - Login-LAT-Node 35 OctetString M - Login-LAT-Port 63 OctetString M - Login-LAT-Service 34 OctetString M - Login-Service 15 Enumerated M - Login-TCP-Port 16 Unsigned32 M - NAS-Filter-Rule 400 IPFilterRule M - NAS-IP-Address 4 OctetString M - NAS-IPv6-Address 95 OctetString M - NAS-Identifier 32 UTF8String M - NAS-Port 5 Unsigned32 M - NAS-Port-Id 87 UTF8String M - NAS-Port-Type 61 Enumerated M - Origin-AAA-Protocol 408 Enumerated M - Originating-Line-Info 94 OctetString M - Port-Limit 62 Unsigned32 M - QoS-Filter-Rule 407 QoSFilterRule M - Service-Type 6 Enumerated M - Tunnel-Assignment-Id 82 OctetString M - Tunnel-Client-Auth-Id 90 UTF8String M - Tunnel-Client-Endpoint 66 UTF8String M - Tunnel-Medium-Type 65 Enumerated M - Tunnel-Password 69 OctetString M - Tunnel-Preference 83 Unsigned32 M - Tunnel-Private-Group-Id 81 OctetString M - Tunnel-Server-Auth-Id 91 UTF8String M - Tunnel-Server-Endpoint 67 UTF8String M - Tunnel-Type 64 Enumerated M - Tunneling 401 Grouped M - -@messages - - ACR ::= <Diameter Header: 271, REQ, PXY> - < Session-Id > - { Origin-Host } - { Origin-Realm } - { Destination-Realm } - { Accounting-Record-Type } - { Accounting-Record-Number } - { Acct-Application-Id } - [ User-Name ] - [ Accounting-Sub-Session-Id ] - [ Acct-Session-Id ] - [ Acct-Multi-Session-Id ] - [ Origin-AAA-Protocol ] - [ Origin-State-Id ] - [ Destination-Host ] - [ Event-Timestamp ] - [ Acct-Delay-Time ] - [ NAS-Identifier ] - [ NAS-IP-Address ] - [ NAS-IPv6-Address ] - [ NAS-Port ] - [ NAS-Port-Id ] - [ NAS-Port-Type ] - * [ Class ] - [ Service-Type ] - [ Termination-Cause ] - [ Accounting-Input-Octets ] - [ Accounting-Input-Packets ] - [ Accounting-Output-Octets ] - [ Accounting-Output-Packets ] - [ Acct-Authentic ] - [ Accounting-Auth-Method ] - [ Acct-Link-Count ] - [ Acct-Session-Time ] - [ Acct-Tunnel-Connection ] - [ Acct-Tunnel-Packets-Lost ] - [ Callback-Id ] - [ Callback-Number ] - [ Called-Station-Id ] - [ Calling-Station-Id ] - * [ Connect-Info ] - [ Originating-Line-Info ] - [ Authorization-Lifetime ] - [ Session-Timeout ] - [ Idle-Timeout ] - [ Port-Limit ] - [ Accounting-Realtime-Required ] - [ Acct-Interim-Interval ] - * [ Filter-Id ] - * [ NAS-Filter-Rule ] - * [ QoS-Filter-Rule ] - [ Framed-AppleTalk-Link ] - [ Framed-AppleTalk-Network ] - [ Framed-AppleTalk-Zone ] - [ Framed-Compression ] - [ Framed-Interface-Id ] - [ Framed-IP-Address ] - [ Framed-IP-Netmask ] - * [ Framed-IPv6-Prefix ] - [ Framed-IPv6-Pool ] - * [ Framed-IPv6-Route ] - [ Framed-IPX-Network ] - [ Framed-MTU ] - [ Framed-Pool ] - [ Framed-Protocol ] - * [ Framed-Route ] - [ Framed-Routing ] - * [ Login-IP-Host ] - * [ Login-IPv6-Host ] - [ Login-LAT-Group ] - [ Login-LAT-Node ] - [ Login-LAT-Port ] - [ Login-LAT-Service ] - [ Login-Service ] - [ Login-TCP-Port ] - * [ Tunneling ] - * [ Proxy-Info ] - * [ Route-Record ] - * [ AVP ] - - ACA ::= <Diameter Header: 271, PXY> - < Session-Id > - { Result-Code } - { Origin-Host } - { Origin-Realm } - { Accounting-Record-Type } - { Accounting-Record-Number } - { Acct-Application-Id } - [ User-Name ] - [ Accounting-Sub-Session-Id ] - [ Acct-Session-Id ] - [ Acct-Multi-Session-Id ] - [ Event-Timestamp ] - [ Error-Message ] - [ Error-Reporting-Host ] - * [ Failed-AVP ] - [ Origin-AAA-Protocol ] - [ Origin-State-Id ] - [ NAS-Identifier ] - [ NAS-IP-Address ] - [ NAS-IPv6-Address ] - [ NAS-Port ] - [ NAS-Port-Id ] - [ NAS-Port-Type ] - [ Service-Type ] - [ Termination-Cause ] - [ Accounting-Realtime-Required ] - [ Acct-Interim-Interval ] - * [ Class ] - * [ Proxy-Info ] - * [ AVP ] - -@enum Service-Type - - UNKNOWN 0 - LOGIN 1 - FRAMED 2 - CALLBACK_LOGIN 3 - CALLBACK_FRAMED 4 - OUTBOUND 5 - ADMINISTRATIVE 6 - NAS_PROMPT 7 - AUTHENTICATE_ONLY 8 - CALLBACK_NAS_PROMPT 9 - CALL_CHECK 10 - CALLBACK_ADMINISTRATIVE 11 - VOICE 12 - FAX 13 - MODEM_RELAY 14 - IAPP_REGISTER 15 - IAPP_AP_CHECK 16 - AUTHORIZE_ONLY 17 - FRAMED_MANAGEMENT 18 - -@enum Framed-Protocol - - PPP 1 - SLIP 2 - ARAP 3 - GANDALF 4 - XYLOGICS 5 - X_75 6 - GPRS_PDP_CONTEXT 7 - ASCEND_ARA 255 - MPP 256 - EURAW 257 - EUUI 258 - X25 259 - COMB 260 - FR 261 - -@enum Framed-Routing - - NONE 0 - SEND_ROUTING_PACKETS 1 - LISTEN_FOR_ROUTING_PACKETS 2 - SEND_AND_LISTEN 3 - -@enum Framed-Compression - - NONE 0 - IPX_HEADER_COMPRESSION 2 - STAC_LZS_COMPRESSION 3 - -@enum Login-Service - - TELNET 0 - RLOGIN 1 - TCP_CLEAR 2 - PORTMASTER 3 - LAT 4 - X25_PAD 5 - X25_T3POS 6 - UNASSIGNED 7 - -@enum Acct-Authentic - - NONE 0 - RADIUS 1 - LOCAL 2 - REMOTE 3 - DIAMETER 4 - -@enum NAS-Port-Type - - ASYNC 0 - SYNC 1 - ISDN_SYNC 2 - ISDN_ASYNC_V120 3 - ISDN_ASYNC_V110 4 - VIRTUAL 5 - PIAFS 6 - HDLC_CLEAR_CHANNEL 7 - X25 8 - X75 9 - G_3_FAX 10 - SDSL_SYMMETRIC_DSL 11 - IDSL_ISDN_DIGITAL_SUBSCRIBER_LINE 14 - ETHERNET 15 - XDSL_DIGITAL_SUBSCRIBER_LINE_OF_UNKNOWN_TYPE 16 - CABLE 17 - WIRELESS_OTHER 18 - WIRELESS_IEEE_802_11 19 - TOKEN_RING 20 - FDDI 21 - WIRELESS_CDMA2000 22 - WIRELESS_UMTS 23 - WIRELESS_1X_EV 24 - IAPP 25 - FTTP_FIBER_TO_THE_PREMISES 26 - WIRELESS_IEEE_802_16 27 - WIRELESS_IEEE_802_20 28 - WIRELESS_IEEE_802_22 29 - PPPOA_PPP_OVER_ATM 30 - PPPOEOA_PPP_OVER_ETHERNET_OVER_ATM 31 - PPPOEOE_PPP_OVER_ETHERNET_OVER_ETHERNET 32 - PPPOEOVLAN_PPP_OVER_ETHERNET_OVER_VLAN 33 - PPPOEOQINQ_PPP_OVER_ETHERNET_OVER_IEEE_802_1QINQ 34 - XPON_PASSIVE_OPTICAL_NETWORK 35 - WIRELESS_XGP 36 - -@enum Tunnel-Type - - PPTP 1 - L2F 2 - L2TP 3 - ATMP 4 - VTP 5 - AH 6 - IP_IP_ENCAP 7 - MIN_IP_IP 8 - ESP 9 - GRE 10 - DVS 11 - IP_IN_IP_TUNNELING 12 - VLAN 13 - -@enum Tunnel-Medium-Type - - IPV4 1 - IPV6 2 - NSAP 3 - HDLC 4 - BBN 5 - IEEE_802 6 - E_163 7 - E_164 8 - F_69 9 - X_121 10 - IPX 11 - APPLETALK_802 12 - DECNET4 13 - VINES 14 - E_164_NSAP 15 - -@enum Accounting-Auth-Method - - PAP 1 - CHAP 2 - MS_CHAP_1 3 - MS_CHAP_2 4 - EAP 5 - UNDEFINED 6 - NONE 7 - -@enum Origin-AAA-Protocol - - RADIUS 1 - -@grouped - - Tunneling ::= <AVP Header: 401> - { Tunnel-Type } - { Tunnel-Medium-Type } - { Tunnel-Client-Endpoint } - { Tunnel-Server-Endpoint } - [ Tunnel-Preference ] - [ Tunnel-Client-Auth-Id ] - [ Tunnel-Server-Auth-Id ] - [ Tunnel-Assignment-Id ] - [ Tunnel-Password ] - [ Tunnel-Private-Group-Id ] -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/41014?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I7742d1523026e260b8501550977a41ebd3ad1b09 Gerrit-Change-Number: 41014 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 weeks, 4 days

1
0
0 0

[XS] Change in ...osmo-epdg[master]: dia: restrict AVPs inherited from RFC4005

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/41015?usp=email ) Change subject: dia: restrict AVPs inherited from RFC4005 ...................................................................... dia: restrict AVPs inherited from RFC4005 Otherwise the "Service-Type" AVP is inherited and then may cause third modules indirectly inheriting to collide with their own "Service-Type" AVP. Change-Id: I8066303b766c3f9c40de7bc727e20c7f5f5e3ebc fiiiix nasreq Change-Id: Ibc11180489db6d86819ab17a5e7e92636dfed95e --- M dia/diameter_3gpp_ts29_212.dia M dia/diameter_3gpp_ts29_229.dia M dia/diameter_3gpp_ts32_299.dia M dia/diameter_rfc4072.dia 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/15/41015/1 diff --git a/dia/diameter_3gpp_ts29_212.dia b/dia/diameter_3gpp_ts29_212.dia index 031e64d..40417fc 100644 --- a/dia/diameter_3gpp_ts29_212.dia +++ b/dia/diameter_3gpp_ts29_212.dia @@ -30,7 +30,7 @@ @vendor 10415 3GPP @inherits diameter_gen_base_rfc6733 -@inherits diameter_rfc4005_nasreq +@inherits diameter_rfc4005_nasreq Framed-IP-Address Framed-IPv6-Prefix Called-Station-Id @inherits diameter_rfc4006_cc @inherits diameter_3gpp_base @inherits diameter_etsi_es283_034 diff --git a/dia/diameter_3gpp_ts29_229.dia b/dia/diameter_3gpp_ts29_229.dia index 62ac31f..c9f888c 100644 --- a/dia/diameter_3gpp_ts29_229.dia +++ b/dia/diameter_3gpp_ts29_229.dia @@ -25,7 +25,7 @@ @inherits diameter_gen_base_rfc6733 @inherits diameter_etsi_es283_035 Line-Identifier -@inherits diameter_rfc4005_nasreq +@inherits diameter_rfc4005_nasreq Framed-Interface-Id Framed-IP-Address Framed-IPv6-Prefix ;; only attributes required by other applications are defined diff --git a/dia/diameter_3gpp_ts32_299.dia b/dia/diameter_3gpp_ts32_299.dia index d6b020c..eee540c 100644 --- a/dia/diameter_3gpp_ts32_299.dia +++ b/dia/diameter_3gpp_ts32_299.dia @@ -25,7 +25,7 @@ @inherits diameter_gen_base_rfc6733 @inherits diameter_gen_acct_rfc6733 -@inherits diameter_rfc4005_nasreq +@inherits diameter_rfc4005_nasreq Accounting-Input-Octets Accounting-Output-Octets Called-Station-Id @inherits diameter_rfc4006_cc @inherits diameter_etsi_es283_034 @inherits diameter_3gpp_base diff --git a/dia/diameter_rfc4072.dia b/dia/diameter_rfc4072.dia index ad79346..bec33e2 100644 --- a/dia/diameter_rfc4072.dia +++ b/dia/diameter_rfc4072.dia @@ -25,7 +25,7 @@ @id 1 @inherits diameter_gen_base_rfc6733 -@inherits diameter_rfc4005_nasreq +@inherits diameter_rfc4005_nasreq Callback-Id Callback-Number Called-Station-Id Calling-Station-Id Configuration-Token Connect-Info Framed-AppleTalk-Link Framed-AppleTalk-Network Framed-AppleTalk-Zone Framed-Compression Framed-Interface-Id Framed-IP-Address Framed-IP-Netmask Framed-IPv6-Pool Framed-IPv6-Prefix Framed-IPv6-Route Framed-IPX-Network Framed-MTU Framed-Pool Framed-Protocol Framed-Route Framed-Routing Filter-Id Idle-Timeout NAS-Filter-Rule NAS-Identifier NAS-IP-Address NAS-IPv6-Address NAS-Port NAS-Port-Id NAS-Port-Type Originating-Line-Info Port-Limit QoS-Filter-Rule Reply-Message Service-Type State Tunneling ;; =========================================================================== -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/41015?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ibc11180489db6d86819ab17a5e7e92636dfed95e Gerrit-Change-Number: 41015 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 weeks, 4 days

1
0
0 0

[S] Change in ...osmo-epdg[master]: Remove duplicate 3GPP-AAA-Server-Name definition and break 3-way circ...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/41016?usp=email ) Change subject: Remove duplicate 3GPP-AAA-Server-Name definition and break 3-way circular dependency ...................................................................... Remove duplicate 3GPP-AAA-Server-Name definition and break 3-way circular dependency 3GPP-AAA-Server-Name is from TS 29.273, so avoid re-defining the type in TS29.173. As a result, a 3-way dependency is created, and hence it is broken by moving GMLC-Address to the break_circle.dia used for that purpose. The 3-way circular dependency: * TS29.173 uses 3GPP-AAA-Server-Name from TS29.273 * TS29.273 uses Trace-Data from TS29.272 * TS29.272 uses GMLC-Address from TS29.173 Change-Id: Idb1a7f7588b751c59788e4d99cd1d86f1fd2b573 --- M dia/diameter_3gpp_break_circles.dia M dia/diameter_3gpp_ts29_173.dia M dia/diameter_3gpp_ts29_272.dia M dia/diameter_3gpp_ts29_273.dia 4 files changed, 8 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/16/41016/1 diff --git a/dia/diameter_3gpp_break_circles.dia b/dia/diameter_3gpp_break_circles.dia index e5f49e0..a3bea6f 100644 --- a/dia/diameter_3gpp_break_circles.dia +++ b/dia/diameter_3gpp_break_circles.dia @@ -10,8 +10,12 @@ Emergency-Info 1687 Grouped V ;; 29.273 depends on 29.272 (APN-OI-Replacement), ... APN-OI-Replacement 1427 UTF8String MV - GMLC-Number 1474 OctetString MV - SGSN-Number 1489 OctetString MV ;; from 29.272 + + ;; 3-node-circular: 29.272 depends on 29.173 (GMLC-Address); 29.173 depends on 29.273 (3GPP-AAA-Server-Name); 29.273 depends on 29.272 (Trace-Data) + GMLC-Address 2405 Address MV ;; from 29.173 + + GMLC-Number 1474 OctetString MV ;; from 29.272 + SGSN-Number 1489 OctetString MV ;; from 29.272 @grouped diff --git a/dia/diameter_3gpp_ts29_173.dia b/dia/diameter_3gpp_ts29_173.dia index 6d8dc1c..680d3e2 100644 --- a/dia/diameter_3gpp_ts29_173.dia +++ b/dia/diameter_3gpp_ts29_173.dia @@ -33,19 +33,17 @@ @inherits diameter_gen_base_rfc6733 @inherits diameter_3gpp_base @inherits diameter_3gpp_ts29_229 +@inherits diameter_3gpp_ts29_273 3GPP-AAA-Server-Name @inherits diameter_3gpp_ts29_329 @inherits diameter_3gpp_break_circles @avp_types - 3GPP-AAA-Server-Name 318 DiameterIdentity MV ;; from 29.273 - LMSI 2400 OctetString MV Serving-Node 2401 Grouped MV MME-Name 2402 DiameterIdentity MV MSC-Number 2403 OctetString MV LCS-Capabilities-Sets 2404 Unsigned32 MV - GMLC-Address 2405 Address MV Additional-Serving-Node 2406 Grouped MV PPR-Address 2407 Address MV MME-Realm 2408 DiameterIdentity V diff --git a/dia/diameter_3gpp_ts29_272.dia b/dia/diameter_3gpp_ts29_272.dia index 65a6f7a..f264ab3 100644 --- a/dia/diameter_3gpp_ts29_272.dia +++ b/dia/diameter_3gpp_ts29_272.dia @@ -35,7 +35,6 @@ @inherits diameter_3gpp_ts29_214 @inherits diameter_3gpp_ts29_229 @inherits diameter_3gpp_ts29_329 -@inherits diameter_3gpp_ts29_173 @inherits diameter_3gpp_ts32_299 @inherits diameter_3gpp_break_circles diff --git a/dia/diameter_3gpp_ts29_273.dia b/dia/diameter_3gpp_ts29_273.dia index 0e0b51c..b5f0211 100644 --- a/dia/diameter_3gpp_ts29_273.dia +++ b/dia/diameter_3gpp_ts29_273.dia @@ -35,7 +35,7 @@ @inherits diameter_3gpp_base @inherits diameter_3gpp_break_circles @inherits diameter_3gpp_ts29_212 -@inherits diameter_3gpp_ts29_272 +@inherits diameter_3gpp_ts29_272 AMBR APN-Configuration Context-Identifier Core-Network-Restrictions PDN-Type Trace-Data Trace-Reference UE-Usage-Type @inherits diameter_3gpp_ts32_299 @inherits diameter_etsi_es283_034 @inherits diameter_rfc4006_cc -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/41016?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Idb1a7f7588b751c59788e4d99cd1d86f1fd2b573 Gerrit-Change-Number: 41016 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 weeks, 4 days

1
0
0 0

[S] Change in ...osmo-s1gw[master]: s1ap_proxy: erab_fsm_start_reg/2: check if already registered

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40993?usp=email ) Change subject: s1ap_proxy: erab_fsm_start_reg/2: check if already registered ...................................................................... s1ap_proxy: erab_fsm_start_reg/2: check if already registered Before this patch, s1ap_proxy would spawn a new erab_fsm process with a duplicate UID and simply replace the old process in the registry. This would result in stale erab_fsm process, still linked but not present in the registry, and thus not reachable. If there's already an E-RAB process for the given UID, simply return Pid of that existing process. The FSM will most likely reject an unexpected event, resulting in a negative verdict: * 'reply' for duplicate E-RAB SETUP REQUEST * 'drop' for duplicate INITIAL CONTEXT SETUP REQUEST Change-Id: I8e93492219100496fd8dc69e031310858ba9c7fb --- M src/s1ap_proxy.erl M test/s1ap_proxy_test.erl 2 files changed, 42 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 8111ad6..0195e39 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -1104,8 +1104,14 @@ -spec erab_fsm_start_reg(erab_id(), proxy_state()) -> {pid(), proxy_state()}. erab_fsm_start_reg(RABId, #proxy_state{erabs = ERABs} = S) -> UID = erab_uid(RABId, S), - {ok, Pid} = erab_fsm:start_link(UID), - {Pid, S#proxy_state{erabs = dict:store(UID, Pid, ERABs)}}. + case dict:find(UID, ERABs) of + {ok, Pid} -> + ?LOG_ERROR("E-RAB ~p is already registered?!?", [UID]), + {Pid, S}; %% return Pid of the existing erab_fsm process + error -> + {ok, Pid} = erab_fsm:start_link(UID), + {Pid, S#proxy_state{erabs = dict:store(UID, Pid, ERABs)}} + end. -spec erab_fsm_find(erab_id(), proxy_state()) -> {ok, pid()} | error. diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index 1145bc5..8f338c9 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -52,6 +52,8 @@ ?TC(fun test_e_rab_setup/1)}, {"E-RAB SETUP REQUEST (failure)", ?TC(fun test_e_rab_setup_req_fail/1)}, + {"E-RAB SETUP REQUEST (duplicate)", + ?TC(fun test_e_rab_setup_dup/1)}, {"E-RAB RELEASE COMMAND/RESPONSE", ?TC(fun test_e_rab_release_cmd/1)}, {"E-RAB RELEASE INDICATION", @@ -68,6 +70,8 @@ ?TC(fun test_e_rab_modify_ind_cnf_release/1)}, {"INITIAL CONTEXT SETUP REQUEST/RESPONSE", ?TC(fun test_initial_context_setup/1)}, + {"INITIAL CONTEXT SETUP REQUEST/RESPONSE (duplicate)", + ?TC(fun test_initial_context_setup_dup/1)}, {"UE CONTEXT RELEASE REQUEST", ?TC(fun test_ue_ctx_release_req/1)}, {"UE CONTEXT RELEASE COMMAND/COMPLETE", @@ -147,6 +151,23 @@ ?_assertEqual([], s1ap_proxy:fetch_erab_list(Pid))]. +test_e_rab_setup_dup(#{handler := Pid}) -> + %% [eNB <- MME] E-RAB SETUP REQUEST + SetupReqIn = e_rab_setup_req_pdu(?ADDR_U2C, ?TEID_U2C), + %% [eNB -> MME] E-RAB SETUP RESPONSE + SetupRspIn = e_rab_setup_rsp_pdu(?ADDR_U2A, ?TEID_U2A), + %% eNB <- [S1GW <- MME] E-RAB SETUP REQUEST (duplicate) + %% eNB -- [S1GW -> MME] E-RAB SETUP RESPONSE (failure) + SetupRspExp = e_rab_setup_rsp_fail_pdu(), + + [?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupReqIn)), + ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupRspIn)), + %% duplicate E-RAB SETUP REQUEST triggers a reply + ?_assertEqual({reply, SetupRspExp}, s1ap_proxy:process_pdu(Pid, SetupReqIn)), + ?_assertMatch({ok, _}, s1ap_proxy:fetch_erab(Pid, {7, 9, 6})), + ?_assertMatch([_], s1ap_proxy:fetch_erab_list(Pid))]. + + test_e_rab_release_cmd(#{handler := Pid}) -> %% [eNB <- MME] E-RAB SETUP REQUEST SetupReq = e_rab_setup_req_pdu(?ADDR_U2C, ?TEID_U2C), @@ -357,6 +378,19 @@ ?_assertMatch([_], s1ap_proxy:fetch_erab_list(Pid))]. +test_initial_context_setup_dup(#{handler := Pid}) -> + %% [eNB <- MME] INITIAL CONTEXT SETUP REQUEST + InitCtxSetupReqIn = initial_context_setup_req_pdu(?ADDR_U2C, ?TEID_U2C), + %% [eNB -> MME] INITIAL CONTEXT SETUP RESPONSE + InitCtxSetupRspIn = initial_context_setup_rsp_pdu(?ADDR_U2A, ?TEID_U2A), + + [?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, InitCtxSetupReqIn)), + ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, InitCtxSetupRspIn)), + %% duplicate INITIAL CONTEXT SETUP REQUEST results in the PDU being dropped + ?_assertEqual({drop, InitCtxSetupReqIn}, s1ap_proxy:process_pdu(Pid, InitCtxSetupReqIn)), + ?_assertMatch([_], s1ap_proxy:fetch_erab_list(Pid))]. + + test_ue_ctx_release_req(#{handler := Pid}) -> %% [eNB <- MME] INITIAL CONTEXT SETUP REQUEST InitCtxSetupReq = initial_context_setup_req_pdu(?ADDR_U2C, ?TEID_U2C), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40993?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I8e93492219100496fd8dc69e031310858ba9c7fb Gerrit-Change-Number: 40993 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 weeks, 4 days

1
0
0 0

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: remove eNB-ID from erab_uid()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40994?usp=email ) Change subject: s1ap_proxy: remove eNB-ID from erab_uid() ...................................................................... s1ap_proxy: remove eNB-ID from erab_uid() This patch prepares for a follow-up change implementing handling of the HANDOVER related PDUs. The problem is that the HANDOVER REQUEST PDU contains MME-UE-S1AP-ID, but not eNB-UE-S1AP-ID, while the E-RAB registry requires both to be part of the erab_uid() tuple. In the scope of an S1-connection, a pair of MME-UE-S1AP-ID and E-RAB-ID values is enough to identify an E-RAB unambiguously, thus we can safely remove eNB-UE-S1AP-ID from erab_uid(). Change-Id: I7277d19080795600252306dbfa0c733f996e026e --- M src/s1ap_proxy.erl M test/s1ap_proxy_test.erl 2 files changed, 30 insertions(+), 43 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve jolly: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 0195e39..0a08707 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -66,7 +66,8 @@ -type mme_ue_id() :: 0..16#ffffffff. -type enb_ue_id() :: 0..16#ffffff. -type erab_id() :: 0..16#ff. --type erab_uid() :: {mme_ue_id(), enb_ue_id(), erab_id()}. +-type erab_uid() :: {mme_ue_id(), erab_id()}. + -type plmn_id() :: {MCC :: nonempty_string(), MNC :: nonempty_string()}. @@ -185,30 +186,24 @@ -spec erab_uid(erab_id(), proxy_state()) -> erab_uid(). -erab_uid(ERABId, #proxy_state{mme_ue_id = MmeUeId, - enb_ue_id = EnbUeId}) -> - {MmeUeId, EnbUeId, ERABId}. +erab_uid(ERABId, #proxy_state{mme_ue_id = MmeUeId}) -> + {MmeUeId, ERABId}. --spec erab_for_each(UID, Fun, ERABs) -> ok - when UID :: {mme_ue_id(), enb_ue_id()} | {mme_ue_id()}, +-spec erab_for_each(MMEUeId, Fun, ERABs) -> ok + when MMEUeId :: mme_ue_id(), Fun :: fun((pid()) -> term()), ERABs :: [{erab_uid(), pid()}]. -erab_for_each({MMEUEId, ENBUEId} = UID, Fun, - [{{MMEUEId, ENBUEId, _}, Pid} | ERABs]) -> - Fun(Pid), %% matched by a pair of {MME,eNB}-UE-S1AP-ID - erab_for_each(UID, Fun, ERABs); +erab_for_each(MMEUEId, Fun, + [{{MMEUEId, _}, Pid} | ERABs]) -> + Fun(Pid), %% it's a match! + erab_for_each(MMEUEId, Fun, ERABs); -erab_for_each({MMEUEId} = UID, Fun, - [{{MMEUEId, _, _}, Pid} | ERABs]) -> - Fun(Pid), %% matched by an MME-UE-S1AP-ID - erab_for_each(UID, Fun, ERABs); - -erab_for_each(UID, Fun, +erab_for_each(MMEUeId, Fun, [_ERAB | ERABs]) -> - erab_for_each(UID, Fun, ERABs); + erab_for_each(MMEUeId, Fun, ERABs); -erab_for_each(_UID, _Fun, []) -> +erab_for_each(_MMEUeId, _Fun, []) -> ok. @@ -585,13 +580,11 @@ #proxy_state{erabs = ERABs} = S) -> ?LOG_DEBUG("Processing UE CONTEXT RELEASE REQUEST"), ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_RELEASE_CTX_REQ, S), - %% fetch {MME,eNB}-UE-S1AP-ID values (mandatory IEs) + %% fetch MME-UE-S1AP-ID value (mandatory IE) #'ProtocolIE-Field'{id = ?'id-MME-UE-S1AP-ID', value = MMEUEId} = lists:nth(1, IEs), - #'ProtocolIE-Field'{id = ?'id-eNB-UE-S1AP-ID', - value = ENBUEId} = lists:nth(2, IEs), - %% poke E-RAB FSMs with the matching {MME,eNB}-UE-S1AP-ID - erab_for_each({MMEUEId, ENBUEId}, + %% poke E-RAB FSMs with the matching MME-UE-S1AP-ID + erab_for_each(MMEUEId, fun erab_fsm:erab_release_ind/1, dict:to_list(ERABs)), {forward, S}; %% forward as-is, there's nothing to patch @@ -603,21 +596,17 @@ #proxy_state{erabs = ERABs} = S) -> ?LOG_DEBUG("Processing UE CONTEXT RELEASE COMMAND"), ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_RELEASE_CTX_CMD, S), + %% fetch MME-UE-S1AP-ID value from UE-S1AP-IDs (mandatory IE) #'ProtocolIE-Field'{id = ?'id-UE-S1AP-IDs', value = S1APIDs} = lists:nth(1, IEs), - case S1APIDs of - {'uE-S1AP-ID-pair', #'UE-S1AP-ID-pair'{'mME-UE-S1AP-ID' = MMEUEId, - 'eNB-UE-S1AP-ID' = ENBUEId}} -> - %% poke E-RAB FSMs with the matching {MME,eNB}-UE-S1AP-ID - erab_for_each({MMEUEId, ENBUEId}, - fun erab_fsm:erab_release_cmd/1, - dict:to_list(ERABs)); - {'mME-UE-S1AP-ID', MMEUEId} -> - %% poke E-RAB FSMs with the matching MME-UE-S1AP-ID - erab_for_each({MMEUEId}, - fun erab_fsm:erab_release_cmd/1, - dict:to_list(ERABs)) + MMEUEId = case S1APIDs of + {'uE-S1AP-ID-pair', #'UE-S1AP-ID-pair'{'mME-UE-S1AP-ID' = Val}} -> Val; + {'mME-UE-S1AP-ID', Val} -> Val end, + %% poke E-RAB FSMs with the matching MME-UE-S1AP-ID + erab_for_each(MMEUEId, + fun erab_fsm:erab_release_cmd/1, + dict:to_list(ERABs)), {forward, S}; %% forward as-is, there's nothing to patch %% 9.1.4.7 UE CONTEXT RELEASE COMPLETE @@ -627,13 +616,11 @@ #proxy_state{erabs = ERABs} = S) -> ?LOG_DEBUG("Processing UE CONTEXT RELEASE COMPLETE"), ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_RELEASE_CTX_COMPL, S), - %% fetch {MME,eNB}-UE-S1AP-ID values (mandatory IEs) + %% fetch MME-UE-S1AP-ID value (mandatory IE) #'ProtocolIE-Field'{id = ?'id-MME-UE-S1AP-ID', value = MMEUEId} = lists:nth(1, IEs), - #'ProtocolIE-Field'{id = ?'id-eNB-UE-S1AP-ID', - value = ENBUEId} = lists:nth(2, IEs), - %% poke E-RAB FSMs with the matching {MME,eNB}-UE-S1AP-ID - erab_for_each({MMEUEId, ENBUEId}, + %% poke E-RAB FSMs with the matching MME-UE-S1AP-ID + erab_for_each(MMEUEId, fun erab_fsm:erab_release_rsp/1, dict:to_list(ERABs)), {forward, S}; %% forward as-is, there's nothing to patch @@ -1079,7 +1066,7 @@ enb_ue_id = EnbUeId}) -> %% FIXME: Currently we respond with E-RAB-ID of the first E-RAB in the registry. %% Instead, we need to iterate over E-RABs in the REQUEST and reject them all. - [{_, _, FirstERABid}|_] = dict:fetch_keys(ERABs), + [{_, FirstERABid}|_] = dict:fetch_keys(ERABs), Cause = {transport, 'transport-resource-unavailable'}, ERABitem = #'E-RABItem'{'e-RAB-ID' = FirstERABid, cause = Cause}, diff --git a/test/s1ap_proxy_test.erl b/test/s1ap_proxy_test.erl index 8f338c9..60b09dc 100644 --- a/test/s1ap_proxy_test.erl +++ b/test/s1ap_proxy_test.erl @@ -128,7 +128,7 @@ ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2 + 2), ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 2), ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 2), - ?_assertMatch({ok, _}, s1ap_proxy:fetch_erab(Pid, {7, 9, 6})), + ?_assertMatch({ok, _}, s1ap_proxy:fetch_erab(Pid, {7, 6})), ?_assertMatch([_], s1ap_proxy:fetch_erab_list(Pid))]. @@ -164,7 +164,7 @@ ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupRspIn)), %% duplicate E-RAB SETUP REQUEST triggers a reply ?_assertEqual({reply, SetupRspExp}, s1ap_proxy:process_pdu(Pid, SetupReqIn)), - ?_assertMatch({ok, _}, s1ap_proxy:fetch_erab(Pid, {7, 9, 6})), + ?_assertMatch({ok, _}, s1ap_proxy:fetch_erab(Pid, {7, 6})), ?_assertMatch([_], s1ap_proxy:fetch_erab_list(Pid))]. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40994?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I7277d19080795600252306dbfa0c733f996e026e Gerrit-Change-Number: 40994 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 weeks, 4 days

1
0
0 0

[XS] Change in ...osmo-s1gw[master]: s1ap_proxy: add type hints for #proxy_state.erabs

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41003?usp=email ) Change subject: s1ap_proxy: add type hints for #proxy_state.erabs ...................................................................... s1ap_proxy: add type hints for #proxy_state.erabs Change-Id: I08e0339bf401067eaf8ace32da619d5016fe98d7 --- M src/s1ap_proxy.erl 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified jolly: Looks good to me, but someone else must approve diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 0a08707..a08f61d 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -72,7 +72,8 @@ MNC :: nonempty_string()}. -record(proxy_state, {conn_info :: sctp_server:conn_info(), - erabs :: dict:dict(), + erabs :: dict:dict(K :: erab_uid(), + V :: pid()), enb_id :: undefined | non_neg_integer(), plmn_id :: undefined | plmn_id(), genb_id_str :: undefined | string(), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41003?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I08e0339bf401067eaf8ace32da619d5016fe98d7 Gerrit-Change-Number: 41003 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 weeks, 4 days

1
0
0 0

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: remove eNB-ID from erab_uid()

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40994?usp=email ) Change subject: s1ap_proxy: remove eNB-ID from erab_uid() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40994?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I7277d19080795600252306dbfa0c733f996e026e Gerrit-Change-Number: 40994 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Sep 2025 18:20:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 4 days

1
0
0 0

[XS] Change in ...osmo-epdg[master]: rebar.config: Update rebar3_diameter_compiler from 0.8.0 to v0.8.1

by fixeria

Attention is currently required from: lynxis lazus, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/41010?usp=email ) Change subject: rebar.config: Update rebar3_diameter_compiler from 0.8.0 to v0.8.1 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/41010?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ic67581435a06052b0e3159172a2324dd1c1e58fc Gerrit-Change-Number: 41010 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 03 Sep 2025 16:52:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

2 weeks, 4 days

1
0
0 0

[XS] Change in ...osmo-epdg[master]: rebar.config: Update rebar3_diameter_compiler from 0.8.0 to v0.8.1

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/41010?usp=email ) Change subject: rebar.config: Update rebar3_diameter_compiler from 0.8.0 to v0.8.1 ...................................................................... rebar.config: Update rebar3_diameter_compiler from 0.8.0 to v0.8.1 There's a new patch release of rebar3_diameter_compiler with multiple fixes and improvements, use it. Change-Id: Ic67581435a06052b0e3159172a2324dd1c1e58fc --- M rebar.config 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/10/41010/1 diff --git a/rebar.config b/rebar.config index 7b85d5b..68092a7 100644 --- a/rebar.config +++ b/rebar.config @@ -13,7 +13,7 @@ {minimum_otp_vsn, "25.2.3"}. {plugins, [ {rebar3_diameter_compiler, - {git, "https://github.com/carlosedp/rebar3_diameter_compiler.git", {tag, "0.8.0"}}} + {git, "https://github.com/carlosedp/rebar3_diameter_compiler.git", {tag, "v0.8.1"}}} ]}. {xref_checks, [undefined_function_calls, undefined_functions, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/41010?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ic67581435a06052b0e3159172a2324dd1c1e58fc Gerrit-Change-Number: 41010 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

2 weeks, 4 days

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sgsn: TC_stat_bsc_sctp_disconnected: validate using StatsD

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40992?usp=email ) Change subject: sgsn: TC_stat_bsc_sctp_disconnected: validate using StatsD ...................................................................... sgsn: TC_stat_bsc_sctp_disconnected: validate using StatsD Similar to what we alreay do in counterpart MSC_Tests_iu.TC_stat_bsc_sctp_disconnected. Related: OS#3403 Depends: osmo-sgsn.git Change-Id I51b5227d92027f1251dc4debbbf59737e7c1a9ba Change-Id: I1ff8c51a73556357c5a5e97bc2a0edec30f1cf03 --- M sgsn/SGSN_Tests.ttcn M sgsn/SGSN_Tests_Iu.ttcn 2 files changed, 32 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified lynxis lazus: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 1b339cf..7364dc4 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -566,6 +566,11 @@ return vc_conn; } +friend function f_sgsn_stats_prefix() return charstring +{ + return mp_statsd_prefix & "sgsn.0."; +} + /* TODO: * Detach without Attach * SM procedures without attach / RAU diff --git a/sgsn/SGSN_Tests_Iu.ttcn b/sgsn/SGSN_Tests_Iu.ttcn index 6e8b5b6..71c20ef 100644 --- a/sgsn/SGSN_Tests_Iu.ttcn +++ b/sgsn/SGSN_Tests_Iu.ttcn @@ -4,6 +4,11 @@ import from Osmocom_VTY_Functions all; import from Misc_Helpers all; +import from StatsD_Types all; +import from StatsD_CodecPort all; +import from StatsD_CodecPort_CtrlFunct all; +import from StatsD_Checker all; + import from SGSN_Tests all; import from BSSGP_Emulation all; @@ -432,12 +437,28 @@ */ testcase TC_stat_rnc_sctp_disconnected() runs on test_CT { var BSSGP_ConnHdlr vc_conn; + var charstring sgsn_stats_prefix := f_sgsn_stats_prefix(); + var StatsDExpects expect_connected := { + {name := sgsn_stats_prefix & "iu_peers.total", mtype := "g", min := 1, max := 1}, + {name := sgsn_stats_prefix & "iu_peers.active", mtype := "g", min := 1, max := 1} + }; + var StatsDExpects expect_disconnected := { + {name := sgsn_stats_prefix & "iu_peers.total", mtype := "g", min := 1, max := 1}, + {name := sgsn_stats_prefix & "iu_peers.active", mtype := "g", min := 0, max := 0} + }; + + g_statd_timeout := 15.0; f_init(); f_init_vty_stp(); f_sleep(1.0); f_vty_config(SGSNVTY, "sgsn", "encryption uea 0"); + connect(self:STATSD_PROC, vc_STATSD:STATSD_PROC); + f_statsd_reset(); + f_statsd_expect(expect_connected, wait_converge := true); + disconnect(self:STATSD_PROC, vc_STATSD:STATSD_PROC); + vc_conn := f_start_handler(refers(f_TC_iu_attach), testcasename(), g_gb, 1008); vc_conn.done; @@ -445,12 +466,16 @@ f_vty_stp_sgsn_asp_cmd("shutdown"); /* Wait for AS PENDING->INACTIVE transition (T(r) timeout after 2000msec): */ - f_sleep(3.0); + connect(self:STATSD_PROC, vc_STATSD:STATSD_PROC); + f_statsd_expect(expect_disconnected, wait_converge := true); + disconnect(self:STATSD_PROC, vc_STATSD:STATSD_PROC); f_logp(SGSNVTY, "Restarting SGSN ASP in STP"); f_vty_stp_sgsn_asp_cmd("no shutdown"); - f_sleep(15.0); + connect(self:STATSD_PROC, vc_STATSD:STATSD_PROC); + f_statsd_expect(expect_connected, wait_converge := true); + disconnect(self:STATSD_PROC, vc_STATSD:STATSD_PROC); vc_conn := f_start_handler(refers(f_TC_iu_attach), testcasename(), g_gb, 1009); vc_conn.done; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40992?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1ff8c51a73556357c5a5e97bc2a0edec30f1cf03 Gerrit-Change-Number: 40992 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

2 weeks, 4 days

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2025