March 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ggsn[master]: pco.h: Fix typo in reference to spec

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27568 ) Change subject: pco.h: Fix typo in reference to spec ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ic428892161123b62d25a7619128ef7325bf85500 Gerrit-Change-Number: 27568 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 24 Mar 2022 14:14:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ggsn[master]: pco.h: Fix typo in reference to spec

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27568 ) Change subject: pco.h: Fix typo in reference to spec ...................................................................... pco.h: Fix typo in reference to spec Change-Id: Ic428892161123b62d25a7619128ef7325bf85500 --- M ggsn/pco.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/68/27568/1 diff --git a/ggsn/pco.h b/ggsn/pco.h index 7ebe05a..4d999ef 100644 --- a/ggsn/pco.h +++ b/ggsn/pco.h @@ -4,7 +4,7 @@ #include "../gtp/pdp.h" -/* 3GPP TS 24.008 10.6.5.3 */ +/* 3GPP TS 24.008 10.5.6.3 */ enum pco_protocols { PCO_P_LCP = 0xC021, PCO_P_PAP = 0xC023, -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27568 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ic428892161123b62d25a7619128ef7325bf85500 Gerrit-Change-Number: 27568 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/BSSMAP_Templates: add missing LCS {Priority,QoS} IEs

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27567 ) Change subject: library/BSSMAP_Templates: add missing LCS {Priority,QoS} IEs ...................................................................... library/BSSMAP_Templates: add missing LCS {Priority,QoS} IEs According to 3GPP TS 48.008, section 3.2.1.71, the LCS QoS IE shall be present if location of the target MS is requested and is optional otherwise. Since [1], osmo-bsc started to check presence of this IE, so let's add it to ts_BSSMAP_Perform_Location_Request. Taking a chance, let's also add LCS Priority IE. Change-Id: If2bd6e636d3ee695abab9ed40417dc53ec68fd12 Related: [1] osmo-bsc.git Ifeb359b0468845da0b4fed9e2e4b79256067fa81 Related: SYS#5891 --- M library/BSSMAP_Templates.ttcn 1 file changed, 32 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index 07c7c8d..376cea6 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -1881,10 +1881,39 @@ category := category } +template (value) BSSMAP_IE_LCSPriority +ts_BSSMAP_IE_LCSPriority(template (value) OCT1 priority := '00'O) := { + elementIdentifier := '43'O, + lengthIndicator := 0, /* overwritten */ + priority := priority +} + +template (value) BSSMAP_IE_LCSQOS +ts_BSSMAP_IE_LCSQOS(template (value) BIT1 vCI := '0'B, + template (value) BIT1 vEL := '0'B, + template (value) BIT1 hAI := '1'B, + template (value) BIT7 hAV := '0010010'B, + template (value) BIT1 vAI := '0'B, + template (value) BIT7 vAV := '0000000'B) := { + elementIdentifier := '3E'O, + lengthIndicator := 0, /* overwritten */ + vCI := vCI, /* Vertical Coordinate Indicator: VC requested ('1'B) or not ('0'B) */ + vEL := vEL, /* report velocity if available (1) or not(0) */ + spare_1_6 := '000000'B, + horizontalAccuracy := hAV, /* Accuracy Horizontal (HA) */ + hAI := hAI, /* Horizontal Accuracy Indicator HA is specified (1) or not (0) */ + verticalAccuracy := vAV, /* Accuracy Vertical (VA) */ + vAI := vAI, /* Vertical Accuracy Indicator VA is specified (1) or not (0) */ + spare_2_6 := '000000'B, + rTC := '00'B /* Response Time is not specified */ +} + template (value) PDU_BSSAP ts_BSSMAP_Perform_Location_Request(template (omit) BSSMAP_IE_IMSI imsi, template (omit) BSSMAP_IE_CellIdentifier cellIdentifier := omit, - template (omit) BSSMAP_IE_LCSClientType clientType := ts_BSSMAP_IE_LCSClientType) + template (omit) BSSMAP_IE_LCSClientType clientType := ts_BSSMAP_IE_LCSClientType, + template (omit) BSSMAP_IE_LCSPriority priority := ts_BSSMAP_IE_LCSPriority, + template (omit) BSSMAP_IE_LCSQOS qos := ts_BSSMAP_IE_LCSQOS) modifies ts_BSSAP_BSSMAP := { pdu := { bssmap := { @@ -1895,8 +1924,8 @@ classmarkInformationType3 := omit, lCS_ClientType := clientType, chosenChannel := omit, - lCS_Priority := omit, - lCS_QOS := omit, + lCS_Priority := priority, + lCS_QOS := qos, gPS_AssistanceData := omit, aPDU := omit, iMSI := imsi, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27567 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: If2bd6e636d3ee695abab9ed40417dc53ec68fd12 Gerrit-Change-Number: 27567 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/BSSAP_LE_Types: fix wrong IEI in record BSSMAP_LE_IE_LcsClien...

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27565 ) Change subject: library/BSSAP_LE_Types: fix wrong IEI in record BSSMAP_LE_IE_LcsClientType ...................................................................... library/BSSAP_LE_Types: fix wrong IEI in record BSSMAP_LE_IE_LcsClientType Change-Id: Ifae1efa1717a5dbc7ecd4b5ba83e3866ff803390 Related: SYS#5891 --- M library/BSSAP_LE_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/library/BSSAP_LE_Types.ttcn b/library/BSSAP_LE_Types.ttcn index ddff90a..e007180 100644 --- a/library/BSSAP_LE_Types.ttcn +++ b/library/BSSAP_LE_Types.ttcn @@ -288,7 +288,7 @@ uint8_t len, BSSMAP_LE_ClientType cltype } with { - variant "PRESENCE(iei = BSSMAP_LE_IEI_CAUSE)" + variant "PRESENCE(iei = BSSMAP_LE_IEI_LCS_CLIENT_TYPE)" variant (len) "LENGTHTO(cltype)" } type enumerated BSSMAP_LE_ClientType { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27565 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: Ifae1efa1717a5dbc7ecd4b5ba83e3866ff803390 Gerrit-Change-Number: 27565 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/BSSMAP_Templates: add missing LCS Client Type IE

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27566 ) Change subject: library/BSSMAP_Templates: add missing LCS Client Type IE ...................................................................... library/BSSMAP_Templates: add missing LCS Client Type IE According to 3GPP TS 48.008, section 3.2.1.71, the LCS Client Type IE shall be present if the location type indicates a request for a location estimate and is optional otherwise. Since [1], osmo-bsc started to check presence of this IE, so let's make sure that it's present in ts_BSSMAP_Perform_Location_Request by default. Change-Id: I5c8d6962e957d587dc4b65d08bf56bd4ef2f0d6e Related: [1] osmo-bsc.git Id3262e67c3dc25cb93fbd52a40689c5529ca2d41 Related: SYS#5891 --- M library/BSSMAP_Templates.ttcn 1 file changed, 14 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve neels: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index 57422cc..07c7c8d 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -1872,9 +1872,19 @@ positioningMethod := omit } -template (value) PDU_BSSAP ts_BSSMAP_Perform_Location_Request(template (omit) BSSMAP_IE_IMSI imsi, - template (omit) BSSMAP_IE_CellIdentifier cellIdentifier := omit - ) +template (value) BSSMAP_IE_LCSClientType +ts_BSSMAP_IE_LCSClientType(template (value) BIT4 category := '0010'B, + template (value) BIT4 subtype := '0000'B) := { + elementIdentifier := '48'O, + lengthIndicator := 0, /* overwritten */ + subtype := subtype, + category := category +} + +template (value) PDU_BSSAP +ts_BSSMAP_Perform_Location_Request(template (omit) BSSMAP_IE_IMSI imsi, + template (omit) BSSMAP_IE_CellIdentifier cellIdentifier := omit, + template (omit) BSSMAP_IE_LCSClientType clientType := ts_BSSMAP_IE_LCSClientType) modifies ts_BSSAP_BSSMAP := { pdu := { bssmap := { @@ -1883,7 +1893,7 @@ locationType := ts_BSSMAP_IE_LocationType, cellIdentifier := cellIdentifier, classmarkInformationType3 := omit, - lCS_ClientType := omit, + lCS_ClientType := clientType, chosenChannel := omit, lCS_Priority := omit, lCS_QOS := omit, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27566 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: I5c8d6962e957d587dc4b65d08bf56bd4ef2f0d6e Gerrit-Change-Number: 27566 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/BSSMAP_Templates: add missing LCS Client Type IE

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27566 ) Change subject: library/BSSMAP_Templates: add missing LCS Client Type IE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27566 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: I5c8d6962e957d587dc4b65d08bf56bd4ef2f0d6e Gerrit-Change-Number: 27566 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Mar 2022 16:40:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/BSSMAP_Templates: add missing LCS {Priority,QoS} IEs

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27567 ) Change subject: library/BSSMAP_Templates: add missing LCS {Priority,QoS} IEs ...................................................................... Patch Set 1: (1 comment) File library/BSSMAP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27567/comment/54842a15_e0c1… PS1, Line 1908: rTC := '00'B /* Response Time is not specified */ > so many magic numbers... […] Same here, BSSMAP_IE_LCSQOS comes from Ericsson's protocol modules (see my comment to I5c8d6962e957d587dc4b65d08bf56bd4ef2f0d6e). -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27567 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: If2bd6e636d3ee695abab9ed40417dc53ec68fd12 Gerrit-Change-Number: 27567 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Mar 2022 15:35:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/BSSMAP_Templates: add missing LCS Client Type IE

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27566 ) Change subject: library/BSSMAP_Templates: add missing LCS Client Type IE ...................................................................... Patch Set 1: (1 comment) File library/BSSMAP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27566/comment/e1c1b0c9_9e5f… PS1, Line 1877: template (value) BIT4 subtype := '0000'B) := { > would it make sense to define enums for these? Indeed it would make sense. The problem is that BSSMAP_IE_LCSClientType comes from Ericsson's protocol modules (external deps), and somehow they prefer using BITs and OCTs over the enumerated types. So not in this case, unfortunately :/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27566 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: I5c8d6962e957d587dc4b65d08bf56bd4ef2f0d6e Gerrit-Change-Number: 27566 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Mar 2022 15:34:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-upf[master]: libosmo-pfcp: add pfcp_proto.h pfcp_strs.h

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/27221 ) Change subject: libosmo-pfcp: add pfcp_proto.h pfcp_strs.h ...................................................................... Patch Set 7: (1 comment) Patchset: PS1: > python script parsing from the spec .docx file. See open5gs. […] you'd think they could officially publish these numbers and strings in an easily parseable way... -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/27221 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I568b821e89007ed52eeefcdbcb6edd8052a8b5be Gerrit-Change-Number: 27221 Gerrit-PatchSet: 7 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Mar 2022 15:34:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/BSSMAP_Templates: add missing LCS {Priority,QoS} IEs

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27567 ) Change subject: library/BSSMAP_Templates: add missing LCS {Priority,QoS} IEs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27567 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: If2bd6e636d3ee695abab9ed40417dc53ec68fd12 Gerrit-Change-Number: 27567 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Mar 2022 15:32:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/BSSMAP_Templates: add missing LCS {Priority,QoS} IEs

by neels

Attention is currently required from: fixeria. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27567 ) Change subject: library/BSSMAP_Templates: add missing LCS {Priority,QoS} IEs ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File library/BSSMAP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27567/comment/730a157f_30a2… PS1, Line 1908: rTC := '00'B /* Response Time is not specified */ so many magic numbers... i guess it would be quite some effort to define these values in enums? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27567 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: If2bd6e636d3ee695abab9ed40417dc53ec68fd12 Gerrit-Change-Number: 27567 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Mar 2022 15:29:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/BSSMAP_Templates: add missing LCS Client Type IE

by neels

Attention is currently required from: fixeria. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27566 ) Change subject: library/BSSMAP_Templates: add missing LCS Client Type IE ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File library/BSSMAP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27566/comment/2e1e375e_f70c… PS1, Line 1877: template (value) BIT4 subtype := '0000'B) := { would it make sense to define enums for these? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27566 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: I5c8d6962e957d587dc4b65d08bf56bd4ef2f0d6e Gerrit-Change-Number: 27566 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Mar 2022 15:28:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/BSSMAP_Templates: add missing LCS Client Type IE

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27566 ) Change subject: library/BSSMAP_Templates: add missing LCS Client Type IE ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27566 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: I5c8d6962e957d587dc4b65d08bf56bd4ef2f0d6e Gerrit-Change-Number: 27566 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Mar 2022 15:27:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/BSSAP_LE_Types: fix wrong IEI in record BSSMAP_LE_IE_LcsClien...

by neels

Attention is currently required from: osmith, laforge, fixeria, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27565 ) Change subject: library/BSSAP_LE_Types: fix wrong IEI in record BSSMAP_LE_IE_LcsClientType ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27565 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: Ifae1efa1717a5dbc7ecd4b5ba83e3866ff803390 Gerrit-Change-Number: 27565 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Mar 2022 15:27:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/BSSMAP_Templates: add missing LCS {Priority,QoS} IEs

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27567 ) Change subject: library/BSSMAP_Templates: add missing LCS {Priority,QoS} IEs ...................................................................... library/BSSMAP_Templates: add missing LCS {Priority,QoS} IEs According to 3GPP TS 48.008, section 3.2.1.71, the LCS QoS IE shall be present if location of the target MS is requested and is optional otherwise. Since [1], osmo-bsc started to check presence of this IE, so let's add it to ts_BSSMAP_Perform_Location_Request. Taking a chance, let's also add LCS Priority IE. Change-Id: If2bd6e636d3ee695abab9ed40417dc53ec68fd12 Related: [1] osmo-bsc.git Ifeb359b0468845da0b4fed9e2e4b79256067fa81 Related: SYS#5891 --- M library/BSSMAP_Templates.ttcn 1 file changed, 32 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/67/27567/1 diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index 07c7c8d..376cea6 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -1881,10 +1881,39 @@ category := category } +template (value) BSSMAP_IE_LCSPriority +ts_BSSMAP_IE_LCSPriority(template (value) OCT1 priority := '00'O) := { + elementIdentifier := '43'O, + lengthIndicator := 0, /* overwritten */ + priority := priority +} + +template (value) BSSMAP_IE_LCSQOS +ts_BSSMAP_IE_LCSQOS(template (value) BIT1 vCI := '0'B, + template (value) BIT1 vEL := '0'B, + template (value) BIT1 hAI := '1'B, + template (value) BIT7 hAV := '0010010'B, + template (value) BIT1 vAI := '0'B, + template (value) BIT7 vAV := '0000000'B) := { + elementIdentifier := '3E'O, + lengthIndicator := 0, /* overwritten */ + vCI := vCI, /* Vertical Coordinate Indicator: VC requested ('1'B) or not ('0'B) */ + vEL := vEL, /* report velocity if available (1) or not(0) */ + spare_1_6 := '000000'B, + horizontalAccuracy := hAV, /* Accuracy Horizontal (HA) */ + hAI := hAI, /* Horizontal Accuracy Indicator HA is specified (1) or not (0) */ + verticalAccuracy := vAV, /* Accuracy Vertical (VA) */ + vAI := vAI, /* Vertical Accuracy Indicator VA is specified (1) or not (0) */ + spare_2_6 := '000000'B, + rTC := '00'B /* Response Time is not specified */ +} + template (value) PDU_BSSAP ts_BSSMAP_Perform_Location_Request(template (omit) BSSMAP_IE_IMSI imsi, template (omit) BSSMAP_IE_CellIdentifier cellIdentifier := omit, - template (omit) BSSMAP_IE_LCSClientType clientType := ts_BSSMAP_IE_LCSClientType) + template (omit) BSSMAP_IE_LCSClientType clientType := ts_BSSMAP_IE_LCSClientType, + template (omit) BSSMAP_IE_LCSPriority priority := ts_BSSMAP_IE_LCSPriority, + template (omit) BSSMAP_IE_LCSQOS qos := ts_BSSMAP_IE_LCSQOS) modifies ts_BSSAP_BSSMAP := { pdu := { bssmap := { @@ -1895,8 +1924,8 @@ classmarkInformationType3 := omit, lCS_ClientType := clientType, chosenChannel := omit, - lCS_Priority := omit, - lCS_QOS := omit, + lCS_Priority := priority, + lCS_QOS := qos, gPS_AssistanceData := omit, aPDU := omit, iMSI := imsi, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27567 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: If2bd6e636d3ee695abab9ed40417dc53ec68fd12 Gerrit-Change-Number: 27567 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/BSSAP_LE_Types: fix wrong IEI in record BSSMAP_LE_IE_LcsClien...

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27565 ) Change subject: library/BSSAP_LE_Types: fix wrong IEI in record BSSMAP_LE_IE_LcsClientType ...................................................................... library/BSSAP_LE_Types: fix wrong IEI in record BSSMAP_LE_IE_LcsClientType Change-Id: Ifae1efa1717a5dbc7ecd4b5ba83e3866ff803390 Related: SYS#5891 --- M library/BSSAP_LE_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/27565/1 diff --git a/library/BSSAP_LE_Types.ttcn b/library/BSSAP_LE_Types.ttcn index ddff90a..e007180 100644 --- a/library/BSSAP_LE_Types.ttcn +++ b/library/BSSAP_LE_Types.ttcn @@ -288,7 +288,7 @@ uint8_t len, BSSMAP_LE_ClientType cltype } with { - variant "PRESENCE(iei = BSSMAP_LE_IEI_CAUSE)" + variant "PRESENCE(iei = BSSMAP_LE_IEI_LCS_CLIENT_TYPE)" variant (len) "LENGTHTO(cltype)" } type enumerated BSSMAP_LE_ClientType { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27565 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: Ifae1efa1717a5dbc7ecd4b5ba83e3866ff803390 Gerrit-Change-Number: 27565 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/BSSMAP_Templates: add missing LCS Client Type IE

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27566 ) Change subject: library/BSSMAP_Templates: add missing LCS Client Type IE ...................................................................... library/BSSMAP_Templates: add missing LCS Client Type IE According to 3GPP TS 48.008, section 3.2.1.71, the LCS Client Type IE shall be present if the location type indicates a request for a location estimate and is optional otherwise. Since [1], osmo-bsc started to check presence of this IE, so let's make sure that it's present in ts_BSSMAP_Perform_Location_Request by default. Change-Id: I5c8d6962e957d587dc4b65d08bf56bd4ef2f0d6e Related: [1] osmo-bsc.git Id3262e67c3dc25cb93fbd52a40689c5529ca2d41 Related: SYS#5891 --- M library/BSSMAP_Templates.ttcn 1 file changed, 14 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/27566/1 diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index 57422cc..07c7c8d 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -1872,9 +1872,19 @@ positioningMethod := omit } -template (value) PDU_BSSAP ts_BSSMAP_Perform_Location_Request(template (omit) BSSMAP_IE_IMSI imsi, - template (omit) BSSMAP_IE_CellIdentifier cellIdentifier := omit - ) +template (value) BSSMAP_IE_LCSClientType +ts_BSSMAP_IE_LCSClientType(template (value) BIT4 category := '0010'B, + template (value) BIT4 subtype := '0000'B) := { + elementIdentifier := '48'O, + lengthIndicator := 0, /* overwritten */ + subtype := subtype, + category := category +} + +template (value) PDU_BSSAP +ts_BSSMAP_Perform_Location_Request(template (omit) BSSMAP_IE_IMSI imsi, + template (omit) BSSMAP_IE_CellIdentifier cellIdentifier := omit, + template (omit) BSSMAP_IE_LCSClientType clientType := ts_BSSMAP_IE_LCSClientType) modifies ts_BSSAP_BSSMAP := { pdu := { bssmap := { @@ -1883,7 +1893,7 @@ locationType := ts_BSSMAP_IE_LocationType, cellIdentifier := cellIdentifier, classmarkInformationType3 := omit, - lCS_ClientType := omit, + lCS_ClientType := clientType, chosenChannel := omit, lCS_Priority := omit, lCS_QOS := omit, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27566 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: I5c8d6962e957d587dc4b65d08bf56bd4ef2f0d6e Gerrit-Change-Number: 27566 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: tweak get_peer_addr

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27477 ) Change subject: bsc_nat_fsm: tweak get_peer_addr ...................................................................... bsc_nat_fsm: tweak get_peer_addr Rename the function from sccp_sap_get_peer_addr_in to get_peer_addr to make the code using it slightly more readable. The _in at the end of the function is not needed anymore, this was used to differentiate from peer_addr_out which was used in the caller code before the connection mapping was implemented in I1556aa665fbb0a97507f98794e74820731fa6935. Now instead of peer_addr_out, subscr_conn->bsc->addr or subscr_conn->msc->addr are used. Rename variable arguments to sccp_inst and addr to be consistent with the variable names in the callers. Related: SYS#5560 Change-Id: Ie023360724254be54cbaac4490b0341dfe68399f --- M src/osmo-bsc-nat/bsc_nat_fsm.c 1 file changed, 10 insertions(+), 13 deletions(-) Approvals: osmith: Looks good to me, approved; Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 090c38f..d3a3b01 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -52,14 +52,14 @@ /* For connection-oriented messages, figure out which side is not the BSCNAT, * either the called_addr or calling_addr. */ -static int sccp_sap_get_peer_addr_in(struct bsc_nat_sccp_inst *src, struct osmo_sccp_addr **peer_addr_in, - struct osmo_sccp_addr *called_addr, struct osmo_sccp_addr *calling_addr) +static int get_peer_addr(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr **addr, + struct osmo_sccp_addr *called_addr, struct osmo_sccp_addr *calling_addr) { - if (osmo_sccp_addr_ri_cmp(&src->addr, called_addr) != 0) { - *peer_addr_in = called_addr; + if (osmo_sccp_addr_ri_cmp(&sccp_inst->addr, called_addr) != 0) { + *addr = called_addr; return 0; - } else if (osmo_sccp_addr_ri_cmp(&src->addr, calling_addr) != 0) { - *peer_addr_in = calling_addr; + } else if (osmo_sccp_addr_ri_cmp(&sccp_inst->addr, calling_addr) != 0) { + *addr = calling_addr; return 0; } @@ -71,7 +71,7 @@ LOGP(DMAIN, LOGL_ERROR, "Invalid connection oriented message, locally configured address %s" " is neither called address %s nor calling address %s!\n", - osmo_sccp_inst_addr_name(NULL, &src->addr), buf_called, buf_calling); + osmo_sccp_inst_addr_name(NULL, &sccp_inst->addr), buf_called, buf_calling); return -1; } @@ -96,8 +96,7 @@ case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_CONFIRM): /* indication of connection confirm */ - if (sccp_sap_get_peer_addr_in(sccp_inst, &addr, &prim->u.connect.called_addr, - &prim->u.connect.calling_addr) < 0) + if (get_peer_addr(sccp_inst, &addr, &prim->u.connect.called_addr, &prim->u.connect.calling_addr) < 0) goto error; subscr_conn = subscr_conn_get_by_id(prim->u.connect.conn_id, BSC_NAT_NET_CN); @@ -195,8 +194,7 @@ switch (OSMO_PRIM_HDR(oph)) { case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION): /* indication of new inbound connection request */ - if (sccp_sap_get_peer_addr_in(sccp_inst, &addr, &prim->u.connect.called_addr, - &prim->u.connect.calling_addr) < 0) + if (get_peer_addr(sccp_inst, &addr, &prim->u.connect.called_addr, &prim->u.connect.calling_addr) < 0) goto error; bsc = bsc_get_by_pc(addr->pc); @@ -225,8 +223,7 @@ case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_CONFIRM): /* indication of connection confirm */ - if (sccp_sap_get_peer_addr_in(sccp_inst, &addr, &prim->u.connect.called_addr, - &prim->u.connect.calling_addr) < 0) + if (get_peer_addr(sccp_inst, &addr, &prim->u.connect.called_addr, &prim->u.connect.calling_addr) < 0) goto error; subscr_conn = subscr_conn_get_by_id(prim->u.connect.conn_id, BSC_NAT_NET_RAN); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Ie023360724254be54cbaac4490b0341dfe68399f Gerrit-Change-Number: 27477 Gerrit-PatchSet: 5 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: tweak get_peer_addr

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27477 ) Change subject: bsc_nat_fsm: tweak get_peer_addr ...................................................................... Patch Set 5: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27477 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Ie023360724254be54cbaac4490b0341dfe68399f Gerrit-Change-Number: 27477 Gerrit-PatchSet: 5 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Mar 2022 09:22:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: README: add Manual Testing With osmo-dev

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27478 ) Change subject: README: add Manual Testing With osmo-dev ...................................................................... README: add Manual Testing With osmo-dev Describe the manual testing that can be done with osmo-dev with the changes up to I78ef36c72ff9a7b801e922eccc89dc44fbba7f23. Related: SYS#5560 Change-Id: I3c3369b6d1a50ec3af19ee826cf2f94530d5d7fd --- M README.md 1 file changed, 23 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved; Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/README.md b/README.md index 8ed9954..ca367a2 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,29 @@ [Osmocom Mailing List Rules](https://osmocom.org/projects/cellular-infrastructure/wiki/Mailing_Li… when posting. +Manual Testing With osmo-dev +---------- + +With [osmo-dev](https://git.osmocom.org/osmo-dev/) it is possible to +build all Osmocom components for a full test network with OsmoBSCNAT, +and run the network on your PC. Set up the make directory as described +in osmo-dev's README, then build components with: + +``` +$ make cn-bsc-nat +``` + +Set up a network as described in osmo-dev's net/README, then put the +following in your configuration to let it run osmo-bsc-nat with one +virtual BSC, BTS and MS (can be used next to a real BSC/BTS/MS): + +``` +BSC_COUNT=2 +BTS1_RUN_IN_OSMO_DEV=1 +STP_RAN_IP="127.0.0.2" +MS_RUN_IN_OSMO_DEV=1 +``` + Contributing ------------ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I3c3369b6d1a50ec3af19ee826cf2f94530d5d7fd Gerrit-Change-Number: 27478 Gerrit-PatchSet: 5 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: README: add Manual Testing With osmo-dev

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27478 ) Change subject: README: add Manual Testing With osmo-dev ...................................................................... Patch Set 5: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27478 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I3c3369b6d1a50ec3af19ee826cf2f94530d5d7fd Gerrit-Change-Number: 27478 Gerrit-PatchSet: 5 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Mar 2022 09:22:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: sccp_sap_up_ran: ignore RAN until MSC is connected

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27475 ) Change subject: sccp_sap_up_ran: ignore RAN until MSC is connected ...................................................................... sccp_sap_up_ran: ignore RAN until MSC is connected Related: SYS#5560 Change-Id: Idf9501412484fa92e8836952609fba7c5443d6c9 --- M include/osmocom/bsc_nat/msc.h M src/osmo-bsc-nat/bsc_nat_fsm.c M src/osmo-bsc-nat/msc_fsm.c 3 files changed, 15 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/include/osmocom/bsc_nat/msc.h b/include/osmocom/bsc_nat/msc.h index 47b4d13..db42526 100644 --- a/include/osmocom/bsc_nat/msc.h +++ b/include/osmocom/bsc_nat/msc.h @@ -36,4 +36,6 @@ void msc_tx_reset(struct msc *msc); void msc_rx_reset_ack(struct msc *msc); +bool msc_is_connected(struct msc *msc); + void msc_free(struct msc *msc); diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 1d92ba3..ad10ea2 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -29,6 +29,7 @@ #include <osmocom/bsc_nat/bsc_nat_fsm.h> #include <osmocom/bsc_nat/bssap.h> #include <osmocom/bsc_nat/logging.h> +#include <osmocom/bsc_nat/msc.h> #define DEFAULT_PC_RAN "0.23.1" /* same as default for OsmoMSC */ #define DEFAULT_PC_CN "0.23.3" /* same as default for OsmoBSC */ @@ -208,10 +209,17 @@ struct osmo_scu_prim *prim = (struct osmo_scu_prim *) oph; struct osmo_sccp_addr *addr; /* BSC's address */ struct osmo_sccp_addr peer_addr_out; + struct msc *msc; int rc = -1; LOGP(DMAIN, LOGL_DEBUG, "Rx %s from RAN\n", osmo_scu_prim_name(oph)); + msc = msc_get(); + if (!msc_is_connected(msc)) { + LOGP(DMAIN, LOGL_DEBUG, "Ignoring message from RAN, MSC is not connected yet\n"); + goto error; + } + switch (OSMO_PRIM_HDR(oph)) { case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION): /* indication of new inbound connection request */ diff --git a/src/osmo-bsc-nat/msc_fsm.c b/src/osmo-bsc-nat/msc_fsm.c index d8b89c6..e660c57 100644 --- a/src/osmo-bsc-nat/msc_fsm.c +++ b/src/osmo-bsc-nat/msc_fsm.c @@ -152,3 +152,8 @@ { osmo_fsm_inst_dispatch(msc->fi, MSC_FSM_EV_RX_RESET_ACK, NULL); } + +bool msc_is_connected(struct msc *msc) +{ + return msc->fi->state == MSC_FSM_ST_CONNECTED; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27475 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Idf9501412484fa92e8836952609fba7c5443d6c9 Gerrit-Change-Number: 27475 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: Support forwarding messages with multiple BSCs

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27476 ) Change subject: Support forwarding messages with multiple BSCs ...................................................................... Support forwarding messages with multiple BSCs Implement a proper subscriber connection mapping. Create a new subscr_conn when one of the stored BSCs sends a conn.ind and use that subscr_conn for all related connection-oriented messages with the same RAN-side conn_id to send messages back and forth between BSC and MSC. Add subscr_conn_get_next_id based on OsmoBSC's bsc_sccp_inst_next_conn_id. With this patch, it's possible to do a successful Location Updating procedure between MS2 and MSC in the following network: MS1 --- BTS1 --- BSC1 --. BSCNAT --- MSC MS2 --- BTS2 --- BSC2 --' Related: SYS#5560 Change-Id: I1556aa665fbb0a97507f98794e74820731fa6935 --- M doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg M include/osmocom/bsc_nat/Makefile.am M include/osmocom/bsc_nat/bsc.h M include/osmocom/bsc_nat/bsc_nat.h M include/osmocom/bsc_nat/msc.h A include/osmocom/bsc_nat/subscr_conn.h M src/osmo-bsc-nat/Makefile.am M src/osmo-bsc-nat/bsc.c M src/osmo-bsc-nat/bsc_nat.c M src/osmo-bsc-nat/bsc_nat_fsm.c M src/osmo-bsc-nat/msc.c A src/osmo-bsc-nat/subscr_conn.c 12 files changed, 258 insertions(+), 85 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg b/doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg index f56dcb0..2f5ff39 100644 --- a/doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg +++ b/doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg @@ -13,10 +13,6 @@ asp asp-clnt-OsmoBSCNAT-RAN 2905 0 m3ua remote-ip 127.0.0.2 local-ip 127.0.0.4 - sccp-address bsc - routing-indicator PC - point-code 0.23.3 - subsystem-number 254 bsc-nat cs7-instance-cn 0 diff --git a/include/osmocom/bsc_nat/Makefile.am b/include/osmocom/bsc_nat/Makefile.am index 1c675f7..81dacad 100644 --- a/include/osmocom/bsc_nat/Makefile.am +++ b/include/osmocom/bsc_nat/Makefile.am @@ -5,5 +5,6 @@ bssap.h \ logging.h \ msc.h \ + subscr_conn.h \ vty.h \ $(NULL) diff --git a/include/osmocom/bsc_nat/bsc.h b/include/osmocom/bsc_nat/bsc.h index 34590b9..7c11a82 100644 --- a/include/osmocom/bsc_nat/bsc.h +++ b/include/osmocom/bsc_nat/bsc.h @@ -29,3 +29,4 @@ struct bsc *bsc_alloc(struct osmo_sccp_addr *addr); struct bsc *bsc_get_by_pc(uint32_t pointcode); void bsc_free(struct bsc *bsc); +void bsc_free_subscr_conn_all(struct bsc *bsc); diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index 9e58a79..93717cc 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -37,14 +37,17 @@ struct bsc_nat { struct osmo_fsm_inst *fi; + struct llist_head subscr_conns; /* list of struct subscr_conn */ struct { struct bsc_nat_sccp_inst *sccp_inst; + uint32_t subscr_conn_id_next; struct llist_head mscs; /* list of struct msc */ } cn; struct { struct bsc_nat_sccp_inst *sccp_inst; + uint32_t subscr_conn_id_next; struct llist_head bscs; /* list of struct bsc */ } ran; }; diff --git a/include/osmocom/bsc_nat/msc.h b/include/osmocom/bsc_nat/msc.h index db42526..77fc001 100644 --- a/include/osmocom/bsc_nat/msc.h +++ b/include/osmocom/bsc_nat/msc.h @@ -39,3 +39,4 @@ bool msc_is_connected(struct msc *msc); void msc_free(struct msc *msc); +void msc_free_subscr_conn_all(struct msc *msc); diff --git a/include/osmocom/bsc_nat/subscr_conn.h b/include/osmocom/bsc_nat/subscr_conn.h new file mode 100644 index 0000000..696e0c3 --- /dev/null +++ b/include/osmocom/bsc_nat/subscr_conn.h @@ -0,0 +1,43 @@ +/* (C) 2021 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Oliver Smith <osmith(a)sysmocom.de> + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/lienses/>. + * + */ + +#pragma once + +/* connection for one subscriber */ +struct subscr_conn { + struct llist_head list; + + struct { + uint32_t id; + struct msc *msc; + } cn; + + struct { + uint32_t id; + struct bsc *bsc; + } ran; +}; + +int subscr_conn_get_next_id(enum bsc_nat_net net); + +struct subscr_conn *subscr_conn_alloc(struct msc *msc, struct bsc *bsc, uint32_t id_cn, uint32_t id_ran); + +struct subscr_conn *subscr_conn_get_by_id(uint32_t id, enum bsc_nat_net net); + +void subscr_conn_free(struct subscr_conn *subscr_conn); diff --git a/src/osmo-bsc-nat/Makefile.am b/src/osmo-bsc-nat/Makefile.am index 8fd5667..e2b11ca 100644 --- a/src/osmo-bsc-nat/Makefile.am +++ b/src/osmo-bsc-nat/Makefile.am @@ -33,6 +33,7 @@ main.c \ msc.c \ msc_fsm.c \ + subscr_conn.c \ vty.c \ $(NULL) diff --git a/src/osmo-bsc-nat/bsc.c b/src/osmo-bsc-nat/bsc.c index 2ad6e0e..0461909 100644 --- a/src/osmo-bsc-nat/bsc.c +++ b/src/osmo-bsc-nat/bsc.c @@ -21,6 +21,7 @@ #include <osmocom/bsc_nat/bsc.h> #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/logging.h> +#include <osmocom/bsc_nat/subscr_conn.h> struct bsc *bsc_alloc(struct osmo_sccp_addr *addr) { @@ -51,9 +52,20 @@ return NULL; } +void bsc_free_subscr_conn_all(struct bsc *bsc) +{ + struct subscr_conn *subscr_conn; + + llist_for_each_entry(subscr_conn, &g_bsc_nat->subscr_conns, list) { + if (subscr_conn->ran.bsc == bsc) + subscr_conn_free(subscr_conn); + } +} + void bsc_free(struct bsc *bsc) { LOGP(DMAIN, LOGL_DEBUG, "Del %s\n", talloc_get_name(bsc)); + bsc_free_subscr_conn_all(bsc); llist_del(&bsc->list); talloc_free(bsc); } diff --git a/src/osmo-bsc-nat/bsc_nat.c b/src/osmo-bsc-nat/bsc_nat.c index 23d7498..7ba24e6 100644 --- a/src/osmo-bsc-nat/bsc_nat.c +++ b/src/osmo-bsc-nat/bsc_nat.c @@ -18,6 +18,7 @@ */ #include "config.h" +#include <inttypes.h> #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> #include <osmocom/bsc_nat/bsc.h> @@ -25,6 +26,7 @@ #include <osmocom/bsc_nat/bsc_nat_fsm.h> #include <osmocom/bsc_nat/logging.h> #include <osmocom/bsc_nat/msc.h> +#include <osmocom/bsc_nat/subscr_conn.h> struct bsc_nat *bsc_nat_alloc(void *tall_ctx) { @@ -41,6 +43,7 @@ OSMO_ASSERT(bsc_nat->ran.sccp_inst); talloc_set_name_const(bsc_nat->ran.sccp_inst, "struct bsc_nat_sccp_inst (RAN)"); + INIT_LLIST_HEAD(&bsc_nat->subscr_conns); INIT_LLIST_HEAD(&bsc_nat->cn.mscs); INIT_LLIST_HEAD(&bsc_nat->ran.bscs); @@ -51,6 +54,7 @@ void bsc_nat_free(struct bsc_nat *bsc_nat) { + struct subscr_conn *subscr_conn, *s; struct msc *msc, *m; struct bsc *bsc, *b; @@ -59,6 +63,10 @@ bsc_nat->fi = NULL; } + llist_for_each_entry_safe(subscr_conn, s, &bsc_nat->subscr_conns, list) { + subscr_conn_free(subscr_conn); + } + llist_for_each_entry_safe(msc, m, &bsc_nat->cn.mscs, list) { msc_free(msc); } diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index ad10ea2..090c38f 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -19,17 +19,20 @@ #include "config.h" #include <errno.h> +#include <inttypes.h> #include <stdint.h> #include <osmocom/core/fsm.h> #include <osmocom/core/select.h> #include <osmocom/gsm/gsm0808.h> #include <osmocom/sigtran/osmo_ss7.h> #include <osmocom/sigtran/sccp_helpers.h> +#include <osmocom/bsc_nat/bsc.h> #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/bsc_nat_fsm.h> #include <osmocom/bsc_nat/bssap.h> #include <osmocom/bsc_nat/logging.h> #include <osmocom/bsc_nat/msc.h> +#include <osmocom/bsc_nat/subscr_conn.h> #define DEFAULT_PC_RAN "0.23.1" /* same as default for OsmoMSC */ #define DEFAULT_PC_CN "0.23.3" /* same as default for OsmoBSC */ @@ -47,13 +50,6 @@ BSC_NAT_FSM_EV_STOP, }; -static struct bsc_nat_sccp_inst *sccp_inst_dest(struct bsc_nat_sccp_inst *src) -{ - if (src == g_bsc_nat->cn.sccp_inst) - return g_bsc_nat->ran.sccp_inst; - return g_bsc_nat->cn.sccp_inst; -} - /* For connection-oriented messages, figure out which side is not the BSCNAT, * either the called_addr or calling_addr. */ static int sccp_sap_get_peer_addr_in(struct bsc_nat_sccp_inst *src, struct osmo_sccp_addr **peer_addr_in, @@ -79,37 +75,13 @@ return -1; } -/* Figure out who will receive the message. - * For now this is simplified by assuming there is only one MSC, one BSC. */ -static int sccp_sap_get_peer_addr_out(struct bsc_nat_sccp_inst *src, struct osmo_sccp_addr *peer_addr_in, - struct osmo_sccp_addr *peer_addr_out) -{ - struct bsc_nat_sccp_inst *dest = sccp_inst_dest(src); - - if (src == g_bsc_nat->ran.sccp_inst) { - if (osmo_sccp_addr_by_name_local(peer_addr_out, "msc", dest->ss7_inst) < 0) { - LOGP(DMAIN, LOGL_ERROR, "Could not find MSC in address book\n"); - return -1; - } - } else { - if (osmo_sccp_addr_by_name_local(peer_addr_out, "bsc", dest->ss7_inst) < 0) { - LOGP(DMAIN, LOGL_ERROR, "Could not find BSC in address book\n"); - return -2; - } - } - - return 0; -} - -/* Handle incoming messages from CN (MSC). For now this is simplified by - * assuming there is only one MSC, one BSC (not yet translating connection ids - * etc.). */ +/* Handle incoming messages from CN (MSC) */ static int sccp_sap_up_cn(struct osmo_prim_hdr *oph, void *scu) { struct bsc_nat_sccp_inst *sccp_inst = osmo_sccp_user_get_priv(scu); struct osmo_scu_prim *prim = (struct osmo_scu_prim *) oph; struct osmo_sccp_addr *addr; /* MSC's address */ - struct osmo_sccp_addr peer_addr_out; + struct subscr_conn *subscr_conn; int rc = -1; LOGP(DMAIN, LOGL_DEBUG, "Rx %s from CN\n", osmo_scu_prim_name(oph)); @@ -117,23 +89,9 @@ switch (OSMO_PRIM_HDR(oph)) { case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION): /* indication of new inbound connection request */ - if (sccp_sap_get_peer_addr_in(sccp_inst, &addr, &prim->u.connect.called_addr, - &prim->u.connect.calling_addr) < 0) - goto error; - - if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) - goto error; - - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); - - msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_conn_req(g_bsc_nat->ran.sccp_inst->scu, - prim->u.connect.conn_id, - &g_bsc_nat->ran.sccp_inst->addr, - &peer_addr_out, - oph->msg->data, - msgb_length(oph->msg)); - rc = 0; + /* FIXME: MSC has sent a message without conn_id, figure out to + * which BSC to forward this. */ + LOGP(DMAIN, LOGL_ERROR, "%s(%s) is not implemented!\n", __func__, osmo_scu_prim_name(oph)); break; case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_CONFIRM): @@ -142,15 +100,19 @@ &prim->u.connect.calling_addr) < 0) goto error; - if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) + subscr_conn = subscr_conn_get_by_id(prim->u.connect.conn_id, BSC_NAT_NET_CN); + if (!subscr_conn) { + LOGP(DMAIN, LOGL_ERROR, "Unknown conn_id=%" PRIu32 " from %s\n", prim->u.connect.conn_id, + bsc_nat_print_addr_cn(addr)); goto error; + } - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd via %s\n", talloc_get_name(subscr_conn)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_conn_resp(g_bsc_nat->ran.sccp_inst->scu, - prim->u.connect.conn_id, - &peer_addr_out, + subscr_conn->ran.id, + &subscr_conn->ran.bsc->addr, oph->msg->data, msgb_length(oph->msg)); rc = 0; @@ -158,14 +120,18 @@ case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION): /* connection-oriented data received */ - if (sccp_sap_get_peer_addr_out(sccp_inst, NULL, &peer_addr_out) < 0) + subscr_conn = subscr_conn_get_by_id(prim->u.data.conn_id, BSC_NAT_NET_CN); + if (!subscr_conn) { + LOGP(DMAIN, LOGL_ERROR, "Unknown conn_id=%" PRIu32 " from %s\n", prim->u.data.conn_id, + bsc_nat_print_addr_cn(addr)); goto error; + } - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd via %s\n", talloc_get_name(subscr_conn)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_data(g_bsc_nat->ran.sccp_inst->scu, - prim->u.data.conn_id, + subscr_conn->ran.id, oph->msg->data, msgb_length(oph->msg)); rc = 0; @@ -173,15 +139,22 @@ case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION): /* indication of disconnect */ - if (sccp_sap_get_peer_addr_out(sccp_inst, NULL, &peer_addr_out) < 0) + subscr_conn = subscr_conn_get_by_id(prim->u.disconnect.conn_id, BSC_NAT_NET_CN); + if (!subscr_conn) { + LOGP(DMAIN, LOGL_ERROR, "Unknown conn_id=%" PRIu32 " from %s\n", prim->u.disconnect.conn_id, + bsc_nat_print_addr_cn(addr)); goto error; + } - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd via %s\n", talloc_get_name(subscr_conn)); osmo_sccp_tx_disconn(g_bsc_nat->ran.sccp_inst->scu, - prim->u.disconnect.conn_id, - &prim->u.disconnect.responding_addr, + subscr_conn->ran.id, + &g_bsc_nat->ran.sccp_inst->addr, prim->u.disconnect.cause); + + subscr_conn_free(subscr_conn); + rc = 0; break; @@ -200,16 +173,15 @@ return rc; } -/* Handle incoming messages from RAN (BSC). For now this is simplified by - * assuming there is only one MSC, one BSC (not yet translating connection ids - * etc.). */ +/* Handle incoming messages from RAN (BSC) */ static int sccp_sap_up_ran(struct osmo_prim_hdr *oph, void *scu) { struct bsc_nat_sccp_inst *sccp_inst = osmo_sccp_user_get_priv(scu); struct osmo_scu_prim *prim = (struct osmo_scu_prim *) oph; struct osmo_sccp_addr *addr; /* BSC's address */ - struct osmo_sccp_addr peer_addr_out; + struct subscr_conn *subscr_conn; struct msc *msc; + struct bsc *bsc; int rc = -1; LOGP(DMAIN, LOGL_DEBUG, "Rx %s from RAN\n", osmo_scu_prim_name(oph)); @@ -227,16 +199,25 @@ &prim->u.connect.calling_addr) < 0) goto error; - if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) - goto error; + bsc = bsc_get_by_pc(addr->pc); + if (!bsc) + bsc = bsc_alloc(addr); - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); + if (subscr_conn_get_by_id(prim->u.connect.conn_id, BSC_NAT_NET_RAN)) { + LOGP(DMAIN, LOGL_ERROR, "%s attempted to create new connection with already used" + " conn_id=%" PRIu32 ", ignoring\n", talloc_get_name(bsc), prim->u.connect.conn_id); + goto error; + } + + subscr_conn = subscr_conn_alloc(msc, bsc, subscr_conn_get_next_id(BSC_NAT_NET_CN), prim->u.connect.conn_id); + + LOGP(DMAIN, LOGL_DEBUG, "Fwd via %s\n", talloc_get_name(subscr_conn)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_conn_req(g_bsc_nat->cn.sccp_inst->scu, - prim->u.connect.conn_id, + subscr_conn->cn.id, &g_bsc_nat->cn.sccp_inst->addr, - &peer_addr_out, + &subscr_conn->cn.msc->addr, oph->msg->data, msgb_length(oph->msg)); rc = 0; @@ -248,15 +229,19 @@ &prim->u.connect.calling_addr) < 0) goto error; - if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) + subscr_conn = subscr_conn_get_by_id(prim->u.connect.conn_id, BSC_NAT_NET_RAN); + if (!subscr_conn) { + LOGP(DMAIN, LOGL_ERROR, "Unknown conn_id=%" PRIu32 " from %s\n", prim->u.connect.conn_id, + bsc_nat_print_addr_ran(addr)); goto error; + } - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd via %s\n", talloc_get_name(subscr_conn)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_conn_resp(g_bsc_nat->cn.sccp_inst->scu, - prim->u.connect.conn_id, - &peer_addr_out, + subscr_conn->cn.id, + &subscr_conn->cn.msc->addr, oph->msg->data, msgb_length(oph->msg)); rc = 0; @@ -264,14 +249,18 @@ case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION): /* connection-oriented data received */ - if (sccp_sap_get_peer_addr_out(sccp_inst, NULL, &peer_addr_out) < 0) + subscr_conn = subscr_conn_get_by_id(prim->u.data.conn_id, BSC_NAT_NET_RAN); + if (!subscr_conn) { + LOGP(DMAIN, LOGL_ERROR, "Unknown conn_id=%" PRIu32 " from %s\n", prim->u.data.conn_id, + bsc_nat_print_addr_ran(addr)); goto error; + } - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd via %s\n", talloc_get_name(subscr_conn)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_data(g_bsc_nat->cn.sccp_inst->scu, - prim->u.data.conn_id, + subscr_conn->cn.id, oph->msg->data, msgb_length(oph->msg)); rc = 0; @@ -279,15 +268,22 @@ case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION): /* indication of disconnect */ - if (sccp_sap_get_peer_addr_out(sccp_inst, NULL, &peer_addr_out) < 0) + subscr_conn = subscr_conn_get_by_id(prim->u.disconnect.conn_id, BSC_NAT_NET_RAN); + if (!subscr_conn) { + LOGP(DMAIN, LOGL_ERROR, "Unknown conn_id=%" PRIu32 " from %s\n", prim->u.disconnect.conn_id, + bsc_nat_print_addr_ran(addr)); goto error; + } - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd via %s\n", talloc_get_name(subscr_conn)); osmo_sccp_tx_disconn(g_bsc_nat->cn.sccp_inst->scu, - prim->u.disconnect.conn_id, - &prim->u.disconnect.responding_addr, + subscr_conn->cn.id, + &g_bsc_nat->cn.sccp_inst->addr, prim->u.disconnect.cause); + + subscr_conn_free(subscr_conn); + rc = 0; break; diff --git a/src/osmo-bsc-nat/msc.c b/src/osmo-bsc-nat/msc.c index e78a8e6..4204bac 100644 --- a/src/osmo-bsc-nat/msc.c +++ b/src/osmo-bsc-nat/msc.c @@ -22,6 +22,7 @@ #include <osmocom/bsc_nat/msc.h> #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/logging.h> +#include <osmocom/bsc_nat/subscr_conn.h> extern struct osmo_fsm msc_fsm; @@ -70,9 +71,20 @@ return llist_first_entry(&g_bsc_nat->cn.mscs, struct msc, list); } +void msc_free_subscr_conn_all(struct msc *msc) +{ + struct subscr_conn *subscr_conn; + + llist_for_each_entry(subscr_conn, &g_bsc_nat->subscr_conns, list) { + if (subscr_conn->cn.msc == msc) + subscr_conn_free(subscr_conn); + } +} + void msc_free(struct msc *msc) { LOGP(DMAIN, LOGL_DEBUG, "Del %s\n", talloc_get_name(msc)); + msc_free_subscr_conn_all(msc); llist_del(&msc->list); osmo_fsm_inst_free(msc->fi); talloc_free(msc); diff --git a/src/osmo-bsc-nat/subscr_conn.c b/src/osmo-bsc-nat/subscr_conn.c new file mode 100644 index 0000000..02afb7d --- /dev/null +++ b/src/osmo-bsc-nat/subscr_conn.c @@ -0,0 +1,99 @@ +/* (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Oliver Smith <osmith(a)sysmocom.de> + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/lienses/>. + * + */ + +#include "config.h" +#include <inttypes.h> +#include <osmocom/core/talloc.h> +#include <osmocom/bsc_nat/bsc.h> +#include <osmocom/bsc_nat/bsc_nat.h> +#include <osmocom/bsc_nat/msc.h> +#include <osmocom/bsc_nat/subscr_conn.h> +#include <osmocom/bsc_nat/logging.h> + +/* Get the next available id in either CN or RAN. */ +int subscr_conn_get_next_id(enum bsc_nat_net net) +{ + uint32_t *id; + + if (net == BSC_NAT_NET_RAN) + id = &g_bsc_nat->ran.subscr_conn_id_next; + else + id = &g_bsc_nat->cn.subscr_conn_id_next; + + for (int i = 0; i < 0xFFFFFF; i++) { + struct subscr_conn *subscr_conn; + bool already_used = false; + + *id = (*id + 1) & 0xffffff; + + llist_for_each_entry(subscr_conn, &g_bsc_nat->subscr_conns, list) { + if ((net == BSC_NAT_NET_RAN && subscr_conn->ran.id == *id) + || (net == BSC_NAT_NET_CN && subscr_conn->cn.id == *id)) { + already_used = true; + break; + } + } + + if (!already_used) + return *id; + } + return -1; +} + +struct subscr_conn *subscr_conn_alloc(struct msc *msc, struct bsc *bsc, uint32_t id_cn, uint32_t id_ran) +{ + struct subscr_conn *subscr_conn = talloc_zero(g_bsc_nat, struct subscr_conn); + + OSMO_ASSERT(subscr_conn); + talloc_set_name(subscr_conn, "SUBSCR-CONN %s:%" PRIu32 " <=> %s:%" PRIu32, + talloc_get_name(msc), id_cn, + talloc_get_name(bsc), id_ran); + + LOGP(DMAIN, LOGL_DEBUG, "Add %s\n", talloc_get_name(subscr_conn)); + + subscr_conn->cn.id = id_cn; + subscr_conn->cn.msc = msc; + subscr_conn->ran.id = id_ran; + subscr_conn->ran.bsc = bsc; + + INIT_LLIST_HEAD(&subscr_conn->list); + llist_add(&subscr_conn->list, &g_bsc_nat->subscr_conns); + + return subscr_conn; +} + +struct subscr_conn *subscr_conn_get_by_id(uint32_t id, enum bsc_nat_net net) +{ + struct subscr_conn *subscr_conn; + + llist_for_each_entry(subscr_conn, &g_bsc_nat->subscr_conns, list) { + if ((net == BSC_NAT_NET_RAN && subscr_conn->ran.id == id) + || (net == BSC_NAT_NET_CN && subscr_conn->cn.id == id)) + return subscr_conn; + } + + return NULL; +} + +void subscr_conn_free(struct subscr_conn *subscr_conn) +{ + LOGP(DMAIN, LOGL_DEBUG, "Del %s\n", talloc_get_name(subscr_conn)); + llist_del(&subscr_conn->list); + talloc_free(subscr_conn); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I1556aa665fbb0a97507f98794e74820731fa6935 Gerrit-Change-Number: 27476 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: Send RESET to MSC on start up

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27474 ) Change subject: Send RESET to MSC on start up ...................................................................... Send RESET to MSC on start up Automatically send RESET to the MSC as the BSCNAT starts up. Try it again if it fails, in case the MSC was not started yet or if the SCCP connection was not up yet (right now it does not seem possible to get notified when the SCCP connection is up). Related: SYS#5560 Related: https://osmocom.org/projects/osmo-bscnat/wiki/AoIP_OsmoBSCNAT#RESET Change-Id: Icfec3ec0168c7040e88a536fa48da339349fb6cf --- M include/osmocom/bsc_nat/bssap.h M include/osmocom/bsc_nat/msc.h M src/osmo-bsc-nat/Makefile.am M src/osmo-bsc-nat/bsc_nat_fsm.c M src/osmo-bsc-nat/bssap.c M src/osmo-bsc-nat/msc.c A src/osmo-bsc-nat/msc_fsm.c 7 files changed, 216 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/osmocom/bsc_nat/bssap.h b/include/osmocom/bsc_nat/bssap.h index 996cb69..ca387c2 100644 --- a/include/osmocom/bsc_nat/bssap.h +++ b/include/osmocom/bsc_nat/bssap.h @@ -23,3 +23,5 @@ int bssap_handle_udt(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr, struct msgb *msgb, unsigned int length); + +int bssap_tx_reset(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr); diff --git a/include/osmocom/bsc_nat/msc.h b/include/osmocom/bsc_nat/msc.h index 1f91de0..47b4d13 100644 --- a/include/osmocom/bsc_nat/msc.h +++ b/include/osmocom/bsc_nat/msc.h @@ -19,11 +19,13 @@ #pragma once +#include <osmocom/core/fsm.h> #include <osmocom/sigtran/sccp_sap.h> struct msc { struct llist_head list; struct osmo_sccp_addr addr; + struct osmo_fsm_inst *fi; }; struct msc *msc_alloc(struct osmo_sccp_addr *addr); @@ -31,4 +33,7 @@ struct msc *msc_get(void); +void msc_tx_reset(struct msc *msc); +void msc_rx_reset_ack(struct msc *msc); + void msc_free(struct msc *msc); diff --git a/src/osmo-bsc-nat/Makefile.am b/src/osmo-bsc-nat/Makefile.am index 1dd82fd..8fd5667 100644 --- a/src/osmo-bsc-nat/Makefile.am +++ b/src/osmo-bsc-nat/Makefile.am @@ -32,6 +32,7 @@ logging.c \ main.c \ msc.c \ + msc_fsm.c \ vty.c \ $(NULL) diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 4193ae9..1d92ba3 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -286,24 +286,6 @@ case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): /* connection-less data received */ rc = bssap_handle_udt(sccp_inst, &prim->u.unitdata.calling_addr, oph->msg, msgb_l2len(oph->msg)); - - /* FIXME: don't forward this to the MSC anymore, as soon as the - * BSCNAT is able to do the RESET to MSC by itself. */ - addr = &prim->u.unitdata.calling_addr; - - if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) - goto error; - - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); - - /* oph->msg stores oph and unitdata msg. Move oph->msg->data to - * unitdata msg and send it again. */ - msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_unitdata(g_bsc_nat->cn.sccp_inst->scu, - &g_bsc_nat->cn.sccp_inst->addr, - &peer_addr_out, - oph->msg->data, - msgb_length(oph->msg)); break; default: diff --git a/src/osmo-bsc-nat/bssap.c b/src/osmo-bsc-nat/bssap.c index 83eec99..f88bb20 100644 --- a/src/osmo-bsc-nat/bssap.c +++ b/src/osmo-bsc-nat/bssap.c @@ -25,6 +25,50 @@ #include <osmocom/bsc_nat/bsc.h> #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/logging.h> +#include <osmocom/bsc_nat/msc.h> + +int bssap_tx_reset(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr) +{ + enum bsc_nat_net net = sccp_inst == g_bsc_nat->cn.sccp_inst ? BSC_NAT_NET_CN : BSC_NAT_NET_RAN; + + LOGP(DMAIN, LOGL_NOTICE, "Tx RESET to %s\n", bsc_nat_print_addr(net, addr)); + + struct msgb *msg = gsm0808_create_reset(); + + return osmo_sccp_tx_unitdata_msg(sccp_inst->scu, &sccp_inst->addr, addr, msg); +} + +static int bssap_cn_handle_reset_ack(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) +{ + struct msc *msc = msc_get(); + + if (msc->addr.pc != addr->pc) { + LOGP(DMAIN, LOGL_ERROR, "Unexpected Rx RESET ACK in CN from %s, which is not %s\n", + osmo_ss7_pointcode_print(NULL, addr->pc), talloc_get_name(msc)); + return -1; + } + + LOGP(DMAIN, LOGL_NOTICE, "Rx RESET ACK from %s\n", talloc_get_name(msc)); + msc_rx_reset_ack(msc); + + return 0; +} + +static int bssap_cn_rcvmsg_udt(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) +{ + int ret = 0; + + switch (msg->l3h[0]) { + case BSS_MAP_MSG_RESET_ACKNOWLEDGE: + ret = bssap_cn_handle_reset_ack(addr, msg, length); + break; + default: + LOGP(DMAIN, LOGL_NOTICE, "Unimplemented BSSMAP UDT %s\n", gsm0808_bssap_name(msg->l3h[0])); + break; + } + + return ret; +} static int bssap_ran_handle_reset(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) { @@ -69,7 +113,8 @@ LOGP(DMAIN, LOGL_NOTICE, "Rx UDT BSSMAP %s\n", gsm0808_bssap_name(msg->l3h[0])); - /* NOTE: bssap_cn_rcvmsg_udt() will be added in a future patch */ + if (sccp_inst == g_bsc_nat->cn.sccp_inst) + return bssap_cn_rcvmsg_udt(addr, msg, length); return bssap_ran_rcvmsg_udt(addr, msg, length); } diff --git a/src/osmo-bsc-nat/msc.c b/src/osmo-bsc-nat/msc.c index 70f9d76..e78a8e6 100644 --- a/src/osmo-bsc-nat/msc.c +++ b/src/osmo-bsc-nat/msc.c @@ -23,6 +23,8 @@ #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/logging.h> +extern struct osmo_fsm msc_fsm; + struct msc *msc_alloc(struct osmo_sccp_addr *addr) { struct msc *msc = talloc_zero(g_bsc_nat, struct msc); @@ -37,6 +39,11 @@ INIT_LLIST_HEAD(&msc->list); llist_add(&msc->list, &g_bsc_nat->cn.mscs); + msc->fi = osmo_fsm_inst_alloc(&msc_fsm, msc, msc, LOGL_INFO, NULL); + OSMO_ASSERT(msc->fi); + + msc_tx_reset(msc); + return msc; } @@ -67,5 +74,6 @@ { LOGP(DMAIN, LOGL_DEBUG, "Del %s\n", talloc_get_name(msc)); llist_del(&msc->list); + osmo_fsm_inst_free(msc->fi); talloc_free(msc); } diff --git a/src/osmo-bsc-nat/msc_fsm.c b/src/osmo-bsc-nat/msc_fsm.c new file mode 100644 index 0000000..d8b89c6 --- /dev/null +++ b/src/osmo-bsc-nat/msc_fsm.c @@ -0,0 +1,154 @@ +/* (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Oliver Smith <osmith(a)sysmocom.de> + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/lienses/>. + * + */ + +#include "config.h" +#include <osmocom/core/fsm.h> +#include <osmocom/sigtran/sccp_sap.h> +#include <osmocom/bsc_nat/bsc_nat.h> +#include <osmocom/bsc_nat/bssap.h> +#include <osmocom/bsc_nat/logging.h> +#include <osmocom/bsc_nat/msc.h> + +#define X(s) (1 << (s)) + +enum msc_fsm_states { + MSC_FSM_ST_DISCONNECTED, + MSC_FSM_ST_CONNECTING, + MSC_FSM_ST_CONNECTED, +}; + +enum msc_fsm_events { + MSC_FSM_EV_TX_RESET, + MSC_FSM_EV_RX_RESET_ACK, + MSC_FSM_EV_DISCONNECT +}; + +static void st_connecting(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + switch (event) { + case MSC_FSM_EV_RX_RESET_ACK: + osmo_fsm_inst_state_chg(fi, MSC_FSM_ST_CONNECTED, 0, 0); + break; + default: + OSMO_ASSERT(false); + } +} + +static void st_disconnected_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_stat) +{ + osmo_fsm_inst_dispatch(fi, MSC_FSM_EV_TX_RESET, NULL); +} + +static void st_disconnected(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct msc *msc = fi->priv; + + switch (event) { + case MSC_FSM_EV_TX_RESET: + LOGP(DMAIN, LOGL_DEBUG, "Tx RESET to %s\n", talloc_get_name(msc)); + + if (bssap_tx_reset(g_bsc_nat->cn.sccp_inst, &msc->addr) < 0) { + LOGP(DMAIN, LOGL_ERROR, "Could not send RESET to MSC (SCCP not up yet?)\n"); + } + + /* Retry in 3s if RESET ACK was not received from MSC */ + osmo_fsm_inst_state_chg(fi, MSC_FSM_ST_CONNECTING, 3, 0); + + break; + default: + OSMO_ASSERT(false); + } +} + +int msc_fsm_timer_cb(struct osmo_fsm_inst *fi) +{ + switch (fi->state) { + case MSC_FSM_ST_CONNECTING: + osmo_fsm_inst_state_chg(fi, MSC_FSM_ST_DISCONNECTED, 0, 0); + break; + default: + OSMO_ASSERT(false); + } + return 0; +} + +static struct osmo_fsm_state msc_fsm_states[] = { + [MSC_FSM_ST_DISCONNECTED] = { + .name = "DISCONNECTED", + .in_event_mask = 0 + | X(MSC_FSM_EV_TX_RESET) + , + .out_state_mask = 0 + | X(MSC_FSM_ST_CONNECTING) + , + .action = st_disconnected, + .onenter = st_disconnected_on_enter, + }, + [MSC_FSM_ST_CONNECTING] = { + .name = "CONNECTING", + .in_event_mask = 0 + | X(MSC_FSM_EV_RX_RESET_ACK) + , + .out_state_mask = 0 + | X(MSC_FSM_ST_CONNECTED) + | X(MSC_FSM_ST_DISCONNECTED) + , + .action = st_connecting, + }, + [MSC_FSM_ST_CONNECTED] = { + .name = "CONNECTED", + .in_event_mask = 0 + | X(MSC_FSM_EV_DISCONNECT) + , + .out_state_mask = 0 + | X(MSC_FSM_ST_DISCONNECTED) + , + }, +}; + +const struct value_string msc_fsm_event_names[] = { + OSMO_VALUE_STRING(MSC_FSM_EV_TX_RESET), + OSMO_VALUE_STRING(MSC_FSM_EV_RX_RESET_ACK), + OSMO_VALUE_STRING(MSC_FSM_EV_DISCONNECT), + { 0, NULL } +}; + +struct osmo_fsm msc_fsm = { + .name = "MSC", + .states = msc_fsm_states, + .num_states = ARRAY_SIZE(msc_fsm_states), + .log_subsys = DMAIN, + .event_names = msc_fsm_event_names, + .timer_cb = msc_fsm_timer_cb, +}; + +static __attribute__((constructor)) void msc_fsm_init(void) +{ + OSMO_ASSERT(osmo_fsm_register(&msc_fsm) == 0); +} + +void msc_tx_reset(struct msc *msc) +{ + osmo_fsm_inst_dispatch(msc->fi, MSC_FSM_EV_TX_RESET, NULL); +} + +void msc_rx_reset_ack(struct msc *msc) +{ + osmo_fsm_inst_dispatch(msc->fi, MSC_FSM_EV_RX_RESET_ACK, NULL); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27474 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Icfec3ec0168c7040e88a536fa48da339349fb6cf Gerrit-Change-Number: 27474 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: Store BSCs

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27472 ) Change subject: Store BSCs ...................................................................... Store BSCs Once a BSC has sent a RESET to BSCNAT, store it. This will be used in future patches to build connection mappings between MSC and BSCs, and to block messages from BSCs that did not send a RESET. I've considered using a FSM, but at least right now there doesn't seem to be multiple states worth storing. We only have the BSC before it has done the RESET (and then it's simply not in our list) and after it did the RESET (in the list). Don't use the stored BSCs in the forwarding logic just yet, a future commit will replace the current forwarding code with proper connection mappings. Related: SYS#5560 Change-Id: Icd7316c49ef26fb45ad45a2ccc1a7916bfb0a387 --- M include/osmocom/bsc_nat/Makefile.am A include/osmocom/bsc_nat/bsc.h M include/osmocom/bsc_nat/bsc_nat.h M src/osmo-bsc-nat/Makefile.am A src/osmo-bsc-nat/bsc.c M src/osmo-bsc-nat/bsc_nat.c M src/osmo-bsc-nat/bssap.c 7 files changed, 110 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/bsc_nat/Makefile.am b/include/osmocom/bsc_nat/Makefile.am index 76aada0..398b0aa 100644 --- a/include/osmocom/bsc_nat/Makefile.am +++ b/include/osmocom/bsc_nat/Makefile.am @@ -1,4 +1,5 @@ noinst_HEADERS = \ + bsc.h \ bsc_nat.h \ bsc_nat_fsm.h \ bssap.h \ diff --git a/include/osmocom/bsc_nat/bsc.h b/include/osmocom/bsc_nat/bsc.h new file mode 100644 index 0000000..34590b9 --- /dev/null +++ b/include/osmocom/bsc_nat/bsc.h @@ -0,0 +1,31 @@ +/* (C) 2021 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Oliver Smith <osmith(a)sysmocom.de> + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/lienses/>. + * + */ + +#pragma once + +#include <osmocom/sigtran/sccp_sap.h> + +struct bsc { + struct llist_head list; + struct osmo_sccp_addr addr; +}; + +struct bsc *bsc_alloc(struct osmo_sccp_addr *addr); +struct bsc *bsc_get_by_pc(uint32_t pointcode); +void bsc_free(struct bsc *bsc); diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index 3d863f1..aac06ab 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -44,6 +44,7 @@ struct { struct bsc_nat_sccp_inst *sccp_inst; + struct llist_head bscs; /* list of struct bsc */ } ran; }; diff --git a/src/osmo-bsc-nat/Makefile.am b/src/osmo-bsc-nat/Makefile.am index 445c098..bb8e990 100644 --- a/src/osmo-bsc-nat/Makefile.am +++ b/src/osmo-bsc-nat/Makefile.am @@ -25,6 +25,7 @@ $(NULL) osmo_bsc_nat_SOURCES = \ + bsc.c \ bsc_nat.c \ bsc_nat_fsm.c \ bssap.c \ diff --git a/src/osmo-bsc-nat/bsc.c b/src/osmo-bsc-nat/bsc.c new file mode 100644 index 0000000..2ad6e0e --- /dev/null +++ b/src/osmo-bsc-nat/bsc.c @@ -0,0 +1,59 @@ +/* (C) 2021 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Oliver Smith <osmith(a)sysmocom.de> + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/lienses/>. + * + */ + +#include "config.h" +#include <osmocom/bsc_nat/bsc.h> +#include <osmocom/bsc_nat/bsc_nat.h> +#include <osmocom/bsc_nat/logging.h> + +struct bsc *bsc_alloc(struct osmo_sccp_addr *addr) +{ + struct bsc *bsc = talloc_zero(g_bsc_nat, struct bsc); + + OSMO_ASSERT(bsc); + talloc_set_name(bsc, "BSC(PC=%s)", osmo_ss7_pointcode_print(NULL, addr->pc)); + + LOGP(DMAIN, LOGL_DEBUG, "Add %s\n", talloc_get_name(bsc)); + + bsc->addr = *addr; + + INIT_LLIST_HEAD(&bsc->list); + llist_add(&bsc->list, &g_bsc_nat->ran.bscs); + + return bsc; +} + +struct bsc *bsc_get_by_pc(uint32_t pointcode) +{ + struct bsc *bsc; + + llist_for_each_entry(bsc, &g_bsc_nat->ran.bscs, list) { + if (bsc->addr.pc == pointcode) + return bsc; + } + + return NULL; +} + +void bsc_free(struct bsc *bsc) +{ + LOGP(DMAIN, LOGL_DEBUG, "Del %s\n", talloc_get_name(bsc)); + llist_del(&bsc->list); + talloc_free(bsc); +} diff --git a/src/osmo-bsc-nat/bsc_nat.c b/src/osmo-bsc-nat/bsc_nat.c index 409bf74..8baa096 100644 --- a/src/osmo-bsc-nat/bsc_nat.c +++ b/src/osmo-bsc-nat/bsc_nat.c @@ -20,8 +20,10 @@ #include "config.h" #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> +#include <osmocom/bsc_nat/bsc.h> #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/bsc_nat_fsm.h> +#include <osmocom/bsc_nat/logging.h> struct bsc_nat *bsc_nat_alloc(void *tall_ctx) { @@ -38,6 +40,8 @@ OSMO_ASSERT(bsc_nat->ran.sccp_inst); talloc_set_name_const(bsc_nat->ran.sccp_inst, "struct bsc_nat_sccp_inst (RAN)"); + INIT_LLIST_HEAD(&bsc_nat->ran.bscs); + bsc_nat_fsm_alloc(bsc_nat); return bsc_nat; @@ -45,11 +49,17 @@ void bsc_nat_free(struct bsc_nat *bsc_nat) { + struct bsc *bsc, *b; + if (bsc_nat->fi) { osmo_fsm_inst_free(bsc_nat->fi); bsc_nat->fi = NULL; } + llist_for_each_entry_safe(bsc, b, &bsc_nat->ran.bscs, list) { + bsc_free(bsc); + } + talloc_free(bsc_nat); } diff --git a/src/osmo-bsc-nat/bssap.c b/src/osmo-bsc-nat/bssap.c index e5c8ca2..83eec99 100644 --- a/src/osmo-bsc-nat/bssap.c +++ b/src/osmo-bsc-nat/bssap.c @@ -22,12 +22,19 @@ #include <osmocom/gsm/gsm0808.h> #include <osmocom/sigtran/sccp_helpers.h> #include <osmocom/sigtran/sccp_sap.h> +#include <osmocom/bsc_nat/bsc.h> #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/logging.h> static int bssap_ran_handle_reset(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) { struct bsc_nat_sccp_inst *sccp_inst = g_bsc_nat->ran.sccp_inst; + struct bsc *bsc; + + /* Store the BSC, since RESET was done the BSCNAT should accept its messages */ + bsc = bsc_get_by_pc(addr->pc); + if (!bsc) + bsc = bsc_alloc(addr); LOGP(DMAIN, LOGL_NOTICE, "Rx RESET from %s\n", bsc_nat_print_addr_ran(addr)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27472 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Icd7316c49ef26fb45ad45a2ccc1a7916bfb0a387 Gerrit-Change-Number: 27472 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: Store MSC

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27473 ) Change subject: Store MSC ...................................................................... Store MSC Expect one MSC to be configured in the address book (part of the cs7 section in the config, see doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg) and store it on start up. Store the MSC in a list, as we may potentially support multiple MSCs in the future. Also that makes it symmetric to the BSC list. Don't use the stored MSCs in the forwarding logic just yet, a future commit will replace the current forwarding code with proper connection mappings. Related: SYS#5560 Change-Id: I711df0c649728f1007857fbfda500ed5ef69287b --- M include/osmocom/bsc_nat/Makefile.am M include/osmocom/bsc_nat/bsc_nat.h A include/osmocom/bsc_nat/msc.h M src/osmo-bsc-nat/Makefile.am M src/osmo-bsc-nat/bsc_nat.c M src/osmo-bsc-nat/bsc_nat_fsm.c M src/osmo-bsc-nat/main.c A src/osmo-bsc-nat/msc.c 8 files changed, 120 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/bsc_nat/Makefile.am b/include/osmocom/bsc_nat/Makefile.am index 398b0aa..1c675f7 100644 --- a/include/osmocom/bsc_nat/Makefile.am +++ b/include/osmocom/bsc_nat/Makefile.am @@ -4,5 +4,6 @@ bsc_nat_fsm.h \ bssap.h \ logging.h \ + msc.h \ vty.h \ $(NULL) diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index aac06ab..9e58a79 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -40,6 +40,7 @@ struct { struct bsc_nat_sccp_inst *sccp_inst; + struct llist_head mscs; /* list of struct msc */ } cn; struct { diff --git a/include/osmocom/bsc_nat/msc.h b/include/osmocom/bsc_nat/msc.h new file mode 100644 index 0000000..1f91de0 --- /dev/null +++ b/include/osmocom/bsc_nat/msc.h @@ -0,0 +1,34 @@ +/* (C) 2021 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Oliver Smith <osmith(a)sysmocom.de> + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/lienses/>. + * + */ + +#pragma once + +#include <osmocom/sigtran/sccp_sap.h> + +struct msc { + struct llist_head list; + struct osmo_sccp_addr addr; +}; + +struct msc *msc_alloc(struct osmo_sccp_addr *addr); +int msc_alloc_from_addr_book(void); + +struct msc *msc_get(void); + +void msc_free(struct msc *msc); diff --git a/src/osmo-bsc-nat/Makefile.am b/src/osmo-bsc-nat/Makefile.am index bb8e990..1dd82fd 100644 --- a/src/osmo-bsc-nat/Makefile.am +++ b/src/osmo-bsc-nat/Makefile.am @@ -31,6 +31,7 @@ bssap.c \ logging.c \ main.c \ + msc.c \ vty.c \ $(NULL) diff --git a/src/osmo-bsc-nat/bsc_nat.c b/src/osmo-bsc-nat/bsc_nat.c index 8baa096..23d7498 100644 --- a/src/osmo-bsc-nat/bsc_nat.c +++ b/src/osmo-bsc-nat/bsc_nat.c @@ -24,6 +24,7 @@ #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/bsc_nat_fsm.h> #include <osmocom/bsc_nat/logging.h> +#include <osmocom/bsc_nat/msc.h> struct bsc_nat *bsc_nat_alloc(void *tall_ctx) { @@ -40,6 +41,7 @@ OSMO_ASSERT(bsc_nat->ran.sccp_inst); talloc_set_name_const(bsc_nat->ran.sccp_inst, "struct bsc_nat_sccp_inst (RAN)"); + INIT_LLIST_HEAD(&bsc_nat->cn.mscs); INIT_LLIST_HEAD(&bsc_nat->ran.bscs); bsc_nat_fsm_alloc(bsc_nat); @@ -49,6 +51,7 @@ void bsc_nat_free(struct bsc_nat *bsc_nat) { + struct msc *msc, *m; struct bsc *bsc, *b; if (bsc_nat->fi) { @@ -56,6 +59,10 @@ bsc_nat->fi = NULL; } + llist_for_each_entry_safe(msc, m, &bsc_nat->cn.mscs, list) { + msc_free(msc); + } + llist_for_each_entry_safe(bsc, b, &bsc_nat->ran.bscs, list) { bsc_free(bsc); } diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 07b9eb5..4193ae9 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -186,22 +186,7 @@ case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): /* connection-less data received */ - addr = &prim->u.unitdata.calling_addr; - - if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) - goto error; - - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); - - /* oph->msg stores oph and unitdata msg. Move oph->msg->data to - * unitdata msg and send it again. */ - msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_unitdata(g_bsc_nat->ran.sccp_inst->scu, - &g_bsc_nat->ran.sccp_inst->addr, - &peer_addr_out, - oph->msg->data, - msgb_length(oph->msg)); - rc = 0; + rc = bssap_handle_udt(sccp_inst, &prim->u.unitdata.calling_addr, oph->msg, msgb_l2len(oph->msg)); break; default: diff --git a/src/osmo-bsc-nat/main.c b/src/osmo-bsc-nat/main.c index c0b65ea..6cb1e0f 100644 --- a/src/osmo-bsc-nat/main.c +++ b/src/osmo-bsc-nat/main.c @@ -30,6 +30,7 @@ #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/bsc_nat_fsm.h> #include <osmocom/bsc_nat/logging.h> +#include <osmocom/bsc_nat/msc.h> #include <osmocom/bsc_nat/vty.h> static const char *const copyright = @@ -199,6 +200,9 @@ bsc_nat_fsm_start(g_bsc_nat); + if (msc_alloc_from_addr_book() < 0) + exit(1); + while (!osmo_select_shutdown_done()) osmo_select_main_ctx(0); diff --git a/src/osmo-bsc-nat/msc.c b/src/osmo-bsc-nat/msc.c new file mode 100644 index 0000000..70f9d76 --- /dev/null +++ b/src/osmo-bsc-nat/msc.c @@ -0,0 +1,71 @@ +/* (C) 2021 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Oliver Smith <osmith(a)sysmocom.de> + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/lienses/>. + * + */ + +#include "config.h" +#include <errno.h> +#include <osmocom/bsc_nat/msc.h> +#include <osmocom/bsc_nat/bsc_nat.h> +#include <osmocom/bsc_nat/logging.h> + +struct msc *msc_alloc(struct osmo_sccp_addr *addr) +{ + struct msc *msc = talloc_zero(g_bsc_nat, struct msc); + + OSMO_ASSERT(msc); + talloc_set_name(msc, "MSC(PC=%s)", osmo_ss7_pointcode_print(NULL, addr->pc)); + + LOGP(DMAIN, LOGL_DEBUG, "Add %s\n", talloc_get_name(msc)); + + msc->addr = *addr; + + INIT_LLIST_HEAD(&msc->list); + llist_add(&msc->list, &g_bsc_nat->cn.mscs); + + return msc; +} + +int msc_alloc_from_addr_book(void) +{ + struct osmo_sccp_addr addr; + + /* For now only one MSC is supported */ + if (osmo_sccp_addr_by_name_local(&addr, "msc", g_bsc_nat->cn.sccp_inst->ss7_inst) < 0) { + LOGP(DMAIN, LOGL_ERROR, "Configuration error, MSC not found in address book\n"); + return -ENOENT; + } + + msc_alloc(&addr); + return 0; +} + +struct msc *msc_get(void) +{ + /* For now only one MSC is supported */ + + OSMO_ASSERT(!llist_empty(&g_bsc_nat->cn.mscs)); + + return llist_first_entry(&g_bsc_nat->cn.mscs, struct msc, list); +} + +void msc_free(struct msc *msc) +{ + LOGP(DMAIN, LOGL_DEBUG, "Del %s\n", talloc_get_name(msc)); + llist_del(&msc->list); + talloc_free(msc); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I711df0c649728f1007857fbfda500ed5ef69287b Gerrit-Change-Number: 27473 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat: use sub-structs for cn, ran

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27547 ) Change subject: bsc_nat: use sub-structs for cn, ran ...................................................................... bsc_nat: use sub-structs for cn, ran As suggested in code review, create sub-structs for cn and ran. The following patches will fill them up with mscs, bscs etc. Related: SYS#5560 Change-Id: I6a3cc0d837a3d89e7153c2296812df0863f3471f --- M include/osmocom/bsc_nat/bsc_nat.h M src/osmo-bsc-nat/bsc_nat.c M src/osmo-bsc-nat/bsc_nat_fsm.c M src/osmo-bsc-nat/bssap.c M src/osmo-bsc-nat/vty.c 5 files changed, 42 insertions(+), 37 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index af4041b..3d863f1 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -38,8 +38,13 @@ struct bsc_nat { struct osmo_fsm_inst *fi; - struct bsc_nat_sccp_inst *cn; - struct bsc_nat_sccp_inst *ran; + struct { + struct bsc_nat_sccp_inst *sccp_inst; + } cn; + + struct { + struct bsc_nat_sccp_inst *sccp_inst; + } ran; }; struct bsc_nat *bsc_nat_alloc(void *tall_ctx); diff --git a/src/osmo-bsc-nat/bsc_nat.c b/src/osmo-bsc-nat/bsc_nat.c index cae65e5..409bf74 100644 --- a/src/osmo-bsc-nat/bsc_nat.c +++ b/src/osmo-bsc-nat/bsc_nat.c @@ -30,13 +30,13 @@ bsc_nat = talloc_zero(tall_ctx, struct bsc_nat); OSMO_ASSERT(bsc_nat); - bsc_nat->cn = talloc_zero(bsc_nat, struct bsc_nat_sccp_inst); - OSMO_ASSERT(bsc_nat->cn); - talloc_set_name_const(bsc_nat->cn, "struct bsc_nat_sccp_inst (CN)"); + bsc_nat->cn.sccp_inst = talloc_zero(bsc_nat, struct bsc_nat_sccp_inst); + OSMO_ASSERT(bsc_nat->cn.sccp_inst); + talloc_set_name_const(bsc_nat->cn.sccp_inst, "struct bsc_nat_sccp_inst (CN)"); - bsc_nat->ran = talloc_zero(bsc_nat, struct bsc_nat_sccp_inst); - OSMO_ASSERT(bsc_nat->ran); - talloc_set_name_const(bsc_nat->ran, "struct bsc_nat_sccp_inst (RAN)"); + bsc_nat->ran.sccp_inst = talloc_zero(bsc_nat, struct bsc_nat_sccp_inst); + OSMO_ASSERT(bsc_nat->ran.sccp_inst); + talloc_set_name_const(bsc_nat->ran.sccp_inst, "struct bsc_nat_sccp_inst (RAN)"); bsc_nat_fsm_alloc(bsc_nat); diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 1f4662f..07b9eb5 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -48,9 +48,9 @@ static struct bsc_nat_sccp_inst *sccp_inst_dest(struct bsc_nat_sccp_inst *src) { - if (src == g_bsc_nat->cn) - return g_bsc_nat->ran; - return g_bsc_nat->cn; + if (src == g_bsc_nat->cn.sccp_inst) + return g_bsc_nat->ran.sccp_inst; + return g_bsc_nat->cn.sccp_inst; } /* For connection-oriented messages, figure out which side is not the BSCNAT, @@ -85,7 +85,7 @@ { struct bsc_nat_sccp_inst *dest = sccp_inst_dest(src); - if (src == g_bsc_nat->ran) { + if (src == g_bsc_nat->ran.sccp_inst) { if (osmo_sccp_addr_by_name_local(peer_addr_out, "msc", dest->ss7_inst) < 0) { LOGP(DMAIN, LOGL_ERROR, "Could not find MSC in address book\n"); return -1; @@ -126,9 +126,9 @@ LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_conn_req(g_bsc_nat->ran->scu, + osmo_sccp_tx_conn_req(g_bsc_nat->ran.sccp_inst->scu, prim->u.connect.conn_id, - &g_bsc_nat->ran->addr, + &g_bsc_nat->ran.sccp_inst->addr, &peer_addr_out, oph->msg->data, msgb_length(oph->msg)); @@ -147,7 +147,7 @@ LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_conn_resp(g_bsc_nat->ran->scu, + osmo_sccp_tx_conn_resp(g_bsc_nat->ran.sccp_inst->scu, prim->u.connect.conn_id, &peer_addr_out, oph->msg->data, @@ -163,7 +163,7 @@ LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_data(g_bsc_nat->ran->scu, + osmo_sccp_tx_data(g_bsc_nat->ran.sccp_inst->scu, prim->u.data.conn_id, oph->msg->data, msgb_length(oph->msg)); @@ -177,7 +177,7 @@ LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); - osmo_sccp_tx_disconn(g_bsc_nat->ran->scu, + osmo_sccp_tx_disconn(g_bsc_nat->ran.sccp_inst->scu, prim->u.disconnect.conn_id, &prim->u.disconnect.responding_addr, prim->u.disconnect.cause); @@ -196,8 +196,8 @@ /* oph->msg stores oph and unitdata msg. Move oph->msg->data to * unitdata msg and send it again. */ msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_unitdata(g_bsc_nat->ran->scu, - &g_bsc_nat->ran->addr, + osmo_sccp_tx_unitdata(g_bsc_nat->ran.sccp_inst->scu, + &g_bsc_nat->ran.sccp_inst->addr, &peer_addr_out, oph->msg->data, msgb_length(oph->msg)); @@ -240,9 +240,9 @@ LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_conn_req(g_bsc_nat->cn->scu, + osmo_sccp_tx_conn_req(g_bsc_nat->cn.sccp_inst->scu, prim->u.connect.conn_id, - &g_bsc_nat->cn->addr, + &g_bsc_nat->cn.sccp_inst->addr, &peer_addr_out, oph->msg->data, msgb_length(oph->msg)); @@ -261,7 +261,7 @@ LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_conn_resp(g_bsc_nat->cn->scu, + osmo_sccp_tx_conn_resp(g_bsc_nat->cn.sccp_inst->scu, prim->u.connect.conn_id, &peer_addr_out, oph->msg->data, @@ -277,7 +277,7 @@ LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_data(g_bsc_nat->cn->scu, + osmo_sccp_tx_data(g_bsc_nat->cn.sccp_inst->scu, prim->u.data.conn_id, oph->msg->data, msgb_length(oph->msg)); @@ -291,7 +291,7 @@ LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); - osmo_sccp_tx_disconn(g_bsc_nat->cn->scu, + osmo_sccp_tx_disconn(g_bsc_nat->cn.sccp_inst->scu, prim->u.disconnect.conn_id, &prim->u.disconnect.responding_addr, prim->u.disconnect.cause); @@ -314,8 +314,8 @@ /* oph->msg stores oph and unitdata msg. Move oph->msg->data to * unitdata msg and send it again. */ msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_unitdata(g_bsc_nat->cn->scu, - &g_bsc_nat->cn->addr, + osmo_sccp_tx_unitdata(g_bsc_nat->cn.sccp_inst->scu, + &g_bsc_nat->cn.sccp_inst->addr, &peer_addr_out, oph->msg->data, msgb_length(oph->msg)); @@ -380,12 +380,12 @@ { struct bsc_nat *bsc_nat = (struct bsc_nat *)fi->priv; - if (sccp_inst_init(bsc_nat->cn, "OsmoBSCNAT-CN", DEFAULT_PC_CN, sccp_sap_up_cn, OSMO_SCCP_SSN_BSSAP) < 0) { + if (sccp_inst_init(bsc_nat->cn.sccp_inst, "OsmoBSCNAT-CN", DEFAULT_PC_CN, sccp_sap_up_cn, OSMO_SCCP_SSN_BSSAP) < 0) { osmo_fsm_inst_state_chg(fi, BSC_NAT_FSM_ST_STOPPED, 0, 0); return; } - if (sccp_inst_init(bsc_nat->ran, "OsmoBSCNAT-RAN", DEFAULT_PC_RAN, sccp_sap_up_ran, OSMO_SCCP_SSN_BSSAP) < 0) { + if (sccp_inst_init(bsc_nat->ran.sccp_inst, "OsmoBSCNAT-RAN", DEFAULT_PC_RAN, sccp_sap_up_ran, OSMO_SCCP_SSN_BSSAP) < 0) { osmo_fsm_inst_state_chg(fi, BSC_NAT_FSM_ST_STOPPED, 0, 0); return; } @@ -408,11 +408,11 @@ { struct bsc_nat *bsc_nat = (struct bsc_nat *)fi->priv; - sccp_inst_free(bsc_nat->cn); - bsc_nat->cn = NULL; + sccp_inst_free(bsc_nat->cn.sccp_inst); + bsc_nat->cn.sccp_inst = NULL; - sccp_inst_free(bsc_nat->ran); - bsc_nat->ran = NULL; + sccp_inst_free(bsc_nat->ran.sccp_inst); + bsc_nat->ran.sccp_inst = NULL; } static void st_stopped(struct osmo_fsm_inst *fi, uint32_t event, void *data) diff --git a/src/osmo-bsc-nat/bssap.c b/src/osmo-bsc-nat/bssap.c index 597c0e6..e5c8ca2 100644 --- a/src/osmo-bsc-nat/bssap.c +++ b/src/osmo-bsc-nat/bssap.c @@ -27,7 +27,7 @@ static int bssap_ran_handle_reset(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) { - struct bsc_nat_sccp_inst *sccp_inst = g_bsc_nat->ran; + struct bsc_nat_sccp_inst *sccp_inst = g_bsc_nat->ran.sccp_inst; LOGP(DMAIN, LOGL_NOTICE, "Rx RESET from %s\n", bsc_nat_print_addr_ran(addr)); diff --git a/src/osmo-bsc-nat/vty.c b/src/osmo-bsc-nat/vty.c index 10c669a..bf86faa 100644 --- a/src/osmo-bsc-nat/vty.c +++ b/src/osmo-bsc-nat/vty.c @@ -45,8 +45,8 @@ static int config_write_bsc_nat(struct vty *vty) { vty_out(vty, "bsc-nat%s", VTY_NEWLINE); - vty_out(vty, " cs7-instance-cn %u%s", g_bsc_nat->cn->ss7_id, VTY_NEWLINE); - vty_out(vty, " cs7-instance-ran %u%s", g_bsc_nat->ran->ss7_id, VTY_NEWLINE); + vty_out(vty, " cs7-instance-cn %u%s", g_bsc_nat->cn.sccp_inst->ss7_id, VTY_NEWLINE); + vty_out(vty, " cs7-instance-ran %u%s", g_bsc_nat->ran.sccp_inst->ss7_id, VTY_NEWLINE); return CMD_SUCCESS; } @@ -58,7 +58,7 @@ "cs7-instance-cn <0-15>", "Set SS7 to be used to connect to CN-side\n" SS7_REF_STR) { - g_bsc_nat->cn->ss7_id = atoi(argv[0]); + g_bsc_nat->cn.sccp_inst->ss7_id = atoi(argv[0]); return CMD_SUCCESS; } @@ -67,7 +67,7 @@ "cs7-instance-ran <0-15>", "Set SS7 to be used to connect to RAN-side\n" SS7_REF_STR) { - g_bsc_nat->ran->ss7_id = atoi(argv[0]); + g_bsc_nat->ran.sccp_inst->ss7_id = atoi(argv[0]); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27547 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I6a3cc0d837a3d89e7153c2296812df0863f3471f Gerrit-Change-Number: 27547 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: Reply to BSC's RESET with RESET ACK directly

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27471 ) Change subject: Reply to BSC's RESET with RESET ACK directly ...................................................................... Reply to BSC's RESET with RESET ACK directly Let the BSCNAT directly reply to RESET sent from BSC with RESET ACK. bssap_ran_handle_reset() is a bit empty right now but will be used in a future patch to store the BSC. Related: SYS#5560 Related: https://osmocom.org/projects/osmo-bscnat/wiki/AoIP_OsmoBSCNAT#RESET Change-Id: I3223409e25c93b625d67634caf68efe9772e2558 --- M include/osmocom/bsc_nat/Makefile.am A include/osmocom/bsc_nat/bssap.h M src/osmo-bsc-nat/Makefile.am M src/osmo-bsc-nat/bsc_nat_fsm.c A src/osmo-bsc-nat/bssap.c 5 files changed, 130 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/bsc_nat/Makefile.am b/include/osmocom/bsc_nat/Makefile.am index 90f44a7..76aada0 100644 --- a/include/osmocom/bsc_nat/Makefile.am +++ b/include/osmocom/bsc_nat/Makefile.am @@ -1,6 +1,7 @@ noinst_HEADERS = \ bsc_nat.h \ bsc_nat_fsm.h \ + bssap.h \ logging.h \ vty.h \ $(NULL) diff --git a/include/osmocom/bsc_nat/bssap.h b/include/osmocom/bsc_nat/bssap.h new file mode 100644 index 0000000..996cb69 --- /dev/null +++ b/include/osmocom/bsc_nat/bssap.h @@ -0,0 +1,25 @@ +/* (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Oliver Smith <osmith(a)sysmocom.de> + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/lienses/>. + * + */ + +#pragma once + +#include <osmocom/bsc_nat/bsc_nat.h> + +int bssap_handle_udt(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr, struct msgb *msgb, + unsigned int length); diff --git a/src/osmo-bsc-nat/Makefile.am b/src/osmo-bsc-nat/Makefile.am index 6a759cb..445c098 100644 --- a/src/osmo-bsc-nat/Makefile.am +++ b/src/osmo-bsc-nat/Makefile.am @@ -27,6 +27,7 @@ osmo_bsc_nat_SOURCES = \ bsc_nat.c \ bsc_nat_fsm.c \ + bssap.c \ logging.c \ main.c \ vty.c \ diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 4ce60ce..0c36607 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -27,6 +27,7 @@ #include <osmocom/sigtran/sccp_helpers.h> #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/bsc_nat_fsm.h> +#include <osmocom/bsc_nat/bssap.h> #include <osmocom/bsc_nat/logging.h> #define DEFAULT_PC_RAN "0.23.1" /* same as default for OsmoMSC */ @@ -299,6 +300,10 @@ case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_INDICATION): /* connection-less data received */ + rc = bssap_handle_udt(sccp_inst, &prim->u.unitdata.calling_addr, oph->msg, msgb_l2len(oph->msg)); + + /* FIXME: don't forward this to the MSC anymore, as soon as the + * BSCNAT is able to do the RESET to MSC by itself. */ addr = &prim->u.unitdata.calling_addr; if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) @@ -314,7 +319,6 @@ &peer_addr_out, oph->msg->data, msgb_length(oph->msg)); - rc = 0; break; default: diff --git a/src/osmo-bsc-nat/bssap.c b/src/osmo-bsc-nat/bssap.c new file mode 100644 index 0000000..c054db6 --- /dev/null +++ b/src/osmo-bsc-nat/bssap.c @@ -0,0 +1,98 @@ +/* (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Oliver Smith <osmith(a)sysmocom.de> + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/lienses/>. + * + */ + +#include "config.h" +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/gsm0808.h> +#include <osmocom/sigtran/sccp_helpers.h> +#include <osmocom/sigtran/sccp_sap.h> +#include <osmocom/bsc_nat/bsc_nat.h> +#include <osmocom/bsc_nat/logging.h> + +static int bssap_ran_handle_reset(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) +{ + struct bsc_nat_sccp_inst *sccp_inst = g_bsc_nat->ran; + + LOGP(DMAIN, LOGL_NOTICE, "Rx RESET from %s\n", bsc_nat_print_addr(sccp_inst, addr)); + + LOGP(DMAIN, LOGL_NOTICE, "Tx RESET ACK to %s\n", bsc_nat_print_addr(sccp_inst, addr)); + msg = gsm0808_create_reset_ack(); + return osmo_sccp_tx_unitdata_msg(sccp_inst->scu, &sccp_inst->addr, addr, msg); +} + +static int bssap_ran_rcvmsg_udt(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) +{ + int ret = 0; + + switch (msg->l3h[0]) { + case BSS_MAP_MSG_RESET: + ret = bssap_ran_handle_reset(addr, msg, length); + break; + default: + LOGP(DMAIN, LOGL_NOTICE, "Unimplemented BSSMAP UDT %s\n", gsm0808_bssap_name(msg->l3h[0])); + break; + } + + return ret; +} + +static int bssap_rcvmsg_udt(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr, struct msgb *msg, + unsigned int length) +{ + if (length < 1) { + LOGP(DMAIN, LOGL_ERROR, "Not enough room: %u\n", length); + return -1; + } + + LOGP(DMAIN, LOGL_NOTICE, "Rx UDT BSSMAP %s\n", gsm0808_bssap_name(msg->l3h[0])); + + /* NOTE: bssap_cn_rcvmsg_udt() will be added in a future patch */ + return bssap_ran_rcvmsg_udt(addr, msg, length); +} + +int bssap_handle_udt(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr, struct msgb *msgb, + unsigned int length) +{ + struct bssmap_header *bs; + int rc = -1; + + LOGP(DMAIN, LOGL_DEBUG, "Rx UDT: %s\n", osmo_hexdump(msgb->l2h, length)); + + if (length < sizeof(*bs)) { + LOGP(DMAIN, LOGL_ERROR, "The header is too short\n"); + return -1; + } + + bs = (struct bssmap_header *)msgb->l2h; + if (bs->length < length - sizeof(*bs)) { + LOGP(DMAIN, LOGL_ERROR, "Failed to parse BSSMAP header\n"); + return -1; + } + + switch (bs->type) { + case BSSAP_MSG_BSS_MANAGEMENT: + msgb->l3h = &msgb->l2h[sizeof(*bs)]; + rc = bssap_rcvmsg_udt(sccp_inst, addr, msgb, length - sizeof(*bs)); + break; + default: + LOGP(DMAIN, LOGL_NOTICE, "Unimplemented msg type: %s\n", gsm0808_bssap_name(bs->type)); + } + + return rc; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27471 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I3223409e25c93b625d67634caf68efe9772e2558 Gerrit-Change-Number: 27471 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: bsc_nat_print_addr: pass net enum, not sccp_inst

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27546 ) Change subject: bsc_nat_print_addr: pass net enum, not sccp_inst ...................................................................... bsc_nat_print_addr: pass net enum, not sccp_inst The sccp_inst was only used to differentiate between CN / RAN. Instead of passing that, pass an enum and add bsc_nat_print_addr_cn and _ran defines to keep it short. This is in preparation for refactoring struct bsc_nat as suggested in code review. Related: SYS#5560 Change-Id: I3c6046a6726c31bf137223c46c2c96b3898ad324 --- M include/osmocom/bsc_nat/bsc_nat.h M src/osmo-bsc-nat/bsc_nat.c M src/osmo-bsc-nat/bsc_nat_fsm.c M src/osmo-bsc-nat/bssap.c 4 files changed, 22 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index d80510a..af4041b 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -22,6 +22,11 @@ #include <osmocom/core/fsm.h> #include <osmocom/sigtran/sccp_sap.h> +enum bsc_nat_net { + BSC_NAT_NET_CN = 0, + BSC_NAT_NET_RAN +}; + struct bsc_nat_sccp_inst { uint32_t ss7_id; struct osmo_ss7_instance *ss7_inst; @@ -40,7 +45,9 @@ struct bsc_nat *bsc_nat_alloc(void *tall_ctx); void bsc_nat_free(struct bsc_nat *bsc_nat); -const char *bsc_nat_print_addr(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr); +#define bsc_nat_print_addr_cn(addr) bsc_nat_print_addr(BSC_NAT_NET_CN, addr) +#define bsc_nat_print_addr_ran(addr) bsc_nat_print_addr(BSC_NAT_NET_RAN, addr) +const char *bsc_nat_print_addr(enum bsc_nat_net net, struct osmo_sccp_addr *addr); extern void *tall_bsc_nat_ctx; extern struct bsc_nat *g_bsc_nat; diff --git a/src/osmo-bsc-nat/bsc_nat.c b/src/osmo-bsc-nat/bsc_nat.c index 2e9c781..cae65e5 100644 --- a/src/osmo-bsc-nat/bsc_nat.c +++ b/src/osmo-bsc-nat/bsc_nat.c @@ -53,12 +53,12 @@ talloc_free(bsc_nat); } -const char *bsc_nat_print_addr(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr) +const char *bsc_nat_print_addr(enum bsc_nat_net net, struct osmo_sccp_addr *addr) { static char buf[25]; snprintf(buf, sizeof(buf), "PC=%s in %s", osmo_ss7_pointcode_print(NULL, addr->pc), - sccp_inst == g_bsc_nat->cn ? "CN" : "RAN"); + net == BSC_NAT_NET_CN ? "CN" : "RAN"); return buf; } diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 0c36607..1f4662f 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -123,7 +123,7 @@ if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) goto error; - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(g_bsc_nat->ran, &peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_conn_req(g_bsc_nat->ran->scu, @@ -144,7 +144,7 @@ if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) goto error; - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(g_bsc_nat->ran, &peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_conn_resp(g_bsc_nat->ran->scu, @@ -160,7 +160,7 @@ if (sccp_sap_get_peer_addr_out(sccp_inst, NULL, &peer_addr_out) < 0) goto error; - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(g_bsc_nat->ran, &peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_data(g_bsc_nat->ran->scu, @@ -175,7 +175,7 @@ if (sccp_sap_get_peer_addr_out(sccp_inst, NULL, &peer_addr_out) < 0) goto error; - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(g_bsc_nat->ran, &peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); osmo_sccp_tx_disconn(g_bsc_nat->ran->scu, prim->u.disconnect.conn_id, @@ -191,7 +191,7 @@ if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) goto error; - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(g_bsc_nat->ran, &peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_ran(&peer_addr_out)); /* oph->msg stores oph and unitdata msg. Move oph->msg->data to * unitdata msg and send it again. */ @@ -237,7 +237,7 @@ if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) goto error; - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(g_bsc_nat->cn, &peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_conn_req(g_bsc_nat->cn->scu, @@ -258,7 +258,7 @@ if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) goto error; - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(g_bsc_nat->cn, &peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_conn_resp(g_bsc_nat->cn->scu, @@ -274,7 +274,7 @@ if (sccp_sap_get_peer_addr_out(sccp_inst, NULL, &peer_addr_out) < 0) goto error; - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(g_bsc_nat->cn, &peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); msgb_pull_to_l2(oph->msg); osmo_sccp_tx_data(g_bsc_nat->cn->scu, @@ -289,7 +289,7 @@ if (sccp_sap_get_peer_addr_out(sccp_inst, NULL, &peer_addr_out) < 0) goto error; - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(g_bsc_nat->cn, &peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); osmo_sccp_tx_disconn(g_bsc_nat->cn->scu, prim->u.disconnect.conn_id, @@ -309,7 +309,7 @@ if (sccp_sap_get_peer_addr_out(sccp_inst, addr, &peer_addr_out) < 0) goto error; - LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr(g_bsc_nat->cn, &peer_addr_out)); + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", bsc_nat_print_addr_cn(&peer_addr_out)); /* oph->msg stores oph and unitdata msg. Move oph->msg->data to * unitdata msg and send it again. */ diff --git a/src/osmo-bsc-nat/bssap.c b/src/osmo-bsc-nat/bssap.c index c054db6..597c0e6 100644 --- a/src/osmo-bsc-nat/bssap.c +++ b/src/osmo-bsc-nat/bssap.c @@ -29,9 +29,9 @@ { struct bsc_nat_sccp_inst *sccp_inst = g_bsc_nat->ran; - LOGP(DMAIN, LOGL_NOTICE, "Rx RESET from %s\n", bsc_nat_print_addr(sccp_inst, addr)); + LOGP(DMAIN, LOGL_NOTICE, "Rx RESET from %s\n", bsc_nat_print_addr_ran(addr)); - LOGP(DMAIN, LOGL_NOTICE, "Tx RESET ACK to %s\n", bsc_nat_print_addr(sccp_inst, addr)); + LOGP(DMAIN, LOGL_NOTICE, "Tx RESET ACK to %s\n", bsc_nat_print_addr_ran(addr)); msg = gsm0808_create_reset_ack(); return osmo_sccp_tx_unitdata_msg(sccp_inst->scu, &sccp_inst->addr, addr, msg); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27546 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I3c6046a6726c31bf137223c46c2c96b3898ad324 Gerrit-Change-Number: 27546 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-bsc-nat[master]: Support forwarding messages with multiple BSCs

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27476 ) Change subject: Support forwarding messages with multiple BSCs ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27476 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I1556aa665fbb0a97507f98794e74820731fa6935 Gerrit-Change-Number: 27476 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 23 Mar 2022 09:20:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-gbproxy[master]: docs: usermanual: add new chapter gb-ns2-maintenance

by lynxis lazus

Attention is currently required from: lynxis lazus. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/27306 to look at the new patch set (#3). Change subject: docs: usermanual: add new chapter gb-ns2-maintenance ...................................................................... docs: usermanual: add new chapter gb-ns2-maintenance Depends-On: I5571001a127c933397a4bc26e85410288d50fc2f (osmo-gsm-manuals.git) Change-Id: I951cc10d86de4f16d2226b34eda55202373c2524 --- M doc/manuals/osmogbproxy-usermanual.adoc 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/06/27306/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/27306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I951cc10d86de4f16d2226b34eda55202373c2524 Gerrit-Change-Number: 27306 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: rx_tchh_fn(): get rid of chan_state->meas_avg_facch

by fixeria

Attention is currently required from: laforge, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27552 ) Change subject: osmo-bts-trx: rx_tchh_fn(): get rid of chan_state->meas_avg_facch ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > this is probably the kind of change we want @pmaier to review, but unfortunately he's unavailable th […] Yes, definitely. We can wait until he's back, not urgent. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7902b4709bc3f418174e8373f52e87bb31cdc826 Gerrit-Change-Number: 27552 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Mar 2022 21:34:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bts[master]: trx_sched_ul_burst(): get rid of the 'switch' statement

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27558 ) Change subject: trx_sched_ul_burst(): get rid of the 'switch' statement ...................................................................... trx_sched_ul_burst(): get rid of the 'switch' statement Both TRXC_RACH and TRXC_PTCCH are handled in the rx_rach_fn(), so we can eliminate the need of having a 'switch' statement in the general (perfrmance critical) code path. Change-Id: I66d8785a63215af37a77e258039549e4e6292e49 --- M src/common/scheduler.c M src/osmo-bts-trx/sched_lchan_rach.c 2 files changed, 7 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/src/common/scheduler.c b/src/common/scheduler.c index b27d7ea..e6a664f 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -1546,16 +1546,9 @@ /* handle NOPE indications */ if (bi->flags & TRX_BI_F_NOPE_IND) { - switch (bi->chan) { - case TRXC_PTCCH: - case TRXC_RACH: - /* For some logical channel types NOPE.ind is valueless. */ - return 0; - default: - /* NOTE: Uplink burst handler must check bi->burst_len before - * accessing bi->burst to avoid uninitialized memory access. */ - return func(l1ts, bi); - } + /* NOTE: Uplink burst handler must check bi->burst_len before + * accessing bi->burst to avoid uninitialized memory access. */ + return func(l1ts, bi); } /* decrypt */ diff --git a/src/osmo-bts-trx/sched_lchan_rach.c b/src/osmo-bts-trx/sched_lchan_rach.c index c3abf32..5d9d0b1 100644 --- a/src/osmo-bts-trx/sched_lchan_rach.c +++ b/src/osmo-bts-trx/sched_lchan_rach.c @@ -112,6 +112,10 @@ uint8_t ra; int rc; + /* Ignore NOPE indications, they're of no use here */ + if (bi->flags & TRX_BI_F_NOPE_IND) + return 0; + /* TSC (Training Sequence Code) is an optional parameter of the UL burst * indication. We need this information in order to decide whether an * Access Burst is 11-bit encoded or not (see OS#1854). If this information -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I66d8785a63215af37a77e258039549e4e6292e49 Gerrit-Change-Number: 27558 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-bts[master]: trx_sched_ul_burst(): get rid of the 'switch' statement

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27558 ) Change subject: trx_sched_ul_burst(): get rid of the 'switch' statement ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I66d8785a63215af37a77e258039549e4e6292e49 Gerrit-Change-Number: 27558 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Mar 2022 18:37:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: BSSMAP LE: handle optional LCS {Client Type, QoS} IEs

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27564 ) Change subject: BSSMAP LE: handle optional LCS {Client Type, QoS} IEs ...................................................................... BSSMAP LE: handle optional LCS {Client Type, QoS} IEs On receipt of the Perform Location Request message, the BSC needs to forward it to the SMLC. If the abovementioned IEs are present in the original message, they must be delivered to the SMLC too. Change-Id: Ifeb359b0468845da0b4fed9e2e4b79256067fa81 Depends: libosmocore.git I8775a93cf4089b1752d040e43d2cba6b8997f955 Related: SYS#5891 --- M include/osmocom/bsc/lcs_loc_req.h M src/osmo-bsc/lcs_loc_req.c 2 files changed, 30 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/lcs_loc_req.h b/include/osmocom/bsc/lcs_loc_req.h index 7b10b7e..78f9381 100644 --- a/include/osmocom/bsc/lcs_loc_req.h +++ b/include/osmocom/bsc/lcs_loc_req.h @@ -34,6 +34,12 @@ bool client_type_present; enum bssmap_le_lcs_client_type client_type; + bool priority_present; + uint8_t priority; + + bool qos_present; + struct osmo_bssmap_le_lcs_qos qos; + struct osmo_mobile_identity imsi; struct osmo_mobile_identity imei; } req; diff --git a/src/osmo-bsc/lcs_loc_req.c b/src/osmo-bsc/lcs_loc_req.c index 6978049..a658da8 100644 --- a/src/osmo-bsc/lcs_loc_req.c +++ b/src/osmo-bsc/lcs_loc_req.c @@ -134,6 +134,22 @@ } else if (lcs_loc_req->req.location_type.location_information == BSSMAP_LE_LOC_INFO_CURRENT_GEOGRAPHIC) PARSE_ERR("Missing LCS Client Type IE"); + /* 3GPP TS 49.031, section 10.15 (O) "LCS Priority" */ + if (TLVP_PRES_LEN(tp, GSM0808_IE_LCS_PRIORITY, 1)) { + lcs_loc_req->req.priority = *TLVP_VAL(tp, GSM0808_IE_LCS_PRIORITY); + lcs_loc_req->req.priority_present = true; + } + + /* 3GPP TS 49.031, section 10.16 (C) "LCS QoS" */ + if (TLVP_PRES_LEN(tp, GSM0808_IE_LCS_QOS, sizeof(lcs_loc_req->req.qos))) { + size_t qos_len = TLVP_LEN(tp, GSM0808_IE_LCS_QOS); + if (qos_len > sizeof(lcs_loc_req->req.qos)) + qos_len = sizeof(lcs_loc_req->req.qos); + memcpy(&lcs_loc_req->req.qos, TLVP_VAL(tp, GSM0808_IE_LCS_QOS), qos_len); + lcs_loc_req->req.qos_present = true; + } else if (lcs_loc_req->req.location_type.location_information == BSSMAP_LE_LOC_INFO_CURRENT_GEOGRAPHIC) + PARSE_ERR("Missing LCS QoS IE"); + if ((e = TLVP_GET(tp, GSM0808_IE_IMSI))) { if (osmo_mobile_identity_decode(&lcs_loc_req->req.imsi, e->val, e->len, false) || lcs_loc_req->req.imsi.type != GSM_MI_TYPE_IMSI) @@ -146,8 +162,6 @@ PARSE_ERR("Failed to parse IMEI IE"); } - // FIXME LCS QoS IE is mandatory for requesting the location - /* A lot of IEs remain ignored... */ return true; @@ -310,6 +324,14 @@ .lcs_client_type_present = lcs_loc_req->req.client_type_present, .lcs_client_type = lcs_loc_req->req.client_type, + + .more_items = true, + + .lcs_priority_present = lcs_loc_req->req.priority_present, + .lcs_priority = lcs_loc_req->req.priority, + + .lcs_qos_present = lcs_loc_req->req.qos_present, + .lcs_qos = lcs_loc_req->req.qos, }, }, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ifeb359b0468845da0b4fed9e2e4b79256067fa81 Gerrit-Change-Number: 27564 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: BSSMAP LE: handle optional LCS {Client Type, QoS} IEs

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27564 ) Change subject: BSSMAP LE: handle optional LCS {Client Type, QoS} IEs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27564 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ifeb359b0468845da0b4fed9e2e4b79256067fa81 Gerrit-Change-Number: 27564 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Mar 2022 18:32:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: use a lookup table in trx_sched_meas_avg()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27549 ) Change subject: osmo-bts-trx: use a lookup table in trx_sched_meas_avg() ...................................................................... osmo-bts-trx: use a lookup table in trx_sched_meas_avg() This should be better performance-wise and would also allow to avoid having the same switch statement duplicated in functions added later. Change-Id: If8124dcd38e7c8408a9f3b9a574d9e3181a2eb15 --- M src/osmo-bts-trx/scheduler_trx.c 1 file changed, 18 insertions(+), 35 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 74de902..78c7b4a 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -631,6 +631,16 @@ chan_state->meas.current = (current + 1) % hist_size; } +/* Measurement averaging mode sets: [MODE] = { SHIFT, NUM } */ +static const uint8_t trx_sched_meas_modeset[][2] = { + [SCHED_MEAS_AVG_M_S4N4] = { 4, 4 }, + [SCHED_MEAS_AVG_M_S8N8] = { 8, 8 }, + [SCHED_MEAS_AVG_M_S6N6] = { 6, 6 }, + [SCHED_MEAS_AVG_M_S8N4] = { 8, 4 }, + [SCHED_MEAS_AVG_M_S6N2] = { 6, 2 }, + [SCHED_MEAS_AVG_M_S4N2] = { 4, 2 }, +}; + /* Calculate the AVG of n measurements from the history */ void trx_sched_meas_avg(const struct l1sched_chan_state *chan_state, struct l1sched_meas_set *avg, @@ -639,44 +649,17 @@ unsigned int hist_size = ARRAY_SIZE(chan_state->meas.buf); unsigned int current = chan_state->meas.current; const struct l1sched_meas_set *set; - unsigned int shift, pos, i, n; + unsigned int pos, i; float rssi_sum = 0; int toa256_sum = 0; int ci_cb_sum = 0; - switch (mode) { - /* last 4 bursts (default for xCCH, TCH/H, PTCCH and PDTCH) */ - case SCHED_MEAS_AVG_M_S4N4: - n = 4; shift = n; - break; - /* last 8 bursts (default for TCH/F and FACCH/F) */ - case SCHED_MEAS_AVG_M_S8N8: - n = 8; shift = n; - break; - /* last 6 bursts (default for FACCH/H) */ - case SCHED_MEAS_AVG_M_S6N6: - n = 6; shift = n; - break; - /* first 4 of last 8 bursts */ - case SCHED_MEAS_AVG_M_S8N4: - n = 4; shift = 8; - break; - /* first 2 of last 6 bursts */ - case SCHED_MEAS_AVG_M_S6N2: - n = 2; shift = 6; - break; - /* middle 2 of last 6 bursts */ - case SCHED_MEAS_AVG_M_S4N2: - n = 2; shift = 4; - break; - default: - /* Shall not happen */ - OSMO_ASSERT(false); - } + const unsigned int shift = trx_sched_meas_modeset[mode][0]; + const unsigned int num = trx_sched_meas_modeset[mode][1]; /* Calculate the sum of n entries starting from pos */ - for (i = 0; i < n; i++) { + for (i = 0; i < num; i++) { pos = (current + hist_size - shift + i) % hist_size; set = &chan_state->meas.buf[pos]; @@ -687,14 +670,14 @@ /* Calculate the average for each value */ *avg = (struct l1sched_meas_set) { - .rssi = (rssi_sum / n), - .toa256 = (toa256_sum / n), - .ci_cb = (ci_cb_sum / n), + .rssi = (rssi_sum / num), + .toa256 = (toa256_sum / num), + .ci_cb = (ci_cb_sum / num), }; LOGP(DMEAS, LOGL_DEBUG, "%s%sMeasurement AVG (num=%u, shift=%u): " "RSSI %f, ToA256 %d, C/I %d cB\n", chan_state->lchan ? gsm_lchan_name(chan_state->lchan) : "", chan_state->lchan ? " " : "", - n, shift, avg->rssi, avg->toa256, avg->ci_cb); + num, shift, avg->rssi, avg->toa256, avg->ci_cb); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If8124dcd38e7c8408a9f3b9a574d9e3181a2eb15 Gerrit-Change-Number: 27549 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: rx_tchh_fn(): use proper meas averaging mode

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27550 ) Change subject: osmo-bts-trx: rx_tchh_fn(): use proper meas averaging mode ...................................................................... osmo-bts-trx: rx_tchh_fn(): use proper meas averaging mode Compared to TCH/F, TCH/H is a bit special in a way that: * speech frames are interleaved over 4 consecutive bursts, * while FACCH frames are interleaved over 6 consecutive bursts. This is why in rx_tchh_fn() we allocate a buffer large enough to store up to 6 bursts. Let's say we have that buffer filled up completely with all 6 bursts (from 'a' to 'f'). Now attempting to decode them may yield either a speech frame or a FACCH frame: +---+---+---+---+---+---+ | a | b | c | d | e | f | Burst 'a' received first, 'f' last +---+---+---+---+---+---+ ^^^^^^^^^^^^^^^ Speech frame (bursts 'a' .. 'd') ^^^^^^^^^^^^^^^^^^^^^^^ FACCH frame (bursts 'a' .. 'f') For FACCH we use measurement averaging mode SCHED_MEAS_AVG_M_S6N6, so that 6 last samples are averaged - so far so good. For speech we use SCHED_MEAS_AVG_M_S4N4, so that 4 last samples corresponding to bursts 'c', 'd', 'e', 'f' are averaged - this is wrong. We actually need to average the *first* 4 samples corresponding to bursts 'a', 'b', 'c', 'd' in the case of speech. Let's add and use a new averaging mode SCHED_MEAS_AVG_M_S6N4 for that. Change-Id: Iea6f4e5471550f4c2b57aaebeac83c80e879489d --- M include/osmo-bts/scheduler.h M src/osmo-bts-trx/sched_lchan_tchh.c M src/osmo-bts-trx/scheduler_trx.c 3 files changed, 5 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h index 8643edd..1e1a2d7 100644 --- a/include/osmo-bts/scheduler.h +++ b/include/osmo-bts/scheduler.h @@ -306,10 +306,12 @@ /* Averaging mode for trx_sched_meas_avg() */ enum sched_meas_avg_mode { - /* last 4 bursts (default for xCCH, TCH/H, PTCCH and PDTCH) */ + /* last 4 bursts (default for xCCH, PTCCH and PDTCH) */ SCHED_MEAS_AVG_M_S4N4, /* last 8 bursts (default for TCH/F and FACCH/F) */ SCHED_MEAS_AVG_M_S8N8, + /* first 4 of last 6 bursts (default for TCH/H) */ + SCHED_MEAS_AVG_M_S6N4, /* last 6 bursts (default for FACCH/H) */ SCHED_MEAS_AVG_M_S6N6, /* first 4 of last 8 bursts */ diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 8264163..edbb566 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -64,7 +64,7 @@ * Even FN ending at: 10,11,19,20,2,3 */ int fn_is_odd = (((bi->fn + 26 - 10) % 26) >> 2) & 1; - enum sched_meas_avg_mode meas_avg_mode = SCHED_MEAS_AVG_M_S4N4; + enum sched_meas_avg_mode meas_avg_mode = SCHED_MEAS_AVG_M_S6N4; struct l1sched_meas_set meas_avg; unsigned int fn_begin; unsigned int fn_tch_end; diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 78c7b4a..6ce5a9a 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -635,6 +635,7 @@ static const uint8_t trx_sched_meas_modeset[][2] = { [SCHED_MEAS_AVG_M_S4N4] = { 4, 4 }, [SCHED_MEAS_AVG_M_S8N8] = { 8, 8 }, + [SCHED_MEAS_AVG_M_S6N4] = { 6, 4 }, [SCHED_MEAS_AVG_M_S6N6] = { 6, 6 }, [SCHED_MEAS_AVG_M_S8N4] = { 8, 4 }, [SCHED_MEAS_AVG_M_S6N2] = { 6, 2 }, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iea6f4e5471550f4c2b57aaebeac83c80e879489d Gerrit-Change-Number: 27550 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: use consistent naming for 'enum sched_meas_avg_mode'

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27548 ) Change subject: osmo-bts-trx: use consistent naming for 'enum sched_meas_avg_mode' ...................................................................... osmo-bts-trx: use consistent naming for 'enum sched_meas_avg_mode' This is a purely cosmetic change. The new naming clearly indicates how deep to go back in the measurement history (S) and how many samples to average (N). For example: * SCHED_MEAS_AVG_M_S4N4 - go S=4 steps back and average N=4 samples; * SCHED_MEAS_AVG_M_S6N2 - go S=6 steps back and average N=2 samples. Change-Id: I96a8dd08084c7c179f879fc00e75c5edcfb11caa --- M include/osmo-bts/scheduler.h M src/osmo-bts-trx/sched_lchan_pdtch.c M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c M src/osmo-bts-trx/sched_lchan_xcch.c M src/osmo-bts-trx/scheduler_trx.c 6 files changed, 21 insertions(+), 21 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h index d640647..8643edd 100644 --- a/include/osmo-bts/scheduler.h +++ b/include/osmo-bts/scheduler.h @@ -307,17 +307,17 @@ /* Averaging mode for trx_sched_meas_avg() */ enum sched_meas_avg_mode { /* last 4 bursts (default for xCCH, TCH/H, PTCCH and PDTCH) */ - SCHED_MEAS_AVG_M_QUAD, + SCHED_MEAS_AVG_M_S4N4, /* last 8 bursts (default for TCH/F and FACCH/F) */ - SCHED_MEAS_AVG_M_OCTO, + SCHED_MEAS_AVG_M_S8N8, /* last 6 bursts (default for FACCH/H) */ - SCHED_MEAS_AVG_M_SIX, + SCHED_MEAS_AVG_M_S6N6, /* first 4 of last 8 bursts */ - SCHED_MEAS_AVG_M8_FIRST_QUAD, + SCHED_MEAS_AVG_M_S8N4, /* first 2 of last 6 bursts */ - SCHED_MEAS_AVG_M6_FIRST_TWO, + SCHED_MEAS_AVG_M_S6N2, /* middle 2 of last 6 bursts */ - SCHED_MEAS_AVG_M6_MIDDLE_TWO, + SCHED_MEAS_AVG_M_S4N2, }; void trx_sched_meas_push(struct l1sched_chan_state *chan_state, diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c index 6a2ad0d..92bb5a8 100644 --- a/src/osmo-bts-trx/sched_lchan_pdtch.c +++ b/src/osmo-bts-trx/sched_lchan_pdtch.c @@ -101,7 +101,7 @@ return 0; /* average measurements of the last 4 bursts */ - trx_sched_meas_avg(chan_state, &meas_avg, SCHED_MEAS_AVG_M_QUAD); + trx_sched_meas_avg(chan_state, &meas_avg, SCHED_MEAS_AVG_M_S4N4); /* check for complete set of bursts */ if ((*mask & 0xf) != 0xf) { diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index 1bf67a0..0388ec0 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -55,7 +55,7 @@ uint8_t rsl_cmode = chan_state->rsl_cmode; uint8_t tch_mode = chan_state->tch_mode; uint8_t tch_data[128]; /* just to be safe */ - enum sched_meas_avg_mode meas_avg_mode = SCHED_MEAS_AVG_M_OCTO; + enum sched_meas_avg_mode meas_avg_mode = SCHED_MEAS_AVG_M_S8N8; struct l1sched_meas_set meas_avg; int rc, amr = 0; int n_errors = 0; @@ -175,11 +175,11 @@ switch (chan_state->amr_last_dtx) { case AFS_SID_FIRST: case AFS_SID_UPDATE_CN: - meas_avg_mode = SCHED_MEAS_AVG_M8_FIRST_QUAD; + meas_avg_mode = SCHED_MEAS_AVG_M_S8N4; break; case AFS_SID_UPDATE: case AFS_ONSET: - meas_avg_mode = SCHED_MEAS_AVG_M_QUAD; + meas_avg_mode = SCHED_MEAS_AVG_M_S4N4; break; } diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 5d2c12c..8264163 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -64,7 +64,7 @@ * Even FN ending at: 10,11,19,20,2,3 */ int fn_is_odd = (((bi->fn + 26 - 10) % 26) >> 2) & 1; - enum sched_meas_avg_mode meas_avg_mode = SCHED_MEAS_AVG_M_QUAD; + enum sched_meas_avg_mode meas_avg_mode = SCHED_MEAS_AVG_M_S4N4; struct l1sched_meas_set meas_avg; unsigned int fn_begin; unsigned int fn_tch_end; @@ -214,10 +214,10 @@ case AHS_SID_UPDATE_CN: case AHS_SID_FIRST_INH: case AHS_SID_UPDATE_INH: - meas_avg_mode = SCHED_MEAS_AVG_M6_FIRST_TWO; + meas_avg_mode = SCHED_MEAS_AVG_M_S6N2; break; case AHS_ONSET: - meas_avg_mode = SCHED_MEAS_AVG_M6_MIDDLE_TWO; + meas_avg_mode = SCHED_MEAS_AVG_M_S4N2; break; } @@ -250,7 +250,7 @@ /* average measurements of the last N (depends on mode) bursts */ if (rc == GSM_MACBLOCK_LEN) - meas_avg_mode = SCHED_MEAS_AVG_M_SIX; + meas_avg_mode = SCHED_MEAS_AVG_M_S6N6; trx_sched_meas_avg(chan_state, &meas_avg, meas_avg_mode); /* Check if the frame is bad */ diff --git a/src/osmo-bts-trx/sched_lchan_xcch.c b/src/osmo-bts-trx/sched_lchan_xcch.c index 6a65574..1d529f2 100644 --- a/src/osmo-bts-trx/sched_lchan_xcch.c +++ b/src/osmo-bts-trx/sched_lchan_xcch.c @@ -111,7 +111,7 @@ return 0; /* average measurements of the last 4 bursts */ - trx_sched_meas_avg(chan_state, &meas_avg, SCHED_MEAS_AVG_M_QUAD); + trx_sched_meas_avg(chan_state, &meas_avg, SCHED_MEAS_AVG_M_S4N4); /* check for complete set of bursts */ if ((*mask & 0xf) != 0xf) { diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 3a6418b..74de902 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -647,27 +647,27 @@ switch (mode) { /* last 4 bursts (default for xCCH, TCH/H, PTCCH and PDTCH) */ - case SCHED_MEAS_AVG_M_QUAD: + case SCHED_MEAS_AVG_M_S4N4: n = 4; shift = n; break; /* last 8 bursts (default for TCH/F and FACCH/F) */ - case SCHED_MEAS_AVG_M_OCTO: + case SCHED_MEAS_AVG_M_S8N8: n = 8; shift = n; break; /* last 6 bursts (default for FACCH/H) */ - case SCHED_MEAS_AVG_M_SIX: + case SCHED_MEAS_AVG_M_S6N6: n = 6; shift = n; break; /* first 4 of last 8 bursts */ - case SCHED_MEAS_AVG_M8_FIRST_QUAD: + case SCHED_MEAS_AVG_M_S8N4: n = 4; shift = 8; break; /* first 2 of last 6 bursts */ - case SCHED_MEAS_AVG_M6_FIRST_TWO: + case SCHED_MEAS_AVG_M_S6N2: n = 2; shift = 6; break; /* middle 2 of last 6 bursts */ - case SCHED_MEAS_AVG_M6_MIDDLE_TWO: + case SCHED_MEAS_AVG_M_S4N2: n = 2; shift = 4; break; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27548 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I96a8dd08084c7c179f879fc00e75c5edcfb11caa Gerrit-Change-Number: 27548 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests: add '(present)' restriction to 'expect_rr_cause'

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27522 ) Change subject: BSC_Tests: add '(present)' restriction to 'expect_rr_cause' ...................................................................... BSC_Tests: add '(present)' restriction to 'expect_rr_cause' RR Cause is a mandatory IE, so it cannot be omitted. Therefore it makes no sense to check if istemplatekind(expect_rr_cause, "omit"). Change-Id: I564d00a4715b86d248bce449d2b9193ac5e99008 --- M bsc/BSC_Tests.ttcn 1 file changed, 22 insertions(+), 25 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index c7bc811..a553f25 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2034,7 +2034,7 @@ boolean expect_rll_rel_req := true, boolean handle_rll_rel := true, template CellSelIndValue expect_cells := omit, - template RR_Cause expect_rr_cause := ? + template (present) RR_Cause expect_rr_cause := ? ) runs on test_CT { var RslLinkId main_dcch := valueof(ts_RslLinkID_DCCH(0)); @@ -2074,36 +2074,32 @@ } } - if (not istemplatekind(expect_rr_cause, "omit")) { - int2enum(oct2int(l3.msgs.rrm.channelRelease.rRCause.valuePart), got_cause); - log("GOT CAUSE CODE: ", l3.msgs.rrm.channelRelease.rRCause.valuePart, " = ", got_cause); - if (match(got_cause, expect_rr_cause)) { - setverdict(pass); - } else { - log("EXPECTED CAUSE CODE: ", expect_rr_cause); - setverdict(fail, "Received RR Channel Release Cause code does not match expectations"); - } + int2enum(oct2int(l3.msgs.rrm.channelRelease.rRCause.valuePart), got_cause); + log("GOT CAUSE CODE: ", l3.msgs.rrm.channelRelease.rRCause.valuePart, " = ", got_cause); + if (match(got_cause, expect_rr_cause)) { + setverdict(pass); + } else { + log("EXPECTED CAUSE CODE: ", expect_rr_cause); + setverdict(fail, "Received RR Channel Release Cause code does not match expectations"); } repeat; } [istemplatekind(expect_cells, "omit")] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_DATA_REQ(rsl_chan_nr, ?, decmatch tr_RRM_RR_RELEASE))) -> value ud { got_rr_chan_rel := true; - if (not istemplatekind(expect_rr_cause, "omit")) { - if (f_rsl_find_ie(ud.rsl, RSL_IE_L3_INFO, l3_ie) == false) { - setverdict(fail, "cannot find L3"); - mtc.stop; - } - l3 := dec_PDU_ML3_NW_MS(l3_ie.l3_info.payload); + if (f_rsl_find_ie(ud.rsl, RSL_IE_L3_INFO, l3_ie) == false) { + setverdict(fail, "cannot find L3"); + mtc.stop; + } + l3 := dec_PDU_ML3_NW_MS(l3_ie.l3_info.payload); - int2enum(oct2int(l3.msgs.rrm.channelRelease.rRCause.valuePart), got_cause); - log("GOT CAUSE CODE: ", l3.msgs.rrm.channelRelease.rRCause.valuePart, " = ", got_cause); - if (match(got_cause, expect_rr_cause)) { - setverdict(pass); - } else { - log("EXPECTED CAUSE CODE: ", expect_rr_cause); - setverdict(fail, "Received RR Channel Release Cause code does not match expectations"); - } + int2enum(oct2int(l3.msgs.rrm.channelRelease.rRCause.valuePart), got_cause); + log("GOT CAUSE CODE: ", l3.msgs.rrm.channelRelease.rRCause.valuePart, " = ", got_cause); + if (match(got_cause, expect_rr_cause)) { + setverdict(pass); + } else { + log("EXPECTED CAUSE CODE: ", expect_rr_cause); + setverdict(fail, "Received RR Channel Release Cause code does not match expectations"); } repeat; } @@ -2309,7 +2305,8 @@ f_shutdown_helper(); } -private function f_tc_chan_rel_rr_cause(myBSSMAP_Cause clear_cmd_cause, template RR_Cause expect_rr_cause) +private function f_tc_chan_rel_rr_cause(myBSSMAP_Cause clear_cmd_cause, + template (present) RR_Cause expect_rr_cause) runs on test_CT { var DchanTuple dt; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27522 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: I564d00a4715b86d248bce449d2b9193ac5e99008 Gerrit-Change-Number: 27522 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests: avoid code duplication in f_expect_chan_rel()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27523 ) Change subject: BSC_Tests: avoid code duplication in f_expect_chan_rel() ...................................................................... BSC_Tests: avoid code duplication in f_expect_chan_rel() Using a guard statement makes no sense given that we match the cellSelectionIndicatorValue conditionally within the alt branch itself. Removing that guard statement eliminates the need to have an additional alt branch with identical body. Change-Id: I373376637a083637ce01f3ac59fe5fd2836ac6cd --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 20 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index a553f25..4683dc7 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2052,7 +2052,7 @@ got_deact_sacch := true; repeat; } - [not istemplatekind(expect_cells, "omit")] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_DATA_REQ(rsl_chan_nr, ?, decmatch tr_RRM_RR_RELEASE_CellSelectInd))) -> value ud { + [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_DATA_REQ(rsl_chan_nr, ?, decmatch tr_RRM_RR_RELEASE))) -> value ud { got_rr_chan_rel := true; if (f_rsl_find_ie(ud.rsl, RSL_IE_L3_INFO, l3_ie) == false) { @@ -2084,25 +2084,6 @@ } repeat; } - [istemplatekind(expect_cells, "omit")] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_DATA_REQ(rsl_chan_nr, ?, decmatch tr_RRM_RR_RELEASE))) -> value ud { - got_rr_chan_rel := true; - - if (f_rsl_find_ie(ud.rsl, RSL_IE_L3_INFO, l3_ie) == false) { - setverdict(fail, "cannot find L3"); - mtc.stop; - } - l3 := dec_PDU_ML3_NW_MS(l3_ie.l3_info.payload); - - int2enum(oct2int(l3.msgs.rrm.channelRelease.rRCause.valuePart), got_cause); - log("GOT CAUSE CODE: ", l3.msgs.rrm.channelRelease.rRCause.valuePart, " = ", got_cause); - if (match(got_cause, expect_rr_cause)) { - setverdict(pass); - } else { - log("EXPECTED CAUSE CODE: ", expect_rr_cause); - setverdict(fail, "Received RR Channel Release Cause code does not match expectations"); - } - repeat; - } [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_REL_REQ(rsl_chan_nr, ?))) { got_rll_rel_req := true; /* FIXME: Why are we getting this for LinkID SACCH? */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27523 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: I373376637a083637ce01f3ac59fe5fd2836ac6cd Gerrit-Change-Number: 27523 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: fix some inadequate template restriction warnings

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27525 ) Change subject: bsc: fix some inadequate template restriction warnings ...................................................................... bsc: fix some inadequate template restriction warnings Change-Id: Icfc69aff2c923f4e12dbd6cc42c792d5712a7b27 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 8 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 758b989..c7bc811 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1677,8 +1677,8 @@ var BSSMAP_IE_EncryptionInformation encryptionInformation := valueof(ts_BSSMAP_IE_EncrInfo('0000000000000000'O,'01'O)); - var template BSSMAP_IE_ChosenEncryptionAlgorithm chosenEncryptionAlgorithm := omit; - var template BSSMAP_IE_KC128 kc128 := omit; + var template (omit) BSSMAP_IE_ChosenEncryptionAlgorithm chosenEncryptionAlgorithm := omit; + var template (omit) BSSMAP_IE_KC128 kc128 := omit; if (ispresent(enc)) { var TestHdlrEncrParams v_enc := valueof(enc); encryptionInformation := valueof(ts_BSSMAP_IE_EncrInfo(v_enc.enc_key, v_enc.enc_alg_permitted)); @@ -2492,15 +2492,15 @@ } private function f_exp_sapi_n_reject(template (present) GsmSapi sapi := ?, - template myBSSMAP_Cause cause := ?, + template (present) myBSSMAP_Cause cause := ?, template (present) BIT2 cc := ?, float T_val := 2.0) runs on test_CT { var BSSAP_N_DATA_ind rx_di; timer T; - var template BSSMAP_IE_Cause tr_cause := tr_BSSMAP_IE_Cause(cause); - var template PDU_BSSAP tr_pdu := tr_BSSMAP_SAPInReject(sapi); + var template (present) BSSMAP_IE_Cause tr_cause := tr_BSSMAP_IE_Cause(cause); + var template (present) PDU_BSSAP tr_pdu := tr_BSSMAP_SAPInReject(sapi); T.start(T_val); alt { @@ -8010,7 +8010,7 @@ f_vty_transceive(BSCVTY, "bts 0 c0-power-reduction " & int2str(red)); /* Expect Osmocom specific BS Power Control message on the RSL */ - var template RSL_Message tr_rsl_pdu := tr_RSL_BS_PWR_CTRL( + var template (present) RSL_Message tr_rsl_pdu := tr_RSL_BS_PWR_CTRL( chan_nr := t_RslChanNr_BCCH(0), bs_power := tr_RSL_IE_BS_Power(red / 2)); tr_rsl_pdu.msg_disc := tr_RSL_MsgDisc(RSL_MDISC_CCHAN, false); @@ -10517,7 +10517,7 @@ } private function f_verify_imm_ass(RSL_Message imm_ass, template uint8_t ra := ?, template GsmFrameNumber fn := ?, - template RslChannelNr chan_nr := ?, + template (present) RslChannelNr chan_nr := ?, template (present) uint12_t arfcn := ?, template (present) uint3_t tsc := ?) { diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index b0daf61..a50b6f4 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -622,7 +622,7 @@ /* In this case, alg_permitted should have only one permitted algo */ alg_expect := valueof(alg_permitted); } - var template octetstring kc := omit; + var template (omit) octetstring kc := omit; if (kc128) { kc := f_rnd_octstring(16); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27525 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: Icfc69aff2c923f4e12dbd6cc42c792d5712a7b27 Gerrit-Change-Number: 27525 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests: avoid code duplication in f_expect_chan_rel()

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27523 ) Change subject: BSC_Tests: avoid code duplication in f_expect_chan_rel() ...................................................................... Patch Set 3: Code-Review+2 (1 comment) Patchset: PS3: 1+1=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27523 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: I373376637a083637ce01f3ac59fe5fd2836ac6cd Gerrit-Change-Number: 27523 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Mar 2022 18:25:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: bssmap_le: support additional IEs in Perform Location Request

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27561 ) Change subject: bssmap_le: support additional IEs in Perform Location Request ...................................................................... bssmap_le: support additional IEs in Perform Location Request Change-Id: I8775a93cf4089b1752d040e43d2cba6b8997f955 Related: SYS#5891 --- M include/osmocom/gsm/protocol/gsm_49_031.h M src/gsm/bssmap_le.c M tests/bssmap_le/bssmap_le_test.c M tests/bssmap_le/bssmap_le_test.ok 4 files changed, 121 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/gsm/protocol/gsm_49_031.h b/include/osmocom/gsm/protocol/gsm_49_031.h index 06fcbce..8429ccc 100644 --- a/include/osmocom/gsm/protocol/gsm_49_031.h +++ b/include/osmocom/gsm/protocol/gsm_49_031.h @@ -25,6 +25,8 @@ #include <stdint.h> #include <stdbool.h> + +#include <osmocom/core/endian.h> #include <osmocom/gsm/protocol/gsm_48_071.h> #include <osmocom/gsm/protocol/gsm_23_032.h> #include <osmocom/gsm/gsm0808_utils.h> @@ -58,6 +60,21 @@ uint8_t diag_val; }; +/* 3GPP TS 49.031 10.16 LCS QoS IE */ +struct osmo_bssmap_le_lcs_qos { +#if OSMO_IS_LITTLE_ENDIAN + uint8_t vert:1, vel:1, spare1:6; + uint8_t ha_val:7, ha_ind:1; + uint8_t va_val:7, va_ind:1; + uint8_t spare3:6, rt:2; +#elif OSMO_IS_BIG_ENDIAN + uint8_t spare1:6, vel:1, vert:1; + uint8_t ha_ind:1, ha_val:7; + uint8_t va_ind:1, va_val:7; + uint8_t rt:2, spare3:6; +#endif +} __attribute__ ((packed)); + enum bssap_le_msg_discr { BSSAP_LE_MSG_DISCR_BSSMAP_LE = 0, }; @@ -167,7 +184,15 @@ bool apdu_present; struct bsslap_pdu apdu; - bool more_items; /*!< always set this to false */ + bool more_items; /*!< set this to true iff any fields below are used */ + + bool lcs_priority_present; + uint8_t lcs_priority; /*!< see in 3GPP TS 29.002 */ + + bool lcs_qos_present; + struct osmo_bssmap_le_lcs_qos lcs_qos; + + bool more_items2; /*!< always set this to false */ }; struct bssmap_le_perform_loc_resp { diff --git a/src/gsm/bssmap_le.c b/src/gsm/bssmap_le.c index fa0f254..3e90a43 100644 --- a/src/gsm/bssmap_le.c +++ b/src/gsm/bssmap_le.c @@ -261,6 +261,57 @@ } } +/*! Encode full BSSMAP-LE LCS Priority IE, including IEI tag and length. + * \param[inout] msg Message buffer to append to. + * \param[in] priority Value to enconde. + * \returns length of bytes written to the msgb. + */ +static uint8_t osmo_bssmap_le_ie_enc_lcs_priority(struct msgb *msg, uint8_t priority) +{ + OSMO_ASSERT(msg); + msgb_put_u8(msg, BSSMAP_LE_IEI_LCS_PRIORITY); + /* length */ + msgb_put_u8(msg, 1); + msgb_put_u8(msg, priority); + return 3; +} + +static int osmo_bssmap_le_ie_dec_lcs_priority(uint8_t *priority, + enum bssmap_le_msgt msgt, enum bssmap_le_iei iei, + struct osmo_bssmap_le_err **err, void *err_ctx, + const uint8_t *elem, uint8_t len) +{ + if (!elem || len != 1) + DEC_ERR(-EINVAL, msgt, iei, LCS_CAUSE_UNSPECIFIED, "unexpected length"); + + *priority = elem[0]; + return 0; +} + +/*! Encode full BSSMAP-LE LCS QoS IE, including IEI tag and length. + * \param[inout] msg Message buffer to append to. + * \param[in] priority Value to enconde. + * \returns length of bytes written to the msgb. + */ +static uint8_t osmo_bssmap_le_ie_enc_lcs_qos(struct msgb *msg, const struct osmo_bssmap_le_lcs_qos *qos) +{ + OSMO_ASSERT(msg); + msgb_tlv_put(msg, BSSMAP_LE_IEI_LCS_QoS, sizeof(*qos), (const uint8_t *)qos); + return 2 + sizeof(*qos); +} + +static int osmo_bssmap_le_ie_dec_lcs_qos(struct osmo_bssmap_le_lcs_qos *qos, + enum bssmap_le_msgt msgt, enum bssmap_le_iei iei, + struct osmo_bssmap_le_err **err, void *err_ctx, + const uint8_t *elem, uint8_t len) +{ + if (!elem || len != sizeof(*qos)) + DEC_ERR(-EINVAL, msgt, iei, LCS_CAUSE_UNSPECIFIED, "unexpected length"); + + memcpy(qos, elem, len); + return 0; +} + /*! Encode the value part of 3GPP TS 49.031 10.13 LCS Cause, without IEI and len. * Identically used in 3GPP TS 48.008 3.2.2.66. Usage example: * @@ -472,6 +523,12 @@ if (params->lcs_client_type_present) osmo_bssmap_le_ie_enc_lcs_client_type(msg, params->lcs_client_type); + if (params->more_items && params->lcs_priority_present) + osmo_bssmap_le_ie_enc_lcs_priority(msg, params->lcs_priority); + + if (params->more_items && params->lcs_qos_present) + osmo_bssmap_le_ie_enc_lcs_qos(msg, &params->lcs_qos); + if (params->apdu_present) { int rc = osmo_bssmap_le_ie_enc_apdu(msg, &params->apdu); if (rc < 0) @@ -509,11 +566,18 @@ &params->cell_id); DEC_IE_OPTIONAL_FLAG(msgt, BSSMAP_LE_IEI_LCS_CLIENT_TYPE, osmo_bssmap_le_ie_dec_lcs_client_type, &params->lcs_client_type, params->lcs_client_type_present); + DEC_IE_OPTIONAL_FLAG(msgt, BSSMAP_LE_IEI_LCS_PRIORITY, osmo_bssmap_le_ie_dec_lcs_priority, + &params->lcs_priority, params->lcs_priority_present); + DEC_IE_OPTIONAL_FLAG(msgt, BSSMAP_LE_IEI_LCS_QoS, osmo_bssmap_le_ie_dec_lcs_qos, + &params->lcs_qos, params->lcs_qos_present); DEC_IE_OPTIONAL_FLAG(msgt, BSSMAP_LE_IEI_APDU, osmo_bssmap_le_ie_dec_apdu, &params->apdu, params->apdu_present); DEC_IE_OPTIONAL(msgt, BSSMAP_LE_IEI_IMSI, osmo_bssmap_le_ie_dec_imsi, &params->imsi); DEC_IE_OPTIONAL(msgt, BSSMAP_LE_IEI_IMEI, osmo_bssmap_le_ie_dec_imei, &params->imei); + if (params->lcs_priority_present || params->lcs_qos_present) + params->more_items = true; + return 0; } diff --git a/tests/bssmap_le/bssmap_le_test.c b/tests/bssmap_le/bssmap_le_test.c index f9ebd92..4d132b0 100644 --- a/tests/bssmap_le/bssmap_le_test.c +++ b/tests/bssmap_le/bssmap_le_test.c @@ -118,6 +118,36 @@ }, }, }, + { + .msg_type = BSSMAP_LE_MSGT_PERFORM_LOC_REQ, + .perform_loc_req = { + .location_type = { + .location_information = BSSMAP_LE_LOC_INFO_CURRENT_GEOGRAPHIC, + }, + + .cell_id = { + .id_discr = CELL_IDENT_LAC_AND_CI, + .id.lac_and_ci = { + .lac = 23, + .ci = 42, + }, + }, + + .lcs_client_type_present = true, + .lcs_client_type = BSSMAP_LE_LCS_CTYPE_EMERG_SVC_UNSPECIFIED, + + .more_items = true, + + .lcs_priority_present = true, + .lcs_priority = 0x00, /* highest */ + + .lcs_qos_present = true, + .lcs_qos = { + .ha_ind = 1, + .ha_val = 0x12, + }, + }, + }, }; void test_bssmap_le_enc_dec() diff --git a/tests/bssmap_le/bssmap_le_test.ok b/tests/bssmap_le/bssmap_le_test.ok index a6f0dee..8cc7703 100644 --- a/tests/bssmap_le/bssmap_le_test.ok +++ b/tests/bssmap_le/bssmap_le_test.ok @@ -9,3 +9,4 @@ [7] CONNECTION ORIENTED INFORMATON: ok (encoded len = 8) [8] CONNECTION ORIENTED INFORMATON: ok (encoded len = 13) [9] CONNECTION ORIENTED INFORMATON: ok (encoded len = 10) +[10] PERFORM LOCATION REQUEST: ok (encoded len = 25) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8775a93cf4089b1752d040e43d2cba6b8997f955 Gerrit-Change-Number: 27561 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: parse_bssmap_perf_loc_req(): make 'struct tlv_p_entry' pointer const

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27562 ) Change subject: parse_bssmap_perf_loc_req(): make 'struct tlv_p_entry' pointer const ...................................................................... parse_bssmap_perf_loc_req(): make 'struct tlv_p_entry' pointer const Change-Id: Ieba7f65667c5a1f9c0d7d2a350ec736994b1866e --- M src/osmo-bsc/lcs_loc_req.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-bsc/lcs_loc_req.c b/src/osmo-bsc/lcs_loc_req.c index d2ea72d..cb55f5f 100644 --- a/src/osmo-bsc/lcs_loc_req.c +++ b/src/osmo-bsc/lcs_loc_req.c @@ -104,7 +104,7 @@ { struct tlv_parsed tp_arr[1]; struct tlv_parsed *tp = &tp_arr[0]; - struct tlv_p_entry *e; + const struct tlv_p_entry *e; int payload_length; #define PARSE_ERR(ERRMSG) do { \ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ieba7f65667c5a1f9c0d7d2a350ec736994b1866e Gerrit-Change-Number: 27562 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: BSSMAP LE: fix handling of LCS Client Type IE

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27563 ) Change subject: BSSMAP LE: fix handling of LCS Client Type IE ...................................................................... BSSMAP LE: fix handling of LCS Client Type IE On receipt of the Perform Location Request message, the BSC needs to forward it to the SMLC. If the LCS Client Type IE is present in the original message, it must be delivered to the SMLC too. Change-Id: Id3262e67c3dc25cb93fbd52a40689c5529ca2d41 Related: SYS#5891 --- M include/osmocom/bsc/lcs_loc_req.h M src/osmo-bsc/lcs_loc_req.c 2 files changed, 13 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/bsc/lcs_loc_req.h b/include/osmocom/bsc/lcs_loc_req.h index 86540f2..7b10b7e 100644 --- a/include/osmocom/bsc/lcs_loc_req.h +++ b/include/osmocom/bsc/lcs_loc_req.h @@ -31,6 +31,9 @@ bool cell_id_present; struct gsm0808_cell_id cell_id; + bool client_type_present; + enum bssmap_le_lcs_client_type client_type; + struct osmo_mobile_identity imsi; struct osmo_mobile_identity imei; } req; diff --git a/src/osmo-bsc/lcs_loc_req.c b/src/osmo-bsc/lcs_loc_req.c index cb55f5f..6978049 100644 --- a/src/osmo-bsc/lcs_loc_req.c +++ b/src/osmo-bsc/lcs_loc_req.c @@ -127,6 +127,13 @@ lcs_loc_req->req.cell_id_present = true; } + /* 3GPP TS 49.031, section 10.14 (C) "LCS Client Type" */ + if (TLVP_PRES_LEN(tp, GSM0808_IE_LCS_CLIENT_TYPE, 1)) { + lcs_loc_req->req.client_type = *TLVP_VAL(tp, GSM0808_IE_LCS_CLIENT_TYPE); + lcs_loc_req->req.client_type_present = true; + } else if (lcs_loc_req->req.location_type.location_information == BSSMAP_LE_LOC_INFO_CURRENT_GEOGRAPHIC) + PARSE_ERR("Missing LCS Client Type IE"); + if ((e = TLVP_GET(tp, GSM0808_IE_IMSI))) { if (osmo_mobile_identity_decode(&lcs_loc_req->req.imsi, e->val, e->len, false) || lcs_loc_req->req.imsi.type != GSM_MI_TYPE_IMSI) @@ -300,6 +307,9 @@ .cell_id = lcs_loc_req->req.cell_id, .imsi = lcs_loc_req->req.imsi, .imei = lcs_loc_req->req.imei, + + .lcs_client_type_present = lcs_loc_req->req.client_type_present, + .lcs_client_type = lcs_loc_req->req.client_type, }, }, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27563 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id3262e67c3dc25cb93fbd52a40689c5529ca2d41 Gerrit-Change-Number: 27563 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: bssmap_le: support additional IEs in Perform Location Request

by pespin

Attention is currently required from: neels, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27561 ) Change subject: bssmap_le: support additional IEs in Perform Location Request ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8775a93cf4089b1752d040e43d2cba6b8997f955 Gerrit-Change-Number: 27561 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Mar 2022 17:57:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests: avoid code duplication in f_expect_chan_rel()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27523 ) Change subject: BSC_Tests: avoid code duplication in f_expect_chan_rel() ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27523 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: I373376637a083637ce01f3ac59fe5fd2836ac6cd Gerrit-Change-Number: 27523 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Mar 2022 17:51:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: gen_links.sh.inc: Fix globbing writing '*.ttcn' to */.gitignore

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27536 ) Change subject: gen_links.sh.inc: Fix globbing writing '*.ttcn' to */.gitignore ...................................................................... gen_links.sh.inc: Fix globbing writing '*.ttcn' to */.gitignore This was the case under ggsn_tests, which in turn prevents search text tools like "ag" to find stuff in .ttcn files (because it skips code in .gitignore). Change-Id: Iaef3cfd5ae29db352046664ab4949b037ca80307 --- M gen_links.sh.inc 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/gen_links.sh.inc b/gen_links.sh.inc index 539b398..c21bcd6 100644 --- a/gen_links.sh.inc +++ b/gen_links.sh.inc @@ -36,6 +36,8 @@ } ignore_pp_results() { + # Avoid using the pattern itself if no file is found in globbing below: + shopt -s nullglob for pp in *.ttcnpp; do ttcn_file="$(echo $pp | sed 's/pp$//')" echo "$ttcn_file" >> .gitignore -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27536 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: Iaef3cfd5ae29db352046664ab4949b037ca80307 Gerrit-Change-Number: 27536 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: gen_links.sh.inc: Fix globbing writing '*.ttcn' to */.gitignore

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27536 ) Change subject: gen_links.sh.inc: Fix globbing writing '*.ttcn' to */.gitignore ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27536 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: Iaef3cfd5ae29db352046664ab4949b037ca80307 Gerrit-Change-Number: 27536 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Mar 2022 17:49:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

2024

2023

2022

gerrit-log March 2022