- gerrit-log - lists.osmocom.org

[S] Change in ...osmo-epdg[master]: aaa_ue_fsm: S6b AAR should trigger SWx SAR with type=PGW_UPDATE
by pespin 07 Feb '24

07 Feb '24

Attention is currently required from: lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35863?usp=email ) Change subject: aaa_ue_fsm: S6b AAR should trigger SWx SAR with type=PGW_UPDATE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35863?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: If0f0bfa21117c65c0ef7c831746b50eb83908778 Gerrit-Change-Number: 35863 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 07 Feb 2024 16:24:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-gsm-manuals[master]: gsup.adoc: Add links to section of each message type in table
by pespin 07 Feb '24

07 Feb '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/35898?usp=email ) Change subject: gsup.adoc: Add links to section of each message type in table ...................................................................... gsup.adoc: Add links to section of each message type in table Change-Id: Idbc8a8f2e41f90e545a420517bd030399fb229ac --- M common/chapters/gsup.adoc 1 file changed, 112 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/98/35898/1 diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index 912ff6b..f7cf959 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -349,6 +349,7 @@ (Optional) or 'C' (Conditional). The 'format' column holds either 'V' (Value) or 'TLV' (Tag Length Value). +[[gsup-msg-auth-info-req]] ==== Send Authentication Info Request Direction: SGSN / VLR => HLR @@ -367,6 +368,7 @@ (via UE) requests an UMTS AKA re-synchronization procedure. Either both optional IEs are present, or none of them. +[[gsup-msg-auth-info-err]] ==== Send Authentication Info Error Direction: HLR => SGSN / VLR @@ -379,6 +381,7 @@ |02|Cause|<<gsup-ie-cause>>|M|TLV|3 |=== +[[gsup-msg-auth-info-res]] ==== Send Authentication Info Response Direction: HLR => SGSN / VLR @@ -391,6 +394,7 @@ |03|Auth Tuple|<<gsup-ie-authtuple>>|0-5|TLV|36 |=== +[[gsup-msg-auth-fail-rep]] ==== Authentication Failure Report Direction: SGSN / VLR => HLR @@ -403,6 +407,7 @@ |28|CN Domain|<<gsup-ie-cndomain>>|O|TLV|3 |=== +[[gsup-msg-upd-loc-req]] ==== Update Location Request Direction: SGSN / VLR => HLR @@ -415,6 +420,7 @@ |28|CN Domain|<<gsup-ie-cndomain>>|O|TLV|3 |=== +[[gsup-msg-upd-loc-err]] ==== Update Location Error Direction: HLR => SGSN / VLR @@ -427,6 +433,7 @@ |02|Cause|<<gsup-ie-cause>>|M|TLV|3 |=== +[[gsup-msg-upd-loc-res]] ==== Update Location Result Direction: HLR => SGSN / VLR @@ -444,6 +451,7 @@ If the PDP info complete IE is present, the old PDP info list shall be cleared. +[[gsup-msg-loc-cancel-req]] ==== Location Cancellation Request Direction: HLR => SGSN / VLR @@ -457,6 +465,14 @@ |06|Cancellation type|<<gsup-ie-canctype>>|O|TLV|3 |=== +[[gsup-msg-loc-cancel-err]] +==== Location Cancellation Error + +Direction: SGSN / VLR => HLR + +TODO + +[[gsup-msg-loc-cancel-res]] ==== Location Cancellation Result Direction: SGSN / VLR => HLR @@ -469,6 +485,7 @@ |28|CN Domain|<<gsup-ie-cndomain>>|O|TLV|3 |=== +[[gsup-msg-purge-ms-req]] ==== Purge MS Request Direction: SGSN / VLR => HLR @@ -482,6 +499,7 @@ |09|HLR Number|<<gsup-ie-hlr>>|M|TLV|0-9 |=== +[[gsup-msg-purge-ms-err]] ==== Purge MS Error Direction: HLR => SGSN / VLR @@ -494,6 +512,7 @@ |02|Cause|<<gsup-ie-cause>>|M|TLV|3 |=== +[[gsup-msg-purge-ms-res]] ==== Purge MS Result Direction: HLR => SGSN / VLR @@ -506,6 +525,7 @@ |07|Freeze P-TMSI|<<gsup-ie-empty>>|M|TLV|2 |=== +[[gsup-msg-ins-sub-req]] ==== Insert Subscriber Data Request Direction: HLR => SGSN / VLR @@ -525,6 +545,7 @@ If the PDP info complete IE is present, the old PDP info list shall be cleared. +[[gsup-msg-ins-sub-err]] ==== Insert Subscriber Data Error Direction: SGSN / VLR => HLR @@ -537,6 +558,7 @@ |02|Cause|<<gsup-ie-cause>>|M|TLV|3 |=== +[[gsup-msg-ins-sub-res]] ==== Insert Subscriber Data Result Direction: SGSN / VLR => HLR @@ -548,6 +570,7 @@ |01|IMSI|<<gsup-ie-imsi>>|M|TLV|2-10 |=== +[[gsup-msg-del-sub-req]] ==== Delete Subscriber Data Request Direction: HLR => SGSN / VLR @@ -561,6 +584,7 @@ |10|PDP Context ID|<<gsup-ie-pdpctxid>>|C|TLV|3 |=== +[[gsup-msg-del-sub-err]] ==== Delete Subscriber Data Error Direction: SGSN / VLR => HLR @@ -573,6 +597,7 @@ |02|Cause|<<gsup-ie-cause>>|M|TLV|3 |=== +[[gsup-msg-del-sub-res]] ==== Delete Subscriber Data Result Direction: HLR => SGSN / VLR @@ -584,6 +609,7 @@ |01|IMSI|<<gsup-ie-imsi>>|M|TLV|2-10 |=== +[[gsup-msg-proc-supl-serv-req]] ==== Process Supplementary Service Request Direction: bidirectional @@ -602,6 +628,7 @@ it is not known is it request or response without parsing the GSM 04.80 payload. +[[gsup-msg-proc-supl-serv-err]] ==== Process Supplementary Service Error Direction: EUSE / HLR => MSC @@ -616,6 +643,7 @@ |02|Cause|<<gsup-ie-cause>>|M|TLV|3 |=== +[[gsup-msg-proc-supl-serv-res]] ==== Process Supplementary Service Response Direction: EUSE / HLR => MSC @@ -634,6 +662,7 @@ can be used to notify the MSC that a structured supplementary service is successfully activated or deactivated, etc. +[[gsup-msg-mo-forwardsm-req]] ==== MO-forwardSM Request Direction: MSC / SGSN => SMSC (via HLR) @@ -653,6 +682,7 @@ The corresponding MAP service is MAP-MO-FORWARD-SHORT-MESSAGE, see 3GPP TS 29.002, section 12.2. +[[gsup-msg-mo-forwardsm-err]] ==== MO-forwardSM Error Direction: SMSC (via HLR) => MSC / SGSN @@ -671,6 +701,7 @@ MO short message delivery. The corresponding MAP service is MAP-MO-FORWARD-SHORT-MESSAGE, see 3GPP TS 29.002, section 12.2. +[[gsup-msg-mo-forwardsm-res]] ==== MO-forwardSM Result Direction: SMSC (via HLR) => MSC / SGSN @@ -687,6 +718,7 @@ MO short message delivery. The corresponding MAP service is MAP-MO-FORWARD-SHORT-MESSAGE, see 3GPP TS 29.002, section 12.2. +[[gsup-msg-mt-forwardsm-req]] ==== MT-forwardSM Request Direction: SMSC (via HLR) => MSC / SGSN @@ -707,6 +739,7 @@ The corresponding MAP service is MAP-MT-FORWARD-SHORT-MESSAGE, see 3GPP TS 29.002, section 12.9. +[[gsup-msg-mt-forwardsm-err]] ==== MT-forwardSM Error Direction: MSC / SGSN => SMSC (via HLR) @@ -725,6 +758,7 @@ MT short message delivery. The corresponding MAP service is MAP-MT-FORWARD-SHORT-MESSAGE, see 3GPP TS 29.002, section 12.9. +[[gsup-msg-mt-forwardsm-res]] ==== MT-forwardSM Result Direction: MSC / SGSN => SMSC (via HLR) @@ -741,6 +775,7 @@ MT short message delivery. The corresponding MAP service is MAP-MT-FORWARD-SHORT-MESSAGE, see 3GPP TS 29.002, section 12.9. +[[gsup-msg-ready-for-sm-req]] ==== READY-FOR-SM Request Direction: MSC / SGSN => SMSC (via HLR) @@ -759,6 +794,7 @@ The corresponding MAP service is MAP-READY-FOR-SM, see 3GPP TS 29.002, section 12.4. +[[gsup-msg-ready-for-sm-err]] ==== READY-FOR-SM Error Direction: SMSC (via HLR) => MSC / SGSN @@ -777,6 +813,7 @@ MO SMMA (Memory Available) indication. The corresponding MAP service is MAP-READY-FOR-SM, see 3GPP TS 29.002, section 12.4. +[[gsup-msg-ready-for-sm-res]] ==== READY-FOR-SM Result Direction: SMSC (via HLR) => MSC / SGSN @@ -793,6 +830,7 @@ MO SMMA (Memory Available) indication. The corresponding MAP service is MAP-READY-FOR-SM, see 3GPP TS 29.002, section 12.4. +[[gsup-msg-check-imei-req]] ==== CHECK-IMEI Request Direction: VLR => EIR (via HLR) @@ -805,6 +843,7 @@ |50|IMEI|<<gsup-ie-imei>>|M|TLV|11 |=== +[[gsup-msg-check-imei-err]] ==== CHECK-IMEI Error Direction: EIR (via HLR) => VLR @@ -817,6 +856,7 @@ |02|Cause|<<gsup-ie-cause>>|M|TLV|3 |=== +[[gsup-msg-check-imei-res]] ==== CHECK-IMEI Result Direction: EIR (via HLR) => VLR @@ -829,6 +869,7 @@ |51|IMEI Check Result|<<gsup-ie-imei-result>>|M|TLV|3 |=== +[[gsup-msg-e-prep-ho-req]] ==== E Prepare Handover Request Direction: MSC-A=MSC-I => MSC-B=MSC-T (via HLR) @@ -844,6 +885,7 @@ |62|AN-APDU|<<gsup-ie-an-apdu>>|M|TLV|2-... |=== +[[gsup-msg-e-prep-ho-err]] ==== E Prepare Handover Error Direction: MSC-B=MSC-T => MSC-A=MSC-I (via HLR) @@ -859,6 +901,7 @@ |62|AN-APDU|<<gsup-ie-an-apdu>>|M|TLV|2-... |=== +[[gsup-msg-e-prep-ho-res]] ==== E Prepare Handover Result Direction: MSC-B=MSC-T => MSC-A=MSC-I (via HLR) @@ -874,6 +917,7 @@ |62|AN-APDU|<<gsup-ie-an-apdu>>|M|TLV|2-... |=== +[[gsup-msg-e-prep-subs-ho-req]] ==== E Prepare Subsequent Handover Request Direction: MSC-B=MSC-I => MSC-A (via HLR) @@ -889,6 +933,7 @@ |62|AN-APDU|<<gsup-ie-an-apdu>>|M|TLV|2-... |=== +[[gsup-msg-e-prep-subs-ho-err]] ==== E Prepare Subsequent Handover Error Direction: MSC-A => MSC-B=MSC-I (via HLR) @@ -904,6 +949,7 @@ |62|AN-APDU|<<gsup-ie-an-apdu>>|M|TLV|2-... |=== +[[gsup-msg-e-prep-subs-ho-res]] ==== E Prepare Subsequent Handover Result Direction: MSC-A => MSC-B=MSC-I (via HLR) @@ -919,6 +965,7 @@ |62|AN-APDU|<<gsup-ie-an-apdu>>|M|TLV|2-... |=== +[[gsup-msg-e-snd-end-sig-req]] ==== E Send End Signal Request Direction: MSC-B=MSC-T => MSC-A=MSC-I (via HLR) @@ -934,6 +981,7 @@ |62|AN-APDU|<<gsup-ie-an-apdu>>|M|TLV|2-... |=== +[[gsup-msg-e-snd-end-sig-err]] ==== E Send End Signal Error Direction: MSC-A=MSC-I => MSC-B=MSC-T (via HLR) @@ -949,6 +997,7 @@ |62|AN-APDU|<<gsup-ie-an-apdu>>|M|TLV|2-... |=== +[[gsup-msg-e-snd-end-sig-res]] ==== E Send End Signal Result Direction: MSC-A => MSC-B=MSC-I (via HLR) @@ -964,6 +1013,7 @@ |62|AN-APDU|<<gsup-ie-an-apdu>>|M|TLV|2-... |=== +[[gsup-msg-e-proc-acc-sig-req]] ==== E Process Access Signalling Request Direction: MSC-B=MSC-T => MSC-A=MSC-I (via HLR) @@ -979,6 +1029,7 @@ |62|AN-APDU|<<gsup-ie-an-apdu>>|M|TLV|2-... |=== +[[gsup-msg-e-forw-acc-sig-req]] ==== E Forward Access Signalling Request Direction: MSC-A => MSC-B=MSC-I (via HLR) @@ -994,6 +1045,7 @@ |62|AN-APDU|<<gsup-ie-an-apdu>>|M|TLV|2-... |=== +[[gsup-msg-e-close]] ==== E Close Direction: MSC-A => MSC-B (via HLR) @@ -1008,11 +1060,13 @@ |61|Destination Name|<<gsup-ie-destination-name>>|M|TLV|2-... |=== +[[gsup-msg-e-abort]] ==== E Abort This message was added to GSUP for the inter-MSC handover. But so far it is not used yet. +[[gsup-msg-e-routing-err]] ==== E Routing Error Direction: GSUP Server (HLR) => GSUP Client (MSC) @@ -1037,41 +1091,55 @@ [options="header",cols="10%,90%"] |=== -|Type|Description -|0x04|Update Location Request -|0x05|Update Location Error -|0x06|Update Location Result -|0x08|Send Authentication Info Request -|0x09|Send Authentication Info Error -|0x0a|Send Authentication Info Result -|0x0b|Authentication Failure Report -|0x0c|Purge MS Request -|0x0d|Purge MS Error -|0x0e|Purge MS Result -|0x10|Insert Subscriber Data Request -|0x11|Insert Subscriber Data Error -|0x12|Insert Subscriber Data Result -|0x14|Delete Subscriber Data Request -|0x15|Delete Subscriber Data Error -|0x16|Delete Subscriber Data Result -|0x1c|Location Cancellation Request -|0x1d|Location Cancellation Error -|0x1e|Location Cancellation Result -|0x20|Supplementary Service Request -|0x21|Supplementary Service Error -|0x22|Supplementary Service Result -|0x24|MO-forwardSM Request -|0x25|MO-forwardSM Error -|0x26|MO-forwardSM Result -|0x28|MT-forwardSM Request -|0x29|MT-forwardSM Error -|0x2a|MT-forwardSM Result -|0x2c|READY-FOR-SM Request -|0x2d|READY-FOR-SM Error -|0x2e|READY-FOR-SM Result -|0x30|CHECK-IMEI Request -|0x31|CHECK-IMEI Error -|0x32|CHECK-IMEI Result +|Type|Name|Description +|0x04|Update Location Request|<<gsup-msg-upd-loc-req>> +|0x05|Update Location Error|<<gsup-msg-upd-loc-err>> +|0x06|Update Location Result|<<gsup-msg-upd-loc-res>> +|0x08|Send Authentication Info Request|<<gsup-msg-auth-info-req>> +|0x09|Send Authentication Info Error|<<gsup-msg-auth-info-err>> +|0x0a|Send Authentication Info Result|<<gsup-msg-auth-info-res>> +|0x0b|Authentication Failure Report|<<gsup-msg-auth-fail-rep>> +|0x0c|Purge MS Request|<<gsup-msg-purge-ms-reqs>> +|0x0d|Purge MS Error|<<gsup-msg-purge-ms-err>> +|0x0e|Purge MS Result|<<gsup-msg-purge-ms-res>> +|0x10|Insert Subscriber Data Request|<<gsup-msg-ins-sub-req>> +|0x11|Insert Subscriber Data Error|<<gsup-msg-ins-sub-err>> +|0x12|Insert Subscriber Data Result|<<gsup-msg-ins-sub-res>> +|0x14|Delete Subscriber Data Request|<<gsup-msg-del-sub-req>> +|0x15|Delete Subscriber Data Error|<<gsup-msg-del-sub-err>> +|0x16|Delete Subscriber Data Result|<<gsup-msg-del-sub-res>> +|0x1c|Location Cancellation Request|<<gsup-msg-loc-cancel-req>> +|0x1d|Location Cancellation Error|<<gsup-msg-loc-cancel-err>> +|0x1e|Location Cancellation Result|<<gsup-msg-loc-cancel-res>> +|0x20|Supplementary Service Request|<<gsup-msg-proc-supl-serv-req>> +|0x21|Supplementary Service Error|<<gsup-msg-proc-supl-serv-err>> +|0x22|Supplementary Service Result|<<gsup-msg-proc-supl-serv-res>> +|0x24|MO-forwardSM Request|<<gsup-msg-mo-forwardsm-req>> +|0x25|MO-forwardSM Error|<<gsup-msg-mo-forwardsm-err>> +|0x26|MO-forwardSM Result|<<gsup-msg-mo-forwardsm-res>> +|0x28|MT-forwardSM Request|<<gsup-msg-mt-forwardsm-req>> +|0x29|MT-forwardSM Error|<<gsup-msg-mt-forwardsm-err>> +|0x2a|MT-forwardSM Result|<<gsup-msg-mt-forwardsm-res>> +|0x2c|READY-FOR-SM Request|<<gsup-msg-ready-for-sm-req>> +|0x2d|READY-FOR-SM Error|<<gsup-msg-ready-for-sm-err>> +|0x2e|READY-FOR-SM Result|<<gsup-msg-ready-for-sm-res>> +|0x30|CHECK-IMEI Request|<<gsup-msg-check-imei-req>> +|0x31|CHECK-IMEI Error|<<gsup-msg-check-imei-err>> +|0x32|CHECK-IMEI Result|<<gsup-msg-check-imei-res>> +|0x??|E Prepare Handover Request|<<gsup-msg-e-prep-ho-req>> +|0x??|E Prepare Handover Error|<<gsup-msg-e-prep-ho-err>> +|0x??|E Prepare Handover Result|<<gsup-msg-e-prep-ho-res>> +|0x??|E Prepare Subsequent Handover Request|<<gsup-msg-e-prep-subs-ho-req>> +|0x??|E Prepare Subsequent Handover Error|<<gsup-msg-e-prep-subs-ho-err>> +|0x??|E Prepare Subsequent Handover Result|<<gsup-msg-e-prep-subs-ho-res>> +|0x??|E Send End Signal Request|<<gsup-msg-e-snd-end-sig-req>> +|0x??|E Send End Signal Error|<<gsup-msg-e-snd-end-sig-err>> +|0x??|E Send End Signal Result|<<gsup-msg-e-snd-end-sig-res>> +|0x??|E Process Access Signalling Request|<<gsup-msg-e-proc-acc-sig-req>> +|0x??|E Forward Access Signalling Request|<<gsup-msg-e-forw-acc-sig-req>> +|0x??|E Close|<<gsup-msg-e-close>> +|0x??|E Abort|<<gsup-msg-e-abort>> +|0x??|E Routing Error|<<gsup-msg-e-routing-err>> |=== The category of the message is indicated by the last two bits of the type. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/35898?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Idbc8a8f2e41f90e545a420517bd030399fb229ac Gerrit-Change-Number: 35898 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-gsm-manuals[master]: gsup.adoc: Fix Authentication Info message naming in table
by pespin 07 Feb '24

07 Feb '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/35897?usp=email ) Change subject: gsup.adoc: Fix Authentication Info message naming in table ...................................................................... gsup.adoc: Fix Authentication Info message naming in table Change-Id: I6d5c95334c961f1f0aa083107713c31d9894c7aa --- M common/chapters/gsup.adoc 1 file changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/97/35897/1 diff --git a/common/chapters/gsup.adoc b/common/chapters/gsup.adoc index 8be4bae..912ff6b 100644 --- a/common/chapters/gsup.adoc +++ b/common/chapters/gsup.adoc @@ -1041,9 +1041,9 @@ |0x04|Update Location Request |0x05|Update Location Error |0x06|Update Location Result -|0x08|Send Auth Info Request -|0x09|Send Auth Info Error -|0x0a|Send Auth Info Result +|0x08|Send Authentication Info Request +|0x09|Send Authentication Info Error +|0x0a|Send Authentication Info Result |0x0b|Authentication Failure Report |0x0c|Purge MS Request |0x0d|Purge MS Error -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/35897?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I6d5c95334c961f1f0aa083107713c31d9894c7aa Gerrit-Change-Number: 35897 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: ctrl: Remove unused vty includes
by matanp 07 Feb '24

07 Feb '24

matanp has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35744?usp=email ) Change subject: ctrl: Remove unused vty includes ...................................................................... ctrl: Remove unused vty includes Change-Id: Ib464d0be9df839740a648ff6747130c18d33455d --- M src/osmo-bsc/bts_ctrl.c M src/osmo-bsc/bts_trx_ctrl.c 2 files changed, 9 insertions(+), 6 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index 9c14190..eac01bf 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -24,9 +24,6 @@ #include <osmocom/ctrl/control_cmd.h> -#include <osmocom/vty/command.h> -#include <osmocom/vty/misc.h> - #include <osmocom/bsc/ctrl.h> #include <osmocom/bsc/osmo_bsc_rf.h> #include <osmocom/bsc/bts.h> diff --git a/src/osmo-bsc/bts_trx_ctrl.c b/src/osmo-bsc/bts_trx_ctrl.c index ff58cb7..258203c 100644 --- a/src/osmo-bsc/bts_trx_ctrl.c +++ b/src/osmo-bsc/bts_trx_ctrl.c @@ -24,9 +24,6 @@ #include <osmocom/ctrl/control_cmd.h> -#include <osmocom/vty/command.h> -#include <osmocom/vty/misc.h> - #include <osmocom/bsc/ctrl.h> #include <osmocom/bsc/osmo_bsc_rf.h> #include <osmocom/bsc/bts.h> -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35744?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib464d0be9df839740a648ff6747130c18d33455d Gerrit-Change-Number: 35744 Gerrit-PatchSet: 2 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: matanp <matan1008(a)gmail.com> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in ...osmo-epdg[master]: epdg_ue_fsm: Introduce public function to get pid from imsi
by pespin 07 Feb '24

07 Feb '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35896?usp=email ) Change subject: epdg_ue_fsm: Introduce public function to get pid from imsi ...................................................................... epdg_ue_fsm: Introduce public function to get pid from imsi Change-Id: Ibc4478d8d48171c302daf8aaebd037227d3e3a98 --- M src/epdg_ue_fsm.erl 1 file changed, 20 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/96/35896/1 diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 94cf9c4..711f695 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -39,6 +39,7 @@ -export([start_link/1, stop/1]). -export([init/1,callback_mode/0,terminate/3]). +-export([get_server_name_by_imsi/1, get_pid_by_imsi/1]). -export([auth_request/1, lu_request/1, tunnel_request/1, purge_ms_request/1]). -export([received_swm_auth_response/2, received_swm_auth_compl_response/2, received_swm_session_termination_answer/2]). -export([received_gtpc_create_session_response/2, received_gtpc_delete_session_response/2, received_gtpc_delete_bearer_request/1]). @@ -52,10 +53,18 @@ tear_down_gsup_cause = 0 :: integer() }). -start_link(Imsi) -> +get_server_name_by_imsi(Imsi) -> ServerName = lists:concat([?NAME, "_", binary_to_list(Imsi)]), + list_to_atom(ServerName). + +get_pid_by_imsi(Imsi) -> + ServerName = get_server_name_by_imsi(Imsi), + whereis(ServerName). + +start_link(Imsi) -> + ServerName = get_server_name_by_imsi(Imsi), lager:info("ue_fsm start_link(~p)~n", [ServerName]), - gen_statem:start_link({local, list_to_atom(ServerName)}, ?MODULE, Imsi, [{debug, [trace]}]). + gen_statem:start_link({local, ServerName}, ?MODULE, Imsi, [{debug, [trace]}]). stop(SrvRef) -> gen_statem:stop(SrvRef). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35896?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ibc4478d8d48171c302daf8aaebd037227d3e3a98 Gerrit-Change-Number: 35896 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in ...osmo-epdg[master]: gsup_server: Delete session if initial auth failed
by pespin 07 Feb '24

07 Feb '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35892?usp=email ) Change subject: gsup_server: Delete session if initial auth failed ...................................................................... gsup_server: Delete session if initial auth failed It may be that due to a bug the previous session was kept alive and the related epdg_ue_fsm has actually already terminated. In any case, there's no use in keeping the session at this initial transaction after having created it, so simply delete it if it fails. Change-Id: Iebbab786e9647a026b2937115004747cd1883da0 --- M src/epdg_ue_fsm.erl M src/gsup_server.erl 2 files changed, 23 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/92/35892/1 diff --git a/src/epdg_ue_fsm.erl b/src/epdg_ue_fsm.erl index 21f59da..94cf9c4 100644 --- a/src/epdg_ue_fsm.erl +++ b/src/epdg_ue_fsm.erl @@ -37,7 +37,7 @@ -include_lib("osmo_gsup/include/gsup_protocol.hrl"). -include_lib("gtplib/include/gtp_packet.hrl"). --export([start_link/1]). +-export([start_link/1, stop/1]). -export([init/1,callback_mode/0,terminate/3]). -export([auth_request/1, lu_request/1, tunnel_request/1, purge_ms_request/1]). -export([received_swm_auth_response/2, received_swm_auth_compl_response/2, received_swm_session_termination_answer/2]). @@ -57,6 +57,9 @@ lager:info("ue_fsm start_link(~p)~n", [ServerName]), gen_statem:start_link({local, list_to_atom(ServerName)}, ?MODULE, Imsi, [{debug, [trace]}]). +stop(SrvRef) -> + gen_statem:stop(SrvRef). + auth_request(Pid) -> lager:info("ue_fsm auth_request~n", []), try diff --git a/src/gsup_server.erl b/src/gsup_server.erl index 0c7a723..fd2a8b5 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -234,7 +234,7 @@ handle_info({ipa, Socket, ?IPAC_PROTO_EXT_GSUP, _GsupMsgRx = #{message_type := send_auth_info_req, imsi := Imsi}}, State0) -> {UE, State1} = find_or_new_gsups_ue(Imsi, State0), case epdg_ue_fsm:auth_request(UE#gsups_ue.pid) of - ok -> ok; + ok -> State2 = State1; {error, Err} -> lager:error("Auth Req for Imsi ~p failed: ~p~n", [Imsi, Err]), Resp = #{message_type => send_auth_info_err, @@ -242,9 +242,11 @@ message_class => 5, cause => ?GSUP_CAUSE_NET_FAIL }, - tx_gsup(Socket, Resp) + tx_gsup(Socket, Resp), + epdg_ue_fsm:stop(UE#gsups_ue.pid), + State2 = delete_gsups_ue(Imsi, State1) end, - {noreply, State1}; + {noreply, State2}; % location update request / when a UE wants to connect to a specific APN. This will trigger a AAA->HLR Request Server Assignment Request % FIXME: add APN instead of hardcoded internet -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35892?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Iebbab786e9647a026b2937115004747cd1883da0 Gerrit-Change-Number: 35892 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in ...osmo-epdg[master]: AAA-Server: s6b: Fetch UE FSM Pid without asking SWm module
by pespin 07 Feb '24

07 Feb '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35893?usp=email ) Change subject: AAA-Server: s6b: Fetch UE FSM Pid without asking SWm module ...................................................................... AAA-Server: s6b: Fetch UE FSM Pid without asking SWm module Instead, keep the implementation in the UE FSM module itself, and take advantage of the fact that the PID is registered and can be derived from the IMSI. Change-Id: I0e62f3715da61d2d8cfabaf89557aeb1cd95f89a --- M src/aaa_diameter_s6b_cb.erl M src/aaa_diameter_swm.erl M src/aaa_ue_fsm.erl 3 files changed, 34 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/93/35893/1 diff --git a/src/aaa_diameter_s6b_cb.erl b/src/aaa_diameter_s6b_cb.erl index 339f735..7e3915d 100644 --- a/src/aaa_diameter_s6b_cb.erl +++ b/src/aaa_diameter_s6b_cb.erl @@ -59,15 +59,15 @@ 'Auth-Request-Type' = AuthReqType, 'User-Name' = [UserName], 'Service-Selection' = [Apn]} = Req, - Result = aaa_diameter_swm:get_ue_fsm_by_imsi(UserName), - case Result of - {ok, Pid} -> - ok = aaa_ue_fsm:ev_rx_s6b_aar(Pid, Apn), + PidRes = aaa_ue_fsm:get_pid_by_imsi(UserName), + case PidRes of + PidRes when is_pid(PidRes) -> + ok = aaa_ue_fsm:ev_rx_s6b_aar(PidRes, Apn), lager:debug("Waiting for S6b AAA~n", []), receive {aaa, ResultCode} -> lager:debug("Rx AAA with ResultCode=~p~n", [ResultCode]) end; - _ -> lager:error("Error looking up FSM for IMSI~n", [UserName]), + undefined -> lager:error("Error looking up FSM for IMSI~n", [UserName]), ResultCode = ?'RULE-FAILURE-CODE_CM_AUTHORIZATION_REJECTED' end, Resp = #'AAA'{'Session-Id'= SessionId, @@ -88,10 +88,10 @@ 'Auth-Application-Id' = _AuthAppId, 'Termination-Cause' = _TermCause, 'User-Name' = [UserName]} = Req, - Result = aaa_diameter_swm:get_ue_fsm_by_imsi(UserName), - case Result of - {ok, Pid} -> - case aaa_ue_fsm:ev_rx_s6b_str(Pid) of + PidRes = aaa_ue_fsm:get_pid_by_imsi(UserName), + case PidRes of + PidRes when is_pid(PidRes) -> + case aaa_ue_fsm:ev_rx_s6b_str(PidRes) of ok -> lager:debug("Waiting for S6b STA~n", []), receive @@ -104,7 +104,7 @@ {error, _} -> ResultCode = ?'RULE-FAILURE-CODE_CM_AUTHORIZATION_REJECTED' end; - _ -> lager:error("Error looking up FSM for IMSI~n", [UserName]), + undefined -> lager:error("Error looking up FSM for IMSI~n", [UserName]), ResultCode = ?'RULE-FAILURE-CODE_CM_AUTHORIZATION_REJECTED' end, % 3GPP TS 29.273 9.2.2.3.2 Session-Termination-Answer (STA) Command: diff --git a/src/aaa_diameter_swm.erl b/src/aaa_diameter_swm.erl index bcedcac..ee3a8cb 100644 --- a/src/aaa_diameter_swm.erl +++ b/src/aaa_diameter_swm.erl @@ -19,7 +19,6 @@ -export([start_link/0]). -export([init/1, handle_call/3, handle_cast/2, handle_info/2]). -export([code_change/3, terminate/2]). --export([get_ue_fsm_by_imsi/1]). -export([auth_request/1, auth_compl_request/2, session_termination_request/1]). -export([auth_response/2, auth_compl_response/2, session_termination_answer/2]). @@ -33,9 +32,6 @@ TableId = ets:new(auth_req, [bag, named_table]), {ok, #swm_state{table_id = TableId}}. -get_ue_fsm_by_imsi(Imsi) -> - _Result = gen_server:call(?SERVER, {get_ue_fsm_by_imsi, Imsi}). - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Tx over emulated SWm wire: %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -101,16 +97,6 @@ error_logger:error_report(["unknown handle_info", {module, ?MODULE}, {info, Info}, {state, S}]), {noreply, S}. -handle_call({get_ue_fsm_by_imsi, Imsi}, _From, State) -> - Sess = find_swm_session_by_imsi(Imsi, State), - lager:debug("find_swm_session_by_imsi(~p) returned ~p~n", [Imsi, Sess]), - case Sess of - #swm_session{} -> - {reply, {ok ,Sess#swm_session.pid}, State}; - undefined -> - {reply, {error, imsi_unknown}, State} - end; - handle_call({epdg_auth_resp, Imsi, Result}, _From, State) -> epdg_diameter_swm:auth_response(Imsi, Result), {reply, ok, State}; diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index 52918d2..5cdb553 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -40,6 +40,7 @@ -export([start_link/1]). -export([init/1,callback_mode/0,terminate/3]). +-export([get_server_name_by_imsi/1, get_pid_by_imsi/1]). -export([ev_swm_auth_req/1, ev_swm_auth_compl/2, ev_rx_swm_str/1, ev_rx_swx_maa/2, ev_rx_swx_saa/2, ev_rx_s6b_aar/2, ev_rx_s6b_str/1]). -export([state_new/3, state_wait_swx_maa/3, state_wait_swx_saa/3, state_authenticated/3, state_authenticated_wait_swx_saa/3]). @@ -52,10 +53,18 @@ s6b_resp_pid :: pid() }). -start_link(Imsi) -> +get_server_name_by_imsi(Imsi) -> ServerName = lists:concat([?NAME, "_", Imsi]), + list_to_atom(ServerName). + +get_pid_by_imsi(Imsi) -> + ServerName = get_server_name_by_imsi(Imsi), + whereis(ServerName). + +start_link(Imsi) -> + ServerName = get_server_name_by_imsi(Imsi), lager:info("ue_fsm start_link(~p)~n", [ServerName]), - gen_statem:start_link({local, list_to_atom(ServerName)}, ?MODULE, Imsi, [{debug, [trace]}]). + gen_statem:start_link({local, ServerName}, ?MODULE, Imsi, [{debug, [trace]}]). ev_swm_auth_req(Pid) -> lager:info("ue_fsm ev_swm_auth_req~n", []), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35893?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I0e62f3715da61d2d8cfabaf89557aeb1cd95f89a Gerrit-Change-Number: 35893 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in ...osmo-epdg[master]: gsup_server: Log error if epdg_ue_fsm:auth_request() fails
by pespin 07 Feb '24

07 Feb '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35891?usp=email ) Change subject: gsup_server: Log error if epdg_ue_fsm:auth_request() fails ...................................................................... gsup_server: Log error if epdg_ue_fsm:auth_request() fails Change-Id: Iea5cc5736d8de9d652c15d9bc12ab16833c1ae7b --- M src/gsup_server.erl 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/91/35891/1 diff --git a/src/gsup_server.erl b/src/gsup_server.erl index 5c536fc..0c7a723 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -235,7 +235,8 @@ {UE, State1} = find_or_new_gsups_ue(Imsi, State0), case epdg_ue_fsm:auth_request(UE#gsups_ue.pid) of ok -> ok; - {error, _} -> + {error, Err} -> + lager:error("Auth Req for Imsi ~p failed: ~p~n", [Imsi, Err]), Resp = #{message_type => send_auth_info_err, imsi => Imsi, message_class => 5, -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35891?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Iea5cc5736d8de9d652c15d9bc12ab16833c1ae7b Gerrit-Change-Number: 35891 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in ...osmo-epdg[master]: gsup_server: Fix removal of session from set
by pespin 07 Feb '24

07 Feb '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35894?usp=email ) Change subject: gsup_server: Fix removal of session from set ...................................................................... gsup_server: Fix removal of session from set Change-Id: Iec9bce7494e3849c9e94158516f471f97182725b --- M src/gsup_server.erl 1 file changed, 22 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/94/35894/1 diff --git a/src/gsup_server.erl b/src/gsup_server.erl index fd2a8b5..8a070bf 100644 --- a/src/gsup_server.erl +++ b/src/gsup_server.erl @@ -198,7 +198,7 @@ } end, tx_gsup(Socket, Resp), - State1 = delete_gsups_ue(Imsi, State0), + State1 = delete_gsups_ue_by_imsi(Imsi, State0), {noreply, State1}; % Our GSUP CEAI implementation for "IKEv2 Information Delete Request" @@ -244,7 +244,7 @@ }, tx_gsup(Socket, Resp), epdg_ue_fsm:stop(UE#gsups_ue.pid), - State2 = delete_gsups_ue(Imsi, State1) + State2 = delete_gsups_ue(UE, State1) end, {noreply, State2}; @@ -331,7 +331,7 @@ lager:info("GSUP: Rx ~p~n", [GsupMsgRx]), UE = find_gsups_ue_by_imsi(Imsi, State0), case UE of - #gsups_ue{imsi = Imsi} -> State1 = delete_gsups_ue(Imsi, State0); + #gsups_ue{imsi = Imsi} -> State1 = delete_gsups_ue(UE, State0); undefined -> State1 = State0 end, {noreply, State1}; @@ -401,6 +401,13 @@ new_gsups_ue(Imsi, State) end. -delete_gsups_ue(Imsi, State) -> - SetRemoved = sets:del_element(Imsi, State#gsups_state.ues), - State#gsups_state{ues = SetRemoved}. \ No newline at end of file +delete_gsups_ue(UE, State) -> + SetRemoved = sets:del_element(UE, State#gsups_state.ues), + lager:debug("Removed UE ~p from ~p~n", [UE, SetRemoved]), + State#gsups_state{ues = SetRemoved}. + +delete_gsups_ue_by_imsi(Imsi, State) -> + case find_gsups_ue_by_imsi(Imsi, State) of + undefined -> State; + UE-> delete_gsups_ue(UE, State) + end. \ No newline at end of file -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35894?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Iec9bce7494e3849c9e94158516f471f97182725b Gerrit-Change-Number: 35894 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in ...osmo-epdg[master]: epdg_diameter_swm: Update PID if session already exists
by pespin 07 Feb '24

07 Feb '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35895?usp=email ) Change subject: epdg_diameter_swm: Update PID if session already exists ...................................................................... epdg_diameter_swm: Update PID if session already exists If the FSM was recreated, during the first step it may have a different PID. Update it so that we send the answer back to the proper PID. Change-Id: I5e4f0ff4292c364f47d61ba629df50e8e3d35017 --- M src/epdg_diameter_swm.erl 1 file changed, 22 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/95/35895/1 diff --git a/src/epdg_diameter_swm.erl b/src/epdg_diameter_swm.erl index 57c0921..800df44 100644 --- a/src/epdg_diameter_swm.erl +++ b/src/epdg_diameter_swm.erl @@ -181,7 +181,15 @@ Sess = find_swm_session_by_imsi(Imsi, State), case Sess of #swm_session{imsi = Imsi} -> - {Sess, State}; + % Update Pid since it may have changed: + Sess1 = Sess#swm_session{pid = Pid}, + State1 = update_swm_session(Sess, Sess1, State), + {Sess1, State1}; undefined -> new_swm_session(Imsi, Pid, State) - end. \ No newline at end of file + end. + +update_swm_session(OldSess, NewSess, State) -> + SetRemoved = sets:del_element(OldSess, State#swm_state.sessions), + SetUpdated = sets:add_element(NewSess, SetRemoved), + State#swm_state{sessions = SetUpdated}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35895?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I5e4f0ff4292c364f47d61ba629df50e8e3d35017 Gerrit-Change-Number: 35895 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log