June 2023 - gerrit-log - lists.osmocom.org

[M] Change in libosmocore[master]: gsm: add gsm0502_fn2ccch_block()
by fixeria 22 Jun '23

22 Jun '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/33402 ) Change subject: gsm: add gsm0502_fn2ccch_block() ...................................................................... gsm: add gsm0502_fn2ccch_block() This API is useful for checking whether a Downlink CCCH block belongs to PCH or AGCH. We need this API in osmo-bts.git and osmocom-bb.git. Change-Id: I8cbd31226754e95887358ed83a928e2f567f4cf3 Related: OS#5500 --- M include/osmocom/gsm/gsm0502.h M src/gsm/gsm0502.c M src/gsm/libosmogsm.map 3 files changed, 51 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/02/33402/1 diff --git a/include/osmocom/gsm/gsm0502.h b/include/osmocom/gsm/gsm0502.h index ac697d9..43ab0b8 100644 --- a/include/osmocom/gsm/gsm0502.h +++ b/include/osmocom/gsm/gsm0502.h @@ -105,3 +105,5 @@ uint16_t gsm0502_hop_seq_gen(const struct gsm_time *t, uint8_t hsn, uint8_t maio, size_t n, const uint16_t *ma); + +int gsm0502_fn2ccch_block(uint32_t fn); diff --git a/src/gsm/gsm0502.c b/src/gsm/gsm0502.c index b147406..093c251 100644 --- a/src/gsm/gsm0502.c +++ b/src/gsm/gsm0502.c @@ -260,3 +260,38 @@ return ma ? ma[mai] : mai; } + +#define CB_FCCH -1 +#define CB_SCH -2 +#define CB_BCCH -3 +#define CB_IDLE -4 + +/* Clause 7 Table 3 and Figure 8a */ +static const int ccch_block_table[51] = { + CB_FCCH, CB_SCH, /* 0..1 */ + CB_BCCH, CB_BCCH, CB_BCCH, CB_BCCH, /* 2..5: BCCH */ + 0, 0, 0, 0, /* 6..9: B0 */ + CB_FCCH, CB_SCH, /* 10..11 */ + 1, 1, 1, 1, /* 12..15: B1 */ + 2, 2, 2, 2, /* 16..19: B2 */ + CB_FCCH, CB_SCH, /* 20..21 */ + 3, 3, 3, 3, /* 22..25: B3 */ + 4, 4, 4, 4, /* 26..29: B4 */ + CB_FCCH, CB_SCH, /* 30..31 */ + 5, 5, 5, 5, /* 32..35: B5 */ + 6, 6, 6, 6, /* 36..39: B6 */ + CB_FCCH, CB_SCH, /* 40..41 */ + 7, 7, 7, 7, /* 42..45: B7 */ + 8, 8, 8, 8, /* 46..49: B8 */ + CB_IDLE /* 50: Idle */ +}; + +/*! Calculate CCCH block number from the given TDMA frame number. + * \param[in] fn TDMA frame number (of first or last burst). + * \returns CCCH block number 0..8 or a negative value, + * if the given frame number cannot carry CCCH. + */ +int gsm0502_fn2ccch_block(uint32_t fn) +{ + return ccch_block_table[fn % 51]; +} diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 1e5a7b2..609ee7e 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -111,6 +111,7 @@ gsm0502_calc_paging_group; gsm0502_fn_remap; gsm0502_hop_seq_gen; +gsm0502_fn2ccch_block; gsm0503_xcch; gsm0503_rach; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8cbd31226754e95887358ed83a928e2f567f4cf3 Gerrit-Change-Number: 33402 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-gsm-manuals[master]: add static SS7 routing example to cs7-config.adoc
by pespin 22 Jun '23

22 Jun '23

Attention is currently required from: neels, laforge, msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273 ) Change subject: add static SS7 routing example to cs7-config.adoc ...................................................................... Patch Set 3: (1 comment) File common/chapters/cs7-config.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273/comment/3661644b_b5bf… PS1, Line 349: Osmocom SS7 supports dynamic routing, allowing minimal SS7 configuration. If all of your components support dynamic > Done My point was also to have "Routing Key Management (RKM)" the first time it appears here so that the user can understand what RKM is and can look it up easliy somewhere else. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I44afddf7004f5bf37eec706ca3da12c04f83f8fa Gerrit-Change-Number: 32273 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Jun 2023 15:18:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-gsm-manuals[master]: add static SS7 routing example to cs7-config.adoc
by neels 22 Jun '23

22 Jun '23

Attention is currently required from: laforge, pespin, msuraev. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273 ) Change subject: add static SS7 routing example to cs7-config.adoc ...................................................................... Patch Set 2: (8 comments) File common/chapters/cs7-config.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273/comment/2324a0d4_01e4… PS1, Line 349: Osmocom SS7 supports dynamic routing, allowing minimal SS7 configuration. If all of your components support dynamic > I'd do a s/dynamic routing/dynamic routing key management/ all over the text. […] Done https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273/comment/12b6141b_8409… PS1, Line 373: - its own point-code -- has to match the PC in osmo-stp.cfg > Perhaps better: "has to match its own PC entry in osmo-stp. […] Done https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273/comment/b5352d4a_92be… PS1, Line 376: - local+remote IP:port for M3UA -- have to match the IP:ports in osmo-stp.cfg > IP:ports -> IP:port? it's remote and local, two ports... https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273/comment/50688bf4_e451… PS1, Line 382: - local+remote IP:port for M3UA -- have to match the IP:ports in osmo-stp.cfg > IP:ports -> IP:port? Done https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273/comment/baa9bbe6_1605… PS1, Line 387: - all point-codes -- they have to match the PC in osmo-bsc.cfg and osmo-msc.cfg > You list first point codes and afterwards routing keys in the MSC and BSC section. […] Done https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273/comment/f2754bb7_974f… PS1, Line 388: - local+remote IP:port for M3UA -- have to match the IP:ports in osmo-bsc.cfg and osmo-msc.cfg > IP:ports -> IP:port? Done https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273/comment/5f6c9192_3111… PS1, Line 454: ty synchronize point-codes and routing keys between STP and \{BSC,MSC}: > typo: to Done https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273/comment/88575ba9_9972… PS1, Line 454: synchronize > I would replace synchronize with "manually configure", as "synchronize" might refer to some kind of […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I44afddf7004f5bf37eec706ca3da12c04f83f8fa Gerrit-Change-Number: 32273 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Jun 2023 14:59:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-gsm-manuals[master]: add static SS7 routing example to cs7-config.adoc
by neels 22 Jun '23

22 Jun '23

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273 to look at the new patch set (#3). Change subject: add static SS7 routing example to cs7-config.adoc ...................................................................... add static SS7 routing example to cs7-config.adoc Related: SYS#6422 Change-Id: I44afddf7004f5bf37eec706ca3da12c04f83f8fa --- M common/chapters/cs7-config.adoc 1 file changed, 161 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/73/32273/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I44afddf7004f5bf37eec706ca3da12c04f83f8fa Gerrit-Change-Number: 32273 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-gsm-manuals[master]: add static SS7 routing example to cs7-config.adoc
by neels 22 Jun '23

22 Jun '23

Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273 ) Change subject: add static SS7 routing example to cs7-config.adoc ...................................................................... Patch Set 2: (1 comment) File common/chapters/cs7-config.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273/comment/226f118e_2925… PS1, Line 365: Every component has a distinct M3UA port. For > I don't follow why that would be the case? Are you describing a setup […] IIRC the reason for assuming fixed ports are necessary was: in osmo-stp.cfg below, there are two ASPs configured like: # asp <name> <remote-port> <local-port|0> m3ua asp mybsc-0 12905 2905 m3ua To be able to set the remote-port (here 12905), the other side (here bsc) needs to be configured to use port 12905. So I ended up with this conclusion from a basic configuration necessity. I'm not sure if there are alternatives / if that should be so or not... -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I44afddf7004f5bf37eec706ca3da12c04f83f8fa Gerrit-Change-Number: 32273 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Jun 2023 14:57:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

[M] Change in osmo-gsm-manuals[master]: add static SS7 routing example to cs7-config.adoc
by neels 22 Jun '23

22 Jun '23

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273 to look at the new patch set (#2). Change subject: add static SS7 routing example to cs7-config.adoc ...................................................................... add static SS7 routing example to cs7-config.adoc Related: SYS#6422 Change-Id: I44afddf7004f5bf37eec706ca3da12c04f83f8fa --- M common/chapters/cs7-config.adoc 1 file changed, 161 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/73/32273/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I44afddf7004f5bf37eec706ca3da12c04f83f8fa Gerrit-Change-Number: 32273 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-hnbgw[master]: coverity: hnbgw_cn: avoid NULL deref in LOGP
by pespin 22 Jun '23

22 Jun '23

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/33401 ) Change subject: coverity: hnbgw_cn: avoid NULL deref in LOGP ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/33401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Icc2b45c8df8d92cfb42582615313d83389cf1621 Gerrit-Change-Number: 33401 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Jun 2023 14:33:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-gsm-manuals[master]: add static SS7 routing example to cs7-config.adoc
by neels 22 Jun '23

22 Jun '23

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273 ) Change subject: add static SS7 routing example to cs7-config.adoc ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: fyi, i didn't pursue this patch further because I'm a bit unsure about the content, and don't want to write misleading docs... but i'll see if the review makes up for it. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/32273 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I44afddf7004f5bf37eec706ca3da12c04f83f8fa Gerrit-Change-Number: 32273 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Jun 2023 14:30:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-hnbgw[master]: coverity: hnbgw_cn: avoid NULL deref in LOGP
by neels 22 Jun '23

22 Jun '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/33401 ) Change subject: coverity: hnbgw_cn: avoid NULL deref in LOGP ...................................................................... coverity: hnbgw_cn: avoid NULL deref in LOGP Related: CID#321281 Change-Id: Icc2b45c8df8d92cfb42582615313d83389cf1621 --- M src/osmo-hnbgw/hnbgw_cn.c 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/01/33401/1 diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 58b0af8..b95cf28 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -861,7 +861,8 @@ sccp = osmo_sccp_simple_client_on_ss7_id(g_hnbgw, ss7 ? ss7->cfg.id : 0, cnlink->name, DEFAULT_PC_HNBGW, OSMO_SS7_ASP_PROT_M3UA, 0, "localhost", -1, "localhost"); if (!sccp) { - LOG_CNLINK(cnlink, DCN, LOGL_ERROR, "Failed to configure 'cs7 instance %u'\n", ss7->cfg.id); + LOG_CNLINK(cnlink, DCN, LOGL_ERROR, "Failed to configure SCCP on 'cs7 instance %u'\n", + ss7 ? ss7->cfg.id : 0); return -1; } ss7 = osmo_sccp_get_ss7(sccp); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/33401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Icc2b45c8df8d92cfb42582615313d83389cf1621 Gerrit-Change-Number: 33401 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-hnbgw[master]: cnpool: add context_map_cnlink_lost() handling
by neels 22 Jun '23

22 Jun '23

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/33173 ) Change subject: cnpool: add context_map_cnlink_lost() handling ...................................................................... cnpool: add context_map_cnlink_lost() handling When proper RANAP RESET handling is in place [1], a specific CN link may be detected to be disconnected or reconnected at any point. [1] Id3eefdea889a736fd5957b80280fa45b9547b792 When that happens, all related context maps should disconnect RUA and SCCP links immediately. Add the context map side of this, so that context_map_cnlink_lost() is ready to be dispatched in [1]. Related: SYS#6412 Change-Id: Ic0a6fcfb747dc093528ca2bd12a269ad390d465c --- M include/osmocom/hnbgw/context_map.h M src/osmo-hnbgw/context_map.c M src/osmo-hnbgw/context_map_sccp.c 3 files changed, 38 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/hnbgw/context_map.h b/include/osmocom/hnbgw/context_map.h index f7335a7..d401635 100644 --- a/include/osmocom/hnbgw/context_map.h +++ b/include/osmocom/hnbgw/context_map.h @@ -66,6 +66,9 @@ /* The human admin asks to drop the current SCCP connection, by telnet VTY 'apply sccp' in presence of SCCP * config changes. */ MAP_SCCP_EV_USER_ABORT, + /* The CN link can no longer work, for example a RANAP RESET was received from the cnlink that hosts this + * context map. */ + MAP_SCCP_EV_CN_LINK_LOST, }; /* For context_map_get_state(), to combine the RUA and SCCP states, for VTY reporting only. */ @@ -186,6 +189,7 @@ bool map_rua_is_active(struct hnbgw_context_map *map); bool map_sccp_is_active(struct hnbgw_context_map *map); +void context_map_cnlink_lost(struct hnbgw_context_map *map); void context_map_free(struct hnbgw_context_map *map); unsigned int msg_has_l2_data(const struct msgb *msg); diff --git a/src/osmo-hnbgw/context_map.c b/src/osmo-hnbgw/context_map.c index d0e0d80..12d9889 100644 --- a/src/osmo-hnbgw/context_map.c +++ b/src/osmo-hnbgw/context_map.c @@ -183,6 +183,11 @@ map_rua_dispatch(map, MAP_RUA_EV_HNB_LINK_LOST, NULL); } +void context_map_cnlink_lost(struct hnbgw_context_map *map) +{ + map_sccp_dispatch(map, MAP_SCCP_EV_RAN_LINK_LOST, NULL); +} + void context_map_free(struct hnbgw_context_map *map) { /* guard against FSM termination infinitely looping back here */ diff --git a/src/osmo-hnbgw/context_map_sccp.c b/src/osmo-hnbgw/context_map_sccp.c index 1f2cd09..9b4837d 100644 --- a/src/osmo-hnbgw/context_map_sccp.c +++ b/src/osmo-hnbgw/context_map_sccp.c @@ -55,6 +55,7 @@ OSMO_VALUE_STRING(MAP_SCCP_EV_RAN_LINK_LOST), OSMO_VALUE_STRING(MAP_SCCP_EV_RX_RELEASED), OSMO_VALUE_STRING(MAP_SCCP_EV_USER_ABORT), + OSMO_VALUE_STRING(MAP_SCCP_EV_CN_LINK_LOST), {} }; @@ -284,6 +285,7 @@ case MAP_SCCP_EV_RAN_LINK_LOST: case MAP_SCCP_EV_RAN_DISC: case MAP_SCCP_EV_USER_ABORT: + case MAP_SCCP_EV_CN_LINK_LOST: /* No CR has been sent yet, just go to disconnected state. */ if (msg_has_l2_data(ranap_msg)) LOG_MAP(map, DLSCCP, LOGL_ERROR, "SCCP not connected, cannot dispatch RANAP message\n"); @@ -321,6 +323,7 @@ case MAP_SCCP_EV_RAN_LINK_LOST: case MAP_SCCP_EV_RAN_DISC: case MAP_SCCP_EV_USER_ABORT: + case MAP_SCCP_EV_CN_LINK_LOST: /* RUA connection was terminated. First wait for the CC before releasing the SCCP conn. */ if (msg_has_l2_data(ranap_msg)) LOGPFSML(fi, LOGL_ERROR, "Connection not yet confirmed, cannot forward RANAP to CN\n"); @@ -379,6 +382,8 @@ * Disconnect on the SCCP layer, ungracefully. */ case MAP_SCCP_EV_USER_ABORT: /* The user is asking for disconnection, so there is no Iu Release in progress. Disconnect now. */ + case MAP_SCCP_EV_CN_LINK_LOST: + /* The CN peer has sent a RANAP RESET, so the old link that this map ran on is lost */ /* There won't be any ranap_msg, but if a caller wants to dispatch a msg, forward it before * disconnecting. */ @@ -448,6 +453,7 @@ return; case MAP_SCCP_EV_USER_ABORT: + case MAP_SCCP_EV_CN_LINK_LOST: /* Stop waiting for RLSD, send RLSD now. */ tx_sccp_rlsd(fi); map_sccp_fsm_state_chg(MAP_SCCP_ST_DISCONNECTED); @@ -525,6 +531,7 @@ | S(MAP_SCCP_EV_RAN_LINK_LOST) | S(MAP_SCCP_EV_RX_RELEASED) | S(MAP_SCCP_EV_USER_ABORT) + | S(MAP_SCCP_EV_CN_LINK_LOST) , .out_state_mask = 0 | S(MAP_SCCP_ST_INIT) @@ -542,6 +549,7 @@ | S(MAP_SCCP_EV_RAN_LINK_LOST) | S(MAP_SCCP_EV_RX_RELEASED) | S(MAP_SCCP_EV_USER_ABORT) + | S(MAP_SCCP_EV_CN_LINK_LOST) , .out_state_mask = 0 | S(MAP_SCCP_ST_CONNECTED) @@ -559,6 +567,7 @@ | S(MAP_SCCP_EV_RX_RELEASED) | S(MAP_SCCP_EV_RX_CONNECTION_CONFIRM) | S(MAP_SCCP_EV_USER_ABORT) + | S(MAP_SCCP_EV_CN_LINK_LOST) , .out_state_mask = 0 | S(MAP_SCCP_ST_WAIT_RLSD) @@ -577,6 +586,7 @@ | S(MAP_SCCP_EV_RAN_LINK_LOST) | S(MAP_SCCP_EV_RX_CONNECTION_CONFIRM) | S(MAP_SCCP_EV_USER_ABORT) + | S(MAP_SCCP_EV_CN_LINK_LOST) , .out_state_mask = 0 | S(MAP_SCCP_ST_DISCONNECTED) @@ -591,6 +601,7 @@ | S(MAP_SCCP_EV_RAN_DISC) | S(MAP_SCCP_EV_RAN_LINK_LOST) | S(MAP_SCCP_EV_USER_ABORT) + | S(MAP_SCCP_EV_CN_LINK_LOST) , .onenter = map_sccp_disconnected_onenter, .action = map_sccp_disconnected_action, -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/33173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic0a6fcfb747dc093528ca2bd12a269ad390d465c Gerrit-Change-Number: 33173 Gerrit-PatchSet: 8 Gerrit-Owner: neels <nhofmeyr(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-MessageType: merged

1 0