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

[S] Change in libosmo-sigtran[master]: sccp: Implement dpc_accessible()

by pespin

Attention is currently required from: daniel, laforge, neels. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250?usp=email ) Change subject: sccp: Implement dpc_accessible() ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: I'd like @laforge@gnumonks.org to have a look at this one when has has a few spare mins. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I16b0aa71db5be2daf7a8c52da829a38ad564eb7b Gerrit-Change-Number: 40250 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(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-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 08 May 2025 09:17:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: sccp: Implement dpc_accessible()

by osmith

Attention is currently required from: daniel, laforge, neels, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250?usp=email ) Change subject: sccp: Implement dpc_accessible() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40250?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I16b0aa71db5be2daf7a8c52da829a38ad564eb7b Gerrit-Change-Number: 40250 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(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-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 08 May 2025 09:16:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[S] Change in libosmo-sigtran[master]: combined_linkset: Improve logging

by osmith

Attention is currently required from: osmith, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40249?usp=email ) Change subject: combined_linkset: Improve logging ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40249?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ide1e72b9737a236561c7b6e86f381d929969346e Gerrit-Change-Number: 40249 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 08 May 2025 09:15:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: xua: Guard against osmo_fsm_inst_alloc() failures

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40244?usp=email ) Change subject: xua: Guard against osmo_fsm_inst_alloc() failures ...................................................................... xua: Guard against osmo_fsm_inst_alloc() failures This can happen for instance if the ASP name has a non-sanitized name. Change-Id: Ie5bd59c62f07a2656ddf5235450b9fd354eab7e0 --- M src/xua_as_fsm.c M src/xua_asp_fsm.c M src/xua_default_lm_fsm.c 3 files changed, 8 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c index 7f7c7d6..5b01009 100644 --- a/src/xua_as_fsm.c +++ b/src/xua_as_fsm.c @@ -663,6 +663,8 @@ struct xua_as_fsm_priv *xafp; fi = osmo_fsm_inst_alloc(&xua_as_fsm, as, NULL, log_level, as->cfg.name); + if (!fi) + return NULL; xafp = talloc_zero(fi, struct xua_as_fsm_priv); if (!xafp) { diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 11a34b4..596db45 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -827,6 +827,8 @@ /* allocate as child of AS? */ fi = osmo_fsm_inst_alloc(&xua_asp_fsm, asp, NULL, log_level, asp->cfg.name); + if (!fi) + return -EINVAL; xafp = talloc_zero(fi, struct xua_asp_fsm_priv); if (!xafp) { @@ -1304,6 +1306,8 @@ /* allocate as child of AS? */ fi = osmo_fsm_inst_alloc(&ipa_asp_fsm, asp, NULL, log_level, asp->cfg.name); + if (!fi) + return -EINVAL; iafp = talloc_zero(fi, struct ipa_asp_fsm_priv); if (!iafp) { diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c index 3aceb26..2cf2010 100644 --- a/src/xua_default_lm_fsm.c +++ b/src/xua_default_lm_fsm.c @@ -429,6 +429,8 @@ } fi = osmo_fsm_inst_alloc(&xua_default_lm_fsm, asp, NULL, log_level, asp->cfg.name); + if (!fi) + return -EINVAL; lmp = talloc_zero(fi, struct lm_fsm_priv); if (!lmp) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40244?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ie5bd59c62f07a2656ddf5235450b9fd354eab7e0 Gerrit-Change-Number: 40244 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: xua: Guard against osmo_fsm_inst_alloc() failures

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40244?usp=email ) Change subject: xua: Guard against osmo_fsm_inst_alloc() failures ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40244?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ie5bd59c62f07a2656ddf5235450b9fd354eab7e0 Gerrit-Change-Number: 40244 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-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 08 May 2025 09:14:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: sccp: Introduce DL-related cnlink rate counters

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40247?usp=email ) Change subject: sccp: Introduce DL-related cnlink rate counters ...................................................................... sccp: Introduce DL-related cnlink rate counters Change-Id: Ib4a87aec3d7bb01be833dd33c597a33d9bbad859 --- M include/osmocom/hnbgw/hnbgw_cn.h M src/osmo-hnbgw/hnbgw_cn.c M src/osmo-hnbgw/hnbgw_sccp.c 3 files changed, 37 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve diff --git a/include/osmocom/hnbgw/hnbgw_cn.h b/include/osmocom/hnbgw/hnbgw_cn.h index 8f7919f..6299cde 100644 --- a/include/osmocom/hnbgw/hnbgw_cn.h +++ b/include/osmocom/hnbgw/hnbgw_cn.h @@ -56,6 +56,13 @@ CNLINK_CTR_RANAP_TX_UDT_RESET, CNLINK_CTR_RANAP_TX_UDT_RESET_ACK, + /* SCCP Counters: */ + CNLINK_CTR_SCCP_N_UNITDATA_IND, + CNLINK_CTR_SCCP_N_CONNECT_CNF, + CNLINK_CTR_SCCP_N_DATA_IND, + CNLINK_CTR_SCCP_N_DISCONNECT_IND, + CNLINK_CTR_SCCP_N_PCSTATE_IND, + /* Counters related to link selection from a CN pool. */ CNLINK_CTR_CNPOOL_SUBSCR_NEW, CNLINK_CTR_CNPOOL_SUBSCR_REATTACH, diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index d0a11fd..dd560e3 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -461,6 +461,28 @@ "RANAP Unitdata RESET ACK messages transmitted", }, + /* SCCP Counters: */ + [CNLINK_CTR_SCCP_N_UNITDATA_IND] = { + "sccp:n_unit_data:ind", + "Received SCCP N-UNITDATA.ind (DL)" + }, + [CNLINK_CTR_SCCP_N_CONNECT_CNF] = { + "sccp:n_connect:cnf", + "Received SCCP N-CONNECT.cnf (DL SCCP CC)" + }, + [CNLINK_CTR_SCCP_N_DATA_IND] = { + "sccp:n_data:ind", + "Received SCCP N-DATA.ind (DL)" + }, + [CNLINK_CTR_SCCP_N_DISCONNECT_IND] = { + "sccp:n_disconnect:ind", + "Received SCCP N-DISCONNECT.ind (DL SCCP RLSD)" + }, + [CNLINK_CTR_SCCP_N_PCSTATE_IND] = { + "sccp:n_pcstate:ind", + "Received SCCP N-PCSTATE.ind" + }, + /* Indicators for CN pool usage */ [CNLINK_CTR_CNPOOL_SUBSCR_NEW] = { "cnpool:subscr:new", diff --git a/src/osmo-hnbgw/hnbgw_sccp.c b/src/osmo-hnbgw/hnbgw_sccp.c index ba02a5e..999ebde 100644 --- a/src/osmo-hnbgw/hnbgw_sccp.c +++ b/src/osmo-hnbgw/hnbgw_sccp.c @@ -100,6 +100,8 @@ if (!cnlink) return -ENOENT; + CNLINK_CTR_INC(cnlink, CNLINK_CTR_SCCP_N_UNITDATA_IND); + if (param->called_addr.ssn != OSMO_SCCP_SSN_RANAP) { LOGP(DCN, LOGL_NOTICE, "N-UNITDATA.ind for unknown SSN %u\n", param->called_addr.ssn); @@ -125,6 +127,8 @@ cnlink_sccp_addr_to_str(map->cnlink, &param->calling_addr), cnlink_sccp_addr_to_str(map->cnlink, &param->responding_addr)); + CNLINK_CTR_INC(map->cnlink, CNLINK_CTR_SCCP_N_CONNECT_CNF); + map_sccp_dispatch(map, MAP_SCCP_EV_RX_CONNECTION_CONFIRM, oph->msg); return 0; } @@ -158,6 +162,8 @@ cnlink_sccp_addr_to_str(map->cnlink, &param->responding_addr), osmo_sua_sccp_cause_name(param->cause, cause_buf, sizeof(cause_buf))); + CNLINK_CTR_INC(map->cnlink, CNLINK_CTR_SCCP_N_DISCONNECT_IND); + return map_sccp_dispatch(map, MAP_SCCP_EV_RX_RELEASED, oph->msg); } @@ -204,6 +210,8 @@ if (!cnlink) return; + CNLINK_CTR_INC(cnlink, CNLINK_CTR_SCCP_N_PCSTATE_IND); + /* See if this marks the point code to have become available, or to have been lost. * * I want to detect two events: -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40247?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ib4a87aec3d7bb01be833dd33c597a33d9bbad859 Gerrit-Change-Number: 40247 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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>

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: sccp: Introduce rate counter CNLINK_CTR_SCCP_RLSD_CN_ORIGIN

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40248?usp=email ) Change subject: sccp: Introduce rate counter CNLINK_CTR_SCCP_RLSD_CN_ORIGIN ...................................................................... sccp: Introduce rate counter CNLINK_CTR_SCCP_RLSD_CN_ORIGIN In the general usual case we expect the CN to orderly tear down the conn by sending a SCCP-DT[RANAP-Iu-ReleaseCommand], which HNB will answer with RUA-Disconnect[RANAP-Iu-ReleaseComplete], which will trigger a RLC HNBGW->CN and finally (in state WAIT_RLSD in context_map_sccp) we will receive a RLSD. The fact that the CN is unilaterally and directly tearing down the conn at SCCP level may be useful to spot malfunctions at the CN (eg. SCCP conn at CN timing out because it never answered the RANAP/DTAP on top, etc), so it's a good thing to count. Related: SYS#7454 Change-Id: Icc6d29192574536d3c954a06645f178fa66bff50 --- M include/osmocom/hnbgw/hnbgw_cn.h M src/osmo-hnbgw/context_map_sccp.c M src/osmo-hnbgw/hnbgw_cn.c 3 files changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/include/osmocom/hnbgw/hnbgw_cn.h b/include/osmocom/hnbgw/hnbgw_cn.h index 6299cde..917cc07 100644 --- a/include/osmocom/hnbgw/hnbgw_cn.h +++ b/include/osmocom/hnbgw/hnbgw_cn.h @@ -62,6 +62,7 @@ CNLINK_CTR_SCCP_N_DATA_IND, CNLINK_CTR_SCCP_N_DISCONNECT_IND, CNLINK_CTR_SCCP_N_PCSTATE_IND, + CNLINK_CTR_SCCP_RLSD_CN_ORIGIN, /* Counters related to link selection from a CN pool. */ CNLINK_CTR_CNPOOL_SUBSCR_NEW, diff --git a/src/osmo-hnbgw/context_map_sccp.c b/src/osmo-hnbgw/context_map_sccp.c index 987e410..f0bbe1b 100644 --- a/src/osmo-hnbgw/context_map_sccp.c +++ b/src/osmo-hnbgw/context_map_sccp.c @@ -211,6 +211,7 @@ static void map_sccp_init_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct msgb *ranap_msg = NULL; + struct hnbgw_context_map *map = fi->priv; switch (event) { @@ -238,6 +239,7 @@ case MAP_SCCP_EV_RX_RELEASED: /* SCCP RLSD received from CN. This will never happen since we haven't even asked for a connection, but * for completeness: */ + CNLINK_CTR_INC(map->cnlink, CNLINK_CTR_SCCP_RLSD_CN_ORIGIN); map_sccp_fsm_state_chg(MAP_SCCP_ST_DISCONNECTED); return; @@ -283,6 +285,7 @@ ranap_msg = data; /* SCCP RLSD received from CN. This will never happen since we haven't even received a Connection * Confirmed, but for completeness: */ + CNLINK_CTR_INC(map->cnlink, CNLINK_CTR_SCCP_RLSD_CN_ORIGIN); handle_rx_sccp(fi, ranap_msg); map_sccp_fsm_state_chg(MAP_SCCP_ST_DISCONNECTED); return; @@ -311,6 +314,7 @@ static void map_sccp_connected_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct hnbgw_context_map *map = fi->priv; struct msgb *ranap_msg = NULL; bool rua_disconnect_err_condition; @@ -361,6 +365,7 @@ case MAP_SCCP_EV_RX_RELEASED: ranap_msg = data; /* The CN sends an N-Disconnect (SCCP Released). */ + CNLINK_CTR_INC(map->cnlink, CNLINK_CTR_SCCP_RLSD_CN_ORIGIN); handle_rx_sccp(fi, ranap_msg); map_sccp_fsm_state_chg(MAP_SCCP_ST_DISCONNECTED); return; diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index dd560e3..8a7f88e 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -482,6 +482,10 @@ "sccp:n_pcstate:ind", "Received SCCP N-PCSTATE.ind" }, + [CNLINK_CTR_SCCP_RLSD_CN_ORIGIN] = { + "sccp:rlsd_cn_origin", + "Received unexpected SCCP RSLD originated unilaterally by CN" + }, /* Indicators for CN pool usage */ [CNLINK_CTR_CNPOOL_SUBSCR_NEW] = { -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40248?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Icc6d29192574536d3c954a06645f178fa66bff50 Gerrit-Change-Number: 40248 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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>

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: Fix lifecycle of struct hnbgw_sccp_user

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40246?usp=email ) Change subject: Fix lifecycle of struct hnbgw_sccp_user ...................................................................... Fix lifecycle of struct hnbgw_sccp_user There's one struct hnbgw_sccp_user per cs7 instance configured in the hnbgw process. Multiple cnlinks configured on the same cs7 instance will be referencing/using the same struct hnbgw_sccp_user pointer. Hence, it makes no sense to allocate the struct using a talloc context of a cnlink as a parent, nor to keep any kind of specific 1-1 reference to it. Instead, we need to keep it alive in a ref-count basis, and unbind it from libosmo-sigtran sccp SAP and destroy it once no more cnlinks use it. Change-Id: I524f6da8e5936135b2153def103d83cec6549f94 --- M include/osmocom/hnbgw/hnbgw_cn.h M include/osmocom/hnbgw/hnbgw_sccp.h M src/osmo-hnbgw/cnlink.c M src/osmo-hnbgw/hnbgw_cn.c M src/osmo-hnbgw/hnbgw_sccp.c 5 files changed, 110 insertions(+), 42 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve diff --git a/include/osmocom/hnbgw/hnbgw_cn.h b/include/osmocom/hnbgw/hnbgw_cn.h index 78b82b7..8f7919f 100644 --- a/include/osmocom/hnbgw/hnbgw_cn.h +++ b/include/osmocom/hnbgw/hnbgw_cn.h @@ -14,6 +14,7 @@ void hnbgw_cnpool_apply_cfg(struct hnbgw_cnpool *cnpool); void hnbgw_cnpool_cnlinks_start_or_restart(struct hnbgw_cnpool *cnpool); int hnbgw_cnlink_start_or_restart(struct hnbgw_cnlink *cnlink); +void hnbgw_cnlink_drop_sccp(struct hnbgw_cnlink *cnlink); char *cnlink_sccp_addr_to_str(struct hnbgw_cnlink *cnlink, const struct osmo_sccp_addr *addr); diff --git a/include/osmocom/hnbgw/hnbgw_sccp.h b/include/osmocom/hnbgw/hnbgw_sccp.h index 7cf67a5..fbb84f4 100644 --- a/include/osmocom/hnbgw/hnbgw_sccp.h +++ b/include/osmocom/hnbgw/hnbgw_sccp.h @@ -4,6 +4,7 @@ #include <osmocom/core/hashtable.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/prim.h> +#include <osmocom/core/use_count.h> #include <osmocom/sigtran/sccp_sap.h> @@ -27,6 +28,9 @@ /* osmo_sccp API state for above local address on above ss7 instance. */ struct osmo_sccp_user *sccp_user; + /* Ref count of users of this struct, ie.referencing it in cnlink->hnbgw_sccp_user */ + struct osmo_use_count use_count; + /* Fast access to the hnbgw_context_map responsible for a given SCCP conn_id of the ss7->sccp instance. * hlist_node: hnbgw_context_map->hnbgw_sccp_user_entry. */ DECLARE_HASHTABLE(hnbgw_context_map_by_conn_id, 6); @@ -35,4 +39,10 @@ #define LOG_HSU(HSU, SUBSYS, LEVEL, FMT, ARGS...) \ LOGP(SUBSYS, LEVEL, "(%s) " FMT, (HSU) ? (HSU)->name : "null", ##ARGS) -struct hnbgw_sccp_user *hnbgw_sccp_user_alloc(const struct hnbgw_cnlink *cnlink, int ss7_inst_id); +#define HSU_USE_CNLINK "cnlink" +#define hnbgw_sccp_user_get(hsu, use) \ + OSMO_ASSERT(osmo_use_count_get_put(&(hsu)->use_count, use, 1) == 0) +#define hnbgw_sccp_user_put(hsu, use) \ + OSMO_ASSERT(osmo_use_count_get_put(&(hsu)->use_count, use, -1) == 0) + +struct hnbgw_sccp_user *hnbgw_sccp_user_alloc(int ss7_inst_id); diff --git a/src/osmo-hnbgw/cnlink.c b/src/osmo-hnbgw/cnlink.c index fc67fd3..137012a 100644 --- a/src/osmo-hnbgw/cnlink.c +++ b/src/osmo-hnbgw/cnlink.c @@ -98,11 +98,28 @@ return cnlink; } +void hnbgw_cnlink_drop_sccp(struct hnbgw_cnlink *cnlink) +{ + struct hnbgw_context_map *map, *map2; + struct hnbgw_sccp_user *hsu; + + llist_for_each_entry_safe(map, map2, &cnlink->map_list, hnbgw_cnlink_entry) { + map_sccp_dispatch(map, MAP_SCCP_EV_USER_ABORT, NULL); + } + + OSMO_ASSERT(cnlink->hnbgw_sccp_user); + hsu = cnlink->hnbgw_sccp_user; + cnlink->hnbgw_sccp_user = NULL; + hnbgw_sccp_user_put(hsu, HSU_USE_CNLINK); +} + void cnlink_term_and_free(struct hnbgw_cnlink *cnlink) { if (!cnlink) return; osmo_fsm_inst_term(cnlink->fi, OSMO_FSM_TERM_REQUEST, NULL); + if (cnlink->hnbgw_sccp_user) + hnbgw_cnlink_drop_sccp(cnlink); talloc_free(cnlink); } diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 7b5c575..d0a11fd 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -134,17 +134,6 @@ return changed; } -static void hnbgw_cnlink_drop_sccp(struct hnbgw_cnlink *cnlink) -{ - struct hnbgw_context_map *map, *map2; - - llist_for_each_entry_safe(map, map2, &cnlink->map_list, hnbgw_cnlink_entry) { - map_sccp_dispatch(map, MAP_SCCP_EV_USER_ABORT, NULL); - } - - cnlink->hnbgw_sccp_user = NULL; -} - static void hnbgw_cnlink_log_self(struct hnbgw_cnlink *cnlink) { struct osmo_ss7_instance *ss7 = cnlink->hnbgw_sccp_user->ss7; @@ -210,9 +199,10 @@ llist_for_each_entry(hsu, &g_hnbgw->sccp.users, entry) { if (hsu->ss7 != ss7) continue; - cnlink->hnbgw_sccp_user = hsu; LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "using existing SCCP instance %s on cs7 instance %u\n", - hsu->name, osmo_ss7_instance_get_id(ss7)); + hsu->name, osmo_ss7_instance_get_id(ss7)); + cnlink->hnbgw_sccp_user = hsu; + hnbgw_sccp_user_get(cnlink->hnbgw_sccp_user, HSU_USE_CNLINK); hnbgw_cnlink_log_self(cnlink); return 0; } @@ -222,7 +212,8 @@ /* No SCCP instance yet for this ss7. Create it. If no address name is given that resolves to a * particular cs7 instance above, use 'cs7 instance 0'. */ - cnlink->hnbgw_sccp_user = hnbgw_sccp_user_alloc(cnlink, ss7 ? osmo_ss7_instance_get_id(ss7) : 0); + cnlink->hnbgw_sccp_user = hnbgw_sccp_user_alloc(ss7 ? osmo_ss7_instance_get_id(ss7) : 0); + hnbgw_sccp_user_get(cnlink->hnbgw_sccp_user, HSU_USE_CNLINK); hnbgw_cnlink_log_self(cnlink); return 0; } diff --git a/src/osmo-hnbgw/hnbgw_sccp.c b/src/osmo-hnbgw/hnbgw_sccp.c index 67e0a53..ba02a5e 100644 --- a/src/osmo-hnbgw/hnbgw_sccp.c +++ b/src/osmo-hnbgw/hnbgw_sccp.c @@ -332,18 +332,70 @@ return rc; } - -struct hnbgw_sccp_user *hnbgw_sccp_user_alloc(const struct hnbgw_cnlink *cnlink, int ss7_id) +static int hnbgw_sccp_user_use_cb(struct osmo_use_count_entry *e, int32_t old_use_count, const char *file, int line) { - struct osmo_ss7_instance *ss7 = NULL; + struct hnbgw_sccp_user *hsu = e->use_count->talloc_object; + int32_t total; + int level; + + if (!e->use) + return -EINVAL; + + total = osmo_use_count_total(&hsu->use_count); + + if (total == 0 + || (total == 1 && old_use_count == 0 && e->count == 1)) + level = LOGL_INFO; + else + level = LOGL_DEBUG; + + LOGPSRC(DCN, level, file, line, + "%s: %s %s: now used by %s\n", + hsu->name, + (e->count - old_use_count) > 0 ? "+" : "-", + e->use, + osmo_use_count_to_str_c(OTC_SELECT, &hsu->use_count)); + + if (e->count < 0) + return -ERANGE; + + if (total == 0) + talloc_free(hsu); + return 0; +} + +static int hnbgw_sccp_user_talloc_destructor(struct hnbgw_sccp_user *hsu) +{ + if (hsu->sccp_user) { + osmo_sccp_user_unbind(hsu->sccp_user); + hsu->sccp_user = NULL; + } + llist_del(&hsu->entry); + return 0; +} + +struct hnbgw_sccp_user *hnbgw_sccp_user_alloc(int ss7_id) +{ struct osmo_sccp_instance *sccp; - struct osmo_sccp_user *sccp_user; uint32_t local_pc; struct hnbgw_sccp_user *hsu; + hsu = talloc_zero(g_hnbgw, struct hnbgw_sccp_user); + OSMO_ASSERT(hsu); + *hsu = (struct hnbgw_sccp_user){ + .name = talloc_asprintf(hsu, "cs7-%u-sccp-OsmoHNBGW", ss7_id), + .use_count = { + .talloc_object = hsu, + .use_cb = hnbgw_sccp_user_use_cb, + }, + }; + hash_init(hsu->hnbgw_context_map_by_conn_id); + llist_add_tail(&hsu->entry, &g_hnbgw->sccp.users); + talloc_set_destructor(hsu, hnbgw_sccp_user_talloc_destructor); + sccp = osmo_sccp_simple_client_on_ss7_id(g_hnbgw, ss7_id, - cnlink->name, + hsu->name, DEFAULT_PC_HNBGW, OSMO_SS7_ASP_PROT_M3UA, 0, @@ -351,40 +403,37 @@ -1, "localhost"); if (!sccp) { - LOG_CNLINK(cnlink, DCN, LOGL_ERROR, "Failed to configure SCCP on 'cs7 instance %u'\n", - ss7_id); - return NULL; + LOG_HSU(hsu, DCN, LOGL_ERROR, "Failed to configure SCCP on 'cs7 instance %u'\n", + ss7_id); + goto free_hsu_ret; } - ss7 = osmo_sccp_get_ss7(sccp); - LOG_CNLINK(cnlink, DCN, LOGL_NOTICE, "created SCCP instance on cs7 instance %u\n", osmo_ss7_instance_get_id(ss7)); + hsu->ss7 = osmo_sccp_get_ss7(sccp); + LOG_HSU(hsu, DCN, LOGL_NOTICE, "created SCCP instance on cs7 instance %u\n", osmo_ss7_instance_get_id(hsu->ss7)); /* Bind the SCCP user, using the cs7 instance's default point-code if one is configured, or osmo-hnbgw's default * local PC. */ - local_pc = osmo_ss7_instance_get_primary_pc(ss7); + local_pc = osmo_ss7_instance_get_primary_pc(hsu->ss7); if (!osmo_ss7_pc_is_valid(local_pc)) local_pc = DEFAULT_PC_HNBGW; - LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "binding OsmoHNBGW user to cs7 instance %u, local PC %u = %s\n", - osmo_ss7_instance_get_id(ss7), local_pc, osmo_ss7_pointcode_print(ss7, local_pc)); + LOG_HSU(hsu, DCN, LOGL_DEBUG, "binding OsmoHNBGW user to cs7 instance %u, local PC %u = %s\n", + osmo_ss7_instance_get_id(hsu->ss7), local_pc, osmo_ss7_pointcode_print(hsu->ss7, local_pc)); - sccp_user = osmo_sccp_user_bind_pc(sccp, "OsmoHNBGW", sccp_sap_up, OSMO_SCCP_SSN_RANAP, local_pc); - if (!sccp_user) { - LOGP(DCN, LOGL_ERROR, "Failed to init SCCP User\n"); - return NULL; + char *sccp_user_name = talloc_asprintf(hsu, "%s-RANAP", hsu->name); + hsu->sccp_user = osmo_sccp_user_bind_pc(sccp, sccp_user_name, sccp_sap_up, OSMO_SCCP_SSN_RANAP, local_pc); + talloc_free(sccp_user_name); + if (!hsu->sccp_user) { + LOG_HSU(hsu, DCN, LOGL_ERROR, "Failed to init SCCP User\n"); + goto free_hsu_ret; } - hsu = talloc_zero(cnlink, struct hnbgw_sccp_user); - *hsu = (struct hnbgw_sccp_user){ - .name = talloc_asprintf(hsu, "cs7-%u.sccp", osmo_ss7_instance_get_id(ss7)), - .ss7 = ss7, - .sccp_user = sccp_user, - }; osmo_sccp_make_addr_pc_ssn(&hsu->local_addr, local_pc, OSMO_SCCP_SSN_RANAP); - hash_init(hsu->hnbgw_context_map_by_conn_id); - osmo_sccp_user_set_priv(sccp_user, hsu); - - llist_add_tail(&hsu->entry, &g_hnbgw->sccp.users); + osmo_sccp_user_set_priv(hsu->sccp_user, hsu); return hsu; + +free_hsu_ret: + talloc_free(hsu); + return NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40246?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I524f6da8e5936135b2153def103d83cec6549f94 Gerrit-Change-Number: 40246 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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>

1 month, 2 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: sccp: Unify path submitting N-*.req

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40251?usp=email ) Change subject: sccp: Unify path submitting N-*.req ...................................................................... sccp: Unify path submitting N-*.req This allows having clearer code paths and adding rate counters. Change-Id: I37b414cf769a16b7c7f596df3bb91a6a91a06298 --- M include/osmocom/hnbgw/hnbgw_sccp.h M src/osmo-hnbgw/cnlink.c M src/osmo-hnbgw/context_map_sccp.c M src/osmo-hnbgw/hnbgw_sccp.c 4 files changed, 113 insertions(+), 35 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/include/osmocom/hnbgw/hnbgw_sccp.h b/include/osmocom/hnbgw/hnbgw_sccp.h index fbb84f4..d207348 100644 --- a/include/osmocom/hnbgw/hnbgw_sccp.h +++ b/include/osmocom/hnbgw/hnbgw_sccp.h @@ -1,9 +1,12 @@ /* SCCP, ITU Q.711 - Q.714 */ #pragma once +#include <stdint.h> + #include <osmocom/core/hashtable.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/prim.h> +#include <osmocom/core/msgb.h> #include <osmocom/core/use_count.h> #include <osmocom/sigtran/sccp_sap.h> @@ -46,3 +49,11 @@ OSMO_ASSERT(osmo_use_count_get_put(&(hsu)->use_count, use, -1) == 0) struct hnbgw_sccp_user *hnbgw_sccp_user_alloc(int ss7_inst_id); + +int hnbgw_sccp_user_tx_unitdata_req(struct hnbgw_sccp_user *hsu, const struct osmo_sccp_addr *called_addr, + struct msgb *ranap_msg); +int hnbgw_sccp_user_tx_connect_req(struct hnbgw_sccp_user *hsu, const struct osmo_sccp_addr *called_addr, + uint32_t scu_conn_id, struct msgb *ranap_msg); +int hnbgw_sccp_user_tx_data_req(struct hnbgw_sccp_user *hsu, uint32_t scu_conn_id, + struct msgb *ranap_msg); +int hnbgw_sccp_user_tx_disconnect_req(struct hnbgw_sccp_user *hsu, uint32_t scu_conn_id); diff --git a/src/osmo-hnbgw/cnlink.c b/src/osmo-hnbgw/cnlink.c index 137012a..477bd68 100644 --- a/src/osmo-hnbgw/cnlink.c +++ b/src/osmo-hnbgw/cnlink.c @@ -138,6 +138,13 @@ context_map_cnlink_lost(map); } +static int hnbgw_cnlink_tx_sccp_unitdata_req(struct hnbgw_cnlink *cnlink, struct msgb *msg) +{ + return hnbgw_sccp_user_tx_unitdata_req(cnlink->hnbgw_sccp_user, + &cnlink->remote_addr, + msg); +} + static void tx_reset(struct hnbgw_cnlink *cnlink) { struct msgb *msg; @@ -192,10 +199,7 @@ msg = ranap_new_msg_reset2(cnlink->pool->domain, &cause, use_grnc_id); CNLINK_CTR_INC(cnlink, CNLINK_CTR_RANAP_TX_UDT_RESET); - osmo_sccp_tx_unitdata_msg(cnlink->hnbgw_sccp_user->sccp_user, - &cnlink->hnbgw_sccp_user->local_addr, - &cnlink->remote_addr, - msg); + hnbgw_cnlink_tx_sccp_unitdata_req(cnlink, msg); } static void tx_reset_ack(struct hnbgw_cnlink *cnlink) @@ -243,10 +247,7 @@ msg = ranap_new_msg_reset_ack(cnlink->pool->domain, use_grnc_id); CNLINK_CTR_INC(cnlink, CNLINK_CTR_RANAP_TX_UDT_RESET_ACK); - osmo_sccp_tx_unitdata_msg(cnlink->hnbgw_sccp_user->sccp_user, - &cnlink->hnbgw_sccp_user->local_addr, - &cnlink->remote_addr, - msg); + hnbgw_cnlink_tx_sccp_unitdata_req(cnlink, msg); } static void cnlink_disc_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) diff --git a/src/osmo-hnbgw/context_map_sccp.c b/src/osmo-hnbgw/context_map_sccp.c index f0bbe1b..3c97789 100644 --- a/src/osmo-hnbgw/context_map_sccp.c +++ b/src/osmo-hnbgw/context_map_sccp.c @@ -117,10 +117,8 @@ static int tx_sccp_cr(struct osmo_fsm_inst *fi, struct msgb *ranap_msg) { struct hnbgw_context_map *map = fi->priv; - struct osmo_scu_prim *prim; - int rc; - if (!map->cnlink || !map->cnlink->hnbgw_sccp_user) { + if (!map->cnlink) { LOGPFSML(fi, LOGL_ERROR, "Failed to send SCCP Connection Request: no CN link\n"); return -1; } @@ -130,53 +128,40 @@ ranap_msg = hnbgw_ranap_msg_alloc("SCCP-CR-empty"); } - prim = (struct osmo_scu_prim *)msgb_push(ranap_msg, sizeof(*prim)); - osmo_prim_init(&prim->oph, SCCP_SAP_USER, OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_REQUEST, ranap_msg); - prim->u.connect.called_addr = map->cnlink->remote_addr; - prim->u.connect.calling_addr = map->cnlink->hnbgw_sccp_user->local_addr; - prim->u.connect.sccp_class = 2; - prim->u.connect.conn_id = map->scu_conn_id; - - rc = osmo_sccp_user_sap_down_nofree(map->cnlink->hnbgw_sccp_user->sccp_user, &prim->oph); - if (rc) - LOGPFSML(fi, LOGL_ERROR, "Failed to send SCCP Connection Request to CN\n"); - return rc; + return hnbgw_sccp_user_tx_connect_req(map->cnlink->hnbgw_sccp_user, + &map->cnlink->remote_addr, + map->scu_conn_id, + ranap_msg); } static int tx_sccp_df1(struct osmo_fsm_inst *fi, struct msgb *ranap_msg) { struct hnbgw_context_map *map = fi->priv; - struct osmo_scu_prim *prim; - int rc; if (!msg_has_l2_data(ranap_msg)) return 0; - if (!map->cnlink || !map->cnlink->hnbgw_sccp_user) { + if (!map->cnlink) { LOGPFSML(fi, LOGL_ERROR, "Failed to send SCCP Data Form 1: no CN link\n"); return -1; } - prim = (struct osmo_scu_prim *)msgb_push(ranap_msg, sizeof(*prim)); - osmo_prim_init(&prim->oph, SCCP_SAP_USER, OSMO_SCU_PRIM_N_DATA, PRIM_OP_REQUEST, ranap_msg); - prim->u.data.conn_id = map->scu_conn_id; - - rc = osmo_sccp_user_sap_down_nofree(map->cnlink->hnbgw_sccp_user->sccp_user, &prim->oph); - if (rc) - LOGPFSML(fi, LOGL_ERROR, "Failed to send SCCP Data Form 1 to CN\n"); - return rc; + return hnbgw_sccp_user_tx_data_req(map->cnlink->hnbgw_sccp_user, + map->scu_conn_id, + ranap_msg); } static int tx_sccp_rlsd(struct osmo_fsm_inst *fi) { struct hnbgw_context_map *map = fi->priv; - if (!map->cnlink || !map->cnlink->hnbgw_sccp_user) { + if (!map->cnlink) { LOGPFSML(fi, LOGL_ERROR, "Failed to send SCCP RLSD: no CN link\n"); return -1; } - return osmo_sccp_tx_disconn(map->cnlink->hnbgw_sccp_user->sccp_user, map->scu_conn_id, NULL, 0); + return hnbgw_sccp_user_tx_disconnect_req(map->cnlink->hnbgw_sccp_user, + map->scu_conn_id); } static int handle_rx_sccp(struct osmo_fsm_inst *fi, struct msgb *ranap_msg) diff --git a/src/osmo-hnbgw/hnbgw_sccp.c b/src/osmo-hnbgw/hnbgw_sccp.c index 999ebde..4699b2f 100644 --- a/src/osmo-hnbgw/hnbgw_sccp.c +++ b/src/osmo-hnbgw/hnbgw_sccp.c @@ -340,6 +340,87 @@ return rc; } +/*********************************************************************** + * Submit primitives to SCCP User SAP + ***********************************************************************/ + +int hnbgw_sccp_user_tx_unitdata_req(struct hnbgw_sccp_user *hsu, const struct osmo_sccp_addr *called_addr, struct msgb *ranap_msg) +{ + if (!hsu) { + LOGP(DCN, LOGL_ERROR, "Failed to send SCCP N-UNITDATA.req: no SCCP User\n"); + return -1; + } + OSMO_ASSERT(called_addr); + return osmo_sccp_tx_unitdata_msg(hsu->sccp_user, + &hsu->local_addr, + called_addr, + ranap_msg); +} + +int hnbgw_sccp_user_tx_connect_req(struct hnbgw_sccp_user *hsu, const struct osmo_sccp_addr *called_addr, uint32_t scu_conn_id, struct msgb *ranap_msg) +{ + struct osmo_scu_prim *prim; + int rc; + + if (!hsu) { + LOGP(DCN, LOGL_ERROR, "Failed to send SCCP N-CONNECT.req(%u): no SCCP User\n", scu_conn_id); + return -1; + } + + OSMO_ASSERT(called_addr); + + prim = (struct osmo_scu_prim *)msgb_push(ranap_msg, sizeof(*prim)); + osmo_prim_init(&prim->oph, SCCP_SAP_USER, OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_REQUEST, ranap_msg); + prim->u.connect.called_addr = *called_addr; + prim->u.connect.calling_addr = hsu->local_addr; + prim->u.connect.sccp_class = 2; + prim->u.connect.conn_id = scu_conn_id; + + rc = osmo_sccp_user_sap_down_nofree(hsu->sccp_user, &prim->oph); + if (rc) + LOG_HSU(hsu, DCN, LOGL_ERROR, "Failed to send SCCP Connection Request to CN\n"); + return rc; +} + +int hnbgw_sccp_user_tx_data_req(struct hnbgw_sccp_user *hsu, uint32_t scu_conn_id, struct msgb *ranap_msg) +{ + struct osmo_scu_prim *prim; + int rc; + + if (!hsu) { + LOGP(DCN, LOGL_ERROR, "Failed to send SCCP N-DATA.req(%u): no SCCP User\n", scu_conn_id); + return -1; + } + + prim = (struct osmo_scu_prim *)msgb_push(ranap_msg, sizeof(*prim)); + osmo_prim_init(&prim->oph, SCCP_SAP_USER, OSMO_SCU_PRIM_N_DATA, PRIM_OP_REQUEST, ranap_msg); + prim->u.data.conn_id = scu_conn_id; + + rc = osmo_sccp_user_sap_down_nofree(hsu->sccp_user, &prim->oph); + if (rc) + LOG_HSU(hsu, DCN, LOGL_ERROR, "Failed to send SCCP N-DATA.req(%u)\n", scu_conn_id); + return rc; +} + +int hnbgw_sccp_user_tx_disconnect_req(struct hnbgw_sccp_user *hsu, uint32_t scu_conn_id) +{ + int rc; + + if (!hsu) { + LOGP(DCN, LOGL_ERROR, "Failed to send SCCP N-DISCONNECT.req(%u): no SCCP User\n", scu_conn_id); + return -1; + } + + rc = osmo_sccp_tx_disconn(hsu->sccp_user, scu_conn_id, NULL, 0); + if (rc) + LOG_HSU(hsu, DCN, LOGL_ERROR, "Failed to send SCCP N-DISCONNECT.req(%u)\n", scu_conn_id); + return rc; +} + +/*********************************************************************** + * struct hnbgw_sccp_user lifecycle: + ***********************************************************************/ + static int hnbgw_sccp_user_use_cb(struct osmo_use_count_entry *e, int32_t old_use_count, const char *file, int line) { struct hnbgw_sccp_user *hsu = e->use_count->talloc_object; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40251?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I37b414cf769a16b7c7f596df3bb91a6a91a06298 Gerrit-Change-Number: 40251 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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>

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: sccp: Introduce UL-related cnlink rate counters

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/40252?usp=email ) Change subject: sccp: Introduce UL-related cnlink rate counters ...................................................................... sccp: Introduce UL-related cnlink rate counters Change-Id: I1878fcc8c265dc4d457332e16556d3ece769ea3e --- M include/osmocom/hnbgw/hnbgw_cn.h M src/osmo-hnbgw/cnlink.c M src/osmo-hnbgw/context_map_sccp.c M src/osmo-hnbgw/hnbgw_cn.c 4 files changed, 24 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/include/osmocom/hnbgw/hnbgw_cn.h b/include/osmocom/hnbgw/hnbgw_cn.h index 917cc07..fc33e5b 100644 --- a/include/osmocom/hnbgw/hnbgw_cn.h +++ b/include/osmocom/hnbgw/hnbgw_cn.h @@ -57,9 +57,13 @@ CNLINK_CTR_RANAP_TX_UDT_RESET_ACK, /* SCCP Counters: */ + CNLINK_CTR_SCCP_N_UNITDATA_REQ, CNLINK_CTR_SCCP_N_UNITDATA_IND, + CNLINK_CTR_SCCP_N_CONNECT_REQ, CNLINK_CTR_SCCP_N_CONNECT_CNF, + CNLINK_CTR_SCCP_N_DATA_REQ, CNLINK_CTR_SCCP_N_DATA_IND, + CNLINK_CTR_SCCP_N_DISCONNECT_REQ, CNLINK_CTR_SCCP_N_DISCONNECT_IND, CNLINK_CTR_SCCP_N_PCSTATE_IND, CNLINK_CTR_SCCP_RLSD_CN_ORIGIN, diff --git a/src/osmo-hnbgw/cnlink.c b/src/osmo-hnbgw/cnlink.c index 477bd68..46f53d7 100644 --- a/src/osmo-hnbgw/cnlink.c +++ b/src/osmo-hnbgw/cnlink.c @@ -140,6 +140,7 @@ static int hnbgw_cnlink_tx_sccp_unitdata_req(struct hnbgw_cnlink *cnlink, struct msgb *msg) { + CNLINK_CTR_INC(cnlink, CNLINK_CTR_SCCP_N_UNITDATA_REQ); return hnbgw_sccp_user_tx_unitdata_req(cnlink->hnbgw_sccp_user, &cnlink->remote_addr, msg); diff --git a/src/osmo-hnbgw/context_map_sccp.c b/src/osmo-hnbgw/context_map_sccp.c index 3c97789..5b5e77f 100644 --- a/src/osmo-hnbgw/context_map_sccp.c +++ b/src/osmo-hnbgw/context_map_sccp.c @@ -128,6 +128,7 @@ ranap_msg = hnbgw_ranap_msg_alloc("SCCP-CR-empty"); } + CNLINK_CTR_INC(map->cnlink, CNLINK_CTR_SCCP_N_CONNECT_REQ); return hnbgw_sccp_user_tx_connect_req(map->cnlink->hnbgw_sccp_user, &map->cnlink->remote_addr, map->scu_conn_id, @@ -146,6 +147,7 @@ return -1; } + CNLINK_CTR_INC(map->cnlink, CNLINK_CTR_SCCP_N_DATA_REQ); return hnbgw_sccp_user_tx_data_req(map->cnlink->hnbgw_sccp_user, map->scu_conn_id, ranap_msg); @@ -160,6 +162,7 @@ return -1; } + CNLINK_CTR_INC(map->cnlink, CNLINK_CTR_SCCP_N_DISCONNECT_REQ); return hnbgw_sccp_user_tx_disconnect_req(map->cnlink->hnbgw_sccp_user, map->scu_conn_id); } diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index 8a7f88e..121c77f 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -462,18 +462,34 @@ }, /* SCCP Counters: */ + [CNLINK_CTR_SCCP_N_UNITDATA_REQ] = { + "sccp:n_unit_data:req", + "Submit SCCP N-UNITDATA.req (UL)" + }, [CNLINK_CTR_SCCP_N_UNITDATA_IND] = { "sccp:n_unit_data:ind", "Received SCCP N-UNITDATA.ind (DL)" }, + [CNLINK_CTR_SCCP_N_CONNECT_REQ] = { + "sccp:n_connect:req", + "Submit SCCP N-CONNECT.req (UL SCCP CR)" + }, [CNLINK_CTR_SCCP_N_CONNECT_CNF] = { "sccp:n_connect:cnf", "Received SCCP N-CONNECT.cnf (DL SCCP CC)" }, + [CNLINK_CTR_SCCP_N_DATA_REQ] = { + "sccp:n_data:req", + "SUBMIT SCCP N-DATA.req (UL)" + }, [CNLINK_CTR_SCCP_N_DATA_IND] = { "sccp:n_data:ind", "Received SCCP N-DATA.ind (DL)" }, + [CNLINK_CTR_SCCP_N_DISCONNECT_REQ] = { + "sccp:n_disconnect:req", + "Submit SCCP N-DISCONNECT.req (UL SCCP RLC)" + }, [CNLINK_CTR_SCCP_N_DISCONNECT_IND] = { "sccp:n_disconnect:ind", "Received SCCP N-DISCONNECT.ind (DL SCCP RLSD)" -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/40252?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1878fcc8c265dc4d457332e16556d3ece769ea3e Gerrit-Change-Number: 40252 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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>

1 month, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2025