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

[S] Change in libosmo-sigtran[master]: Add per ss7 instance rate_ctr_group
by pespin 12 Nov '25

12 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41407?usp=email ) Change subject: Add per ss7 instance rate_ctr_group ...................................................................... Add per ss7 instance rate_ctr_group Change-Id: Id916307c2465daab3072f850774240969fae3f6e --- M src/ss7_asp.c M src/ss7_instance.c M src/ss7_instance.h 3 files changed, 38 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/07/41407/1 diff --git a/src/ss7_asp.c b/src/ss7_asp.c index f3476ea..976e54a 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -1051,6 +1051,7 @@ } msg->dst = asp; + rate_ctr_inc2(asp->inst->ctrg, SS7_INST_CTR_PKT_RX_TOTAL); rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); rc = ipa_rx_msg(asp, msg, asp->ipa.sls); msgb_free(msg); @@ -1131,6 +1132,7 @@ } msg->dst = asp; + rate_ctr_inc2(asp->inst->ctrg, SS7_INST_CTR_PKT_RX_TOTAL); rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); rc = xua_rx_msg(asp, msg); msgb_free(msg); @@ -1176,6 +1178,7 @@ } msg->dst = asp; + rate_ctr_inc2(asp->inst->ctrg, SS7_INST_CTR_PKT_RX_TOTAL); rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); rc = m3ua_tcp_rx_msg(asp, msg); msgb_free(msg); @@ -1266,6 +1269,7 @@ } msg->dst = asp; + rate_ctr_inc2(asp->inst->ctrg, SS7_INST_CTR_PKT_RX_TOTAL); rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); rc = ipa_rx_msg(asp, msg, asp->ipa.sls); msgb_free(msg); @@ -1287,6 +1291,7 @@ } msg->dst = asp; + rate_ctr_inc2(asp->inst->ctrg, SS7_INST_CTR_PKT_RX_TOTAL); rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); rc = m3ua_tcp_rx_msg(asp, msg); out: @@ -1331,6 +1336,7 @@ } msg->dst = asp; + rate_ctr_inc2(asp->inst->ctrg, SS7_INST_CTR_PKT_RX_TOTAL); rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); rc = xua_rx_msg(asp, msg); out: @@ -1390,6 +1396,7 @@ OSMO_ASSERT(0); } + rate_ctr_inc2(asp->inst->ctrg, SS7_INST_CTR_PKT_TX_TOTAL); rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_TX_TOTAL); LOGPASP(asp, DLSS7, LOGL_DEBUG, "Tx %d bytes: %s\n", msg->len, msgb_hexdump(msg)); @@ -1438,6 +1445,7 @@ int ss7_asp_rx_unknown(struct osmo_ss7_asp *asp, int ppid_mux, struct msgb *msg) { + rate_ctr_inc2(asp->inst->ctrg, SS7_INST_CTR_PKT_RX_UNKNOWN); rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_UNKNOWN); if (g_osmo_ss7_asp_rx_unknown_cb) diff --git a/src/ss7_instance.c b/src/ss7_instance.c index b583b98..b166e8a 100644 --- a/src/ss7_instance.c +++ b/src/ss7_instance.c @@ -49,6 +49,19 @@ .component_len = { 3, 8, 3}, }; +static const struct rate_ctr_desc ss7_inst_rcd[] = { + [SS7_INST_CTR_PKT_RX_TOTAL] = { "rx:packets:total", "Total number of packets received" }, + [SS7_INST_CTR_PKT_RX_UNKNOWN] = { "rx:packets:unknown", "Number of packets received for unknown PPID" }, + [SS7_INST_CTR_PKT_TX_TOTAL] = { "tx:packets:total", "Total number of packets transmitted" }, +}; + +static const struct rate_ctr_group_desc ss7_inst_rcgd = { + .group_name_prefix = "s7i", + .group_description = "SS7 Instance", + .num_ctr = ARRAY_SIZE(ss7_inst_rcd), + .ctr_desc = ss7_inst_rcd, +}; + struct osmo_ss7_instance * ss7_instance_alloc(void *ctx, uint32_t id) { @@ -64,11 +77,18 @@ inst->cfg.id = id; LOGSS7(inst, LOGL_INFO, "Creating SS7 Instance\n"); + INIT_LLIST_HEAD(&inst->cfg.sccp_address_book); INIT_LLIST_HEAD(&inst->linksets); INIT_LLIST_HEAD(&inst->as_list); INIT_LLIST_HEAD(&inst->asp_list); INIT_LLIST_HEAD(&inst->rtable_list); INIT_LLIST_HEAD(&inst->xua_servers); + + inst->ctrg = rate_ctr_group_alloc(inst, &ss7_inst_rcgd, id); + if (!inst->ctrg) { + talloc_free(inst); + return NULL; + } inst->rtable_system = ss7_route_table_find_or_create(inst, "system"); /* default point code structure + formatting */ @@ -79,8 +99,6 @@ llist_add_tail(&inst->list, &osmo_ss7_instances); - INIT_LLIST_HEAD(&inst->cfg.sccp_address_book); - return inst; } @@ -105,6 +123,7 @@ llist_for_each_entry_safe(lset, lset2, &inst->linksets, list) ss7_linkset_destroy(lset); + rate_ctr_group_free(inst->ctrg); llist_del(&inst->list); talloc_free(inst); } diff --git a/src/ss7_instance.h b/src/ss7_instance.h index bb8815b..5c76b46 100644 --- a/src/ss7_instance.h +++ b/src/ss7_instance.h @@ -3,6 +3,7 @@ #include <stdint.h> #include <stdbool.h> #include <osmocom/core/linuxlist.h> +#include <osmocom/core/rate_ctr.h> /*********************************************************************** * SS7 Instances @@ -13,6 +14,12 @@ struct osmo_ss7_route_label; struct osmo_sccp_instance; +enum ss7_instance_ctr { + SS7_INST_CTR_PKT_RX_TOTAL, + SS7_INST_CTR_PKT_RX_UNKNOWN, + SS7_INST_CTR_PKT_TX_TOTAL, +}; + struct osmo_ss7_pc_fmt { char delimiter; uint8_t component_len[3]; @@ -39,6 +46,8 @@ struct osmo_sccp_instance *sccp; + struct rate_ctr_group *ctrg; + struct { uint32_t id; char *name; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41407?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Id916307c2465daab3072f850774240969fae3f6e Gerrit-Change-Number: 41407 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: xua_rx_msg: fill xua->mtp.sio with configured network indicator
by pespin 12 Nov '25

12 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41405?usp=email ) Change subject: xua_rx_msg: fill xua->mtp.sio with configured network indicator ...................................................................... xua_rx_msg: fill xua->mtp.sio with configured network indicator Change-Id: I12b2debd62820e917a324da2b15cfb88eebc1bd1 --- M src/sua.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/05/41405/1 diff --git a/src/sua.c b/src/sua.c index 448bdee..e157f31 100644 --- a/src/sua.c +++ b/src/sua.c @@ -717,7 +717,7 @@ xua->mtp.opc = ; xua->mtp.dpc = ; #endif - xua->mtp.sio = MTP_SI_SCCP; + xua->mtp.sio = MTP_SIO(MTP_SI_SCCP, asp->inst->cfg.network_indicator); LOGPASP(asp, DLSUA, LOGL_DEBUG, "Received SUA Message (%s)\n", xua_hdr_dump(xua, &xua_dialect_sua)); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41405?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I12b2debd62820e917a324da2b15cfb88eebc1bd1 Gerrit-Change-Number: 41405 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: m3ua: Drop rx packets with unexpected Network Indicator
by pespin 12 Nov '25

12 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41408?usp=email ) Change subject: m3ua: Drop rx packets with unexpected Network Indicator ...................................................................... m3ua: Drop rx packets with unexpected Network Indicator Change-Id: I54de65b16949851062914ca5d3362d1e46158b8b --- M src/m3ua.c M src/ss7_asp.c M src/ss7_asp.h M src/ss7_instance.c M src/ss7_instance.h 5 files changed, 28 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/08/41408/1 diff --git a/src/m3ua.c b/src/m3ua.c index 8c30775..f5030d0 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -590,6 +590,7 @@ /* This function takes ownership of xua msg passed to it. */ static int m3ua_rx_xfer(struct osmo_ss7_asp *asp, struct xua_msg *xua) { + struct xua_msg_part *data_ie = xua_msg_find_tag(xua, M3UA_IEI_PROT_DATA); struct xua_msg_part *na_ie = xua_msg_find_tag(xua, M3UA_IEI_NET_APPEAR); struct xua_msg_part *rctx_ie = xua_msg_find_tag(xua, M3UA_IEI_ROUTE_CTX); struct m3ua_data_hdr *dh; @@ -621,6 +622,29 @@ goto ret_free; } + /* store the MTP-level information in the xua_msg for use by + * higher layer protocols */ + OSMO_ASSERT(data_ie); + dh = (struct m3ua_data_hdr *) data_ie->dat; + OSMO_ASSERT(dh); + m3ua_dh_to_xfer_param(&xua->mtp, dh); + LOGPASP(asp, DLM3UA, LOGL_DEBUG, + "%s(): M3UA data header: opc=%u=%s dpc=%u=%s sls=%u\n", + __func__, xua->mtp.opc, osmo_ss7_pointcode_print(asp->inst, xua->mtp.opc), + xua->mtp.dpc, osmo_ss7_pointcode_print2(asp->inst, xua->mtp.dpc), + xua->mtp.sls); + + /* Drop packets not matching our configured Network Indicator: */ + if (dh->ni != asp->inst->cfg.network_indicator) { + LOGPASP(asp, DLM3UA, LOGL_NOTICE, + "Discarding received XUA Message %s: NI=%u not matching ss7 instance configured NI=%u\n", + xua_hdr_dump(xua, &xua_dialect_sua), dh->ni, asp->inst->cfg.network_indicator); + rate_ctr_inc2(asp->inst->ctrg, SS7_INST_CTR_PKT_RX_NI_MISMATCH); + rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_NI_MISMATCH); + rc = M3UA_ERR_UNEXPECTED_MSG; + goto ret_free; + } + rc = xua_find_as_for_asp(&as, asp, rctx_ie); if (rc) goto ret_free; @@ -633,17 +657,6 @@ } rate_ctr_inc2(as->ctrg, SS7_AS_CTR_RX_MSU_TOTAL); - - /* store the MTP-level information in the xua_msg for use by - * higher layer protocols */ - dh = data_hdr_from_m3ua(xua); - OSMO_ASSERT(dh); - m3ua_dh_to_xfer_param(&xua->mtp, dh); - LOGPASP(asp, DLM3UA, LOGL_DEBUG, - "%s(): M3UA data header: opc=%u=%s dpc=%u=%s sls=%u\n", - __func__, xua->mtp.opc, osmo_ss7_pointcode_print(asp->inst, xua->mtp.opc), - xua->mtp.dpc, osmo_ss7_pointcode_print2(asp->inst, xua->mtp.dpc), - xua->mtp.sls); OSMO_ASSERT(xua->mtp.sls <= 0xf); rate_ctr_inc2(as->ctrg, SS7_AS_CTR_RX_MSU_SLS_0 + xua->mtp.sls); diff --git a/src/ss7_asp.c b/src/ss7_asp.c index 976e54a..644c192 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -216,6 +216,7 @@ static const struct rate_ctr_desc ss7_asp_rcd[] = { [SS7_ASP_CTR_PKT_RX_TOTAL] = { "rx:packets:total", "Total number of packets received" }, [SS7_ASP_CTR_PKT_RX_UNKNOWN] = { "rx:packets:unknown", "Number of packets received for unknown PPID" }, + [SS7_ASP_CTR_PKT_RX_NI_MISMATCH] = { "rx:packets:ni_mismatch", "Number of packets received and dropped due to Network Indicator mismatch" }, [SS7_ASP_CTR_PKT_TX_TOTAL] = { "tx:packets:total", "Total number of packets transmitted" }, }; diff --git a/src/ss7_asp.h b/src/ss7_asp.h index e25c85c..62378a3 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -36,6 +36,7 @@ enum ss7_asp_ctr { SS7_ASP_CTR_PKT_RX_TOTAL, SS7_ASP_CTR_PKT_RX_UNKNOWN, + SS7_ASP_CTR_PKT_RX_NI_MISMATCH, SS7_ASP_CTR_PKT_TX_TOTAL, }; diff --git a/src/ss7_instance.c b/src/ss7_instance.c index b166e8a..7a9509e 100644 --- a/src/ss7_instance.c +++ b/src/ss7_instance.c @@ -52,6 +52,7 @@ static const struct rate_ctr_desc ss7_inst_rcd[] = { [SS7_INST_CTR_PKT_RX_TOTAL] = { "rx:packets:total", "Total number of packets received" }, [SS7_INST_CTR_PKT_RX_UNKNOWN] = { "rx:packets:unknown", "Number of packets received for unknown PPID" }, + [SS7_INST_CTR_PKT_RX_NI_MISMATCH] = { "rx:packets:ni_mismatch", "Number of packets received and dropped due to Network Indicator mismatch" }, [SS7_INST_CTR_PKT_TX_TOTAL] = { "tx:packets:total", "Total number of packets transmitted" }, }; diff --git a/src/ss7_instance.h b/src/ss7_instance.h index 5c76b46..eb444f1 100644 --- a/src/ss7_instance.h +++ b/src/ss7_instance.h @@ -17,6 +17,7 @@ enum ss7_instance_ctr { SS7_INST_CTR_PKT_RX_TOTAL, SS7_INST_CTR_PKT_RX_UNKNOWN, + SS7_INST_CTR_PKT_RX_NI_MISMATCH, SS7_INST_CTR_PKT_TX_TOTAL, }; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41408?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I54de65b16949851062914ca5d3362d1e46158b8b Gerrit-Change-Number: 41408 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: vty: Always write network-indicator
by pespin 12 Nov '25

12 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41403?usp=email ) Change subject: vty: Always write network-indicator ...................................................................... vty: Always write network-indicator Network-indicator is an important configuration defining the network, hence it should always be printed during vty show/write. Change-Id: I969ee94c00afa7a77e26c8cf3e9b998b06022641 --- M src/ss7_vty.c 1 file changed, 3 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/03/41403/1 diff --git a/src/ss7_vty.c b/src/ss7_vty.c index cfc658d..98c6073 100644 --- a/src/ss7_vty.c +++ b/src/ss7_vty.c @@ -1286,11 +1286,9 @@ vty_out(vty, "cs7 instance %u%s", inst->cfg.id, VTY_NEWLINE); if (inst->cfg.description) vty_out(vty, " description %s%s", inst->cfg.description, VTY_NEWLINE); - if (inst->cfg.network_indicator != MTP_NI_INTERNATIONAL) - vty_out(vty, " network-indicator %s%s", - get_value_string(mtp_network_indicator_vals, - inst->cfg.network_indicator), - VTY_NEWLINE); + vty_out(vty, " network-indicator %s%s", + get_value_string(mtp_network_indicator_vals, inst->cfg.network_indicator), + VTY_NEWLINE); if (inst->cfg.pc_fmt.component_len[0] != 3 || inst->cfg.pc_fmt.component_len[1] != 8 || -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41403?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I969ee94c00afa7a77e26c8cf3e9b998b06022641 Gerrit-Change-Number: 41403 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: mtp: Improve Network Indicator definitions
by pespin 12 Nov '25

12 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41402?usp=email ) Change subject: mtp: Improve Network Indicator definitions ...................................................................... mtp: Improve Network Indicator definitions Change-Id: I0a7e113ac89946e5cf3bec8bec07ad10ee38723d --- M TODO-RELEASE M include/osmocom/sigtran/mtp_sap.h M include/osmocom/sigtran/protocol/mtp.h M src/ss7_vty.c 4 files changed, 19 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/02/41402/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 2d94ad1..a89255b 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line libosmo-netif >1.6.0 stream OSMO_STREAM_{CLI,SRV}_TCP_SOCKOPT_KEEP* +libosmo-sigtran add enum mtp_network_indicator, mtp_network_indicator_vals diff --git a/include/osmocom/sigtran/mtp_sap.h b/include/osmocom/sigtran/mtp_sap.h index 0ae8592..05308c2 100644 --- a/include/osmocom/sigtran/mtp_sap.h +++ b/include/osmocom/sigtran/mtp_sap.h @@ -31,6 +31,7 @@ OSMO_MTP_PRIM_STATUS, }; +/* ITU Q.704 14.2 Service information octet. See enum mtp_si_ni00 in mtp.h. */ #define MTP_SIO(service, net_ind) (((net_ind & 0x3) << 6) | (service & 0xF)) struct osmo_mtp_transfer_param { diff --git a/include/osmocom/sigtran/protocol/mtp.h b/include/osmocom/sigtran/protocol/mtp.h index 9654a66..21e3d60 100644 --- a/include/osmocom/sigtran/protocol/mtp.h +++ b/include/osmocom/sigtran/protocol/mtp.h @@ -21,9 +21,17 @@ MTP_SI_BICC = 13, MTP_SI_GCP = 14, }; - extern const struct value_string mtp_si_vals[]; +/* Q.704 14.2.2 Sub-service field (Network Indicator) */ +enum mtp_network_indicator { + MTP_NI_INTERNATIONAL = 0, + MTP_NI_SPARE_INTERNATIONAL = 1, + MTP_NI_NATIONAL = 2, + MTP_NI_RESERVED_NATIONAL = 3 +}; +extern const struct value_string mtp_network_indicator_vals[]; + /* Q.704 15.17.5 */ enum mtp_unavail_cause { diff --git a/src/ss7_vty.c b/src/ss7_vty.c index b333c7f..cfc658d 100644 --- a/src/ss7_vty.c +++ b/src/ss7_vty.c @@ -107,11 +107,11 @@ return CMD_SUCCESS; } -static const struct value_string ss7_network_indicator_vals[] = { - { 0, "international" }, - { 1, "spare" }, - { 2, "national" }, - { 3, "reserved" }, +const struct value_string mtp_network_indicator_vals[] = { + { MTP_NI_INTERNATIONAL, "international" }, + { MTP_NI_SPARE_INTERNATIONAL, "spare" }, + { MTP_NI_NATIONAL, "national" }, + { MTP_NI_RESERVED_NATIONAL, "reserved" }, { 0, NULL } }; @@ -126,7 +126,7 @@ CMD_ATTR_IMMEDIATE) { struct osmo_ss7_instance *inst = vty->index; - int ni = get_string_value(ss7_network_indicator_vals, argv[0]); + int ni = get_string_value(mtp_network_indicator_vals, argv[0]); inst->cfg.network_indicator = ni; return CMD_SUCCESS; @@ -1286,9 +1286,9 @@ vty_out(vty, "cs7 instance %u%s", inst->cfg.id, VTY_NEWLINE); if (inst->cfg.description) vty_out(vty, " description %s%s", inst->cfg.description, VTY_NEWLINE); - if (inst->cfg.network_indicator) + if (inst->cfg.network_indicator != MTP_NI_INTERNATIONAL) vty_out(vty, " network-indicator %s%s", - get_value_string(ss7_network_indicator_vals, + get_value_string(mtp_network_indicator_vals, inst->cfg.network_indicator), VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41402?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I0a7e113ac89946e5cf3bec8bec07ad10ee38723d Gerrit-Change-Number: 41402 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: mtp_sap.h: Protect MTP_SIO macro params with parenthesis
by pespin 12 Nov '25

12 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/41404?usp=email ) Change subject: mtp_sap.h: Protect MTP_SIO macro params with parenthesis ...................................................................... mtp_sap.h: Protect MTP_SIO macro params with parenthesis Change-Id: I0ba8139fd5458ff3637eebaaba0d4c0edd080e6a --- M include/osmocom/sigtran/mtp_sap.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/04/41404/1 diff --git a/include/osmocom/sigtran/mtp_sap.h b/include/osmocom/sigtran/mtp_sap.h index 05308c2..f13d6f1 100644 --- a/include/osmocom/sigtran/mtp_sap.h +++ b/include/osmocom/sigtran/mtp_sap.h @@ -32,7 +32,7 @@ }; /* ITU Q.704 14.2 Service information octet. See enum mtp_si_ni00 in mtp.h. */ -#define MTP_SIO(service, net_ind) (((net_ind & 0x3) << 6) | (service & 0xF)) +#define MTP_SIO(service, net_ind) ((((net_ind) & 0x3) << 6) | ((service) & 0xF)) struct osmo_mtp_transfer_param { uint32_t opc; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/41404?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I0ba8139fd5458ff3637eebaaba0d4c0edd080e6a Gerrit-Change-Number: 41404 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-bsc[master]: Replace ipa_prepend_header() with osmo_ipa_msg_push_header(s)()
by fixeria 11 Nov '25

11 Nov '25

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bsc/+/41401?usp=email ) Change subject: Replace ipa_prepend_header() with osmo_ipa_msg_push_header(s)() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/41401?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic0391ad664c43ea52837e42cea0cc0b82dd961ab Gerrit-Change-Number: 41401 Gerrit-PatchSet: 2 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: Tue, 11 Nov 2025 17:09:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmo-asn1-tcap[master]: Add test to ensure parsing works
by fixeria 11 Nov '25

11 Nov '25

Attention is currently required from: daniel. fixeria has posted comments on this change by daniel. ( https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41394?usp=email ) Change subject: Add test to ensure parsing works ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/41394?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-asn1-tcap Gerrit-Branch: master Gerrit-Change-Id: I475afbb6145404934b0838f9b418c105bf65dca0 Gerrit-Change-Number: 41394 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Nov 2025 17:07:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-bsc[master]: WIP
by pespin 11 Nov '25

11 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/41400?usp=email ) Change subject: WIP ...................................................................... WIP Change-Id: I567ed206eab1add21836bfd937f3790d3d7a00d7 --- M src/osmo-bsc/bsc_ctrl.c 1 file changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/00/41400/1 diff --git a/src/osmo-bsc/bsc_ctrl.c b/src/osmo-bsc/bsc_ctrl.c index 2ba7af8..f24395a 100644 --- a/src/osmo-bsc/bsc_ctrl.c +++ b/src/osmo-bsc/bsc_ctrl.c @@ -628,6 +628,7 @@ return 0; } +#if 0 /* Obtain SS7 application server currently handling given MSC (DPC) */ static struct osmo_ss7_as *msc_get_ss7_as(struct bsc_msc_data *msc) { @@ -642,9 +643,11 @@ return NULL; return as; } +#endif int bsc_sccplite_msc_send(struct bsc_msc_data *msc, struct msgb *msg) { +#if 0 struct osmo_ss7_as *as; struct osmo_ss7_asp *asp; @@ -667,6 +670,24 @@ return -1; } return osmo_ss7_asp_send(asp, msg); +#endif + + struct osmo_ss7_instance *ss7 = osmo_sccp_get_ss7(msc->a.sccp); + struct osmo_mtp_prim *omp; + struct osmo_mtp_transfer_param *param; + + /* 2) wrap into MTP-TRANSFER.req primitive */ + msg->l2h = msg->data; + omp = (struct osmo_mtp_prim *) msgb_push(msg, sizeof(*omp)); + osmo_prim_init(&omp->oph, MTP_SAP_USER, OSMO_MTP_PRIM_TRANSFER, PRIM_OP_REQUEST, msg); + param = &omp->u.transfer; + param->opc = s7i->cfg.primary_pc; + param->dpc = msc->a.msc_addr.pc; + param->sls = 0; + param->sio = MTP_SIO(MTP_SI_SCCP, s7i->cfg.network_indicator); + + /* 3) send via MTP-SAP (osmo_ss7_instance) */ + return osmo_ss7_user_mtp_xfer_req(s7i, omp); } /* Encode a CTRL command and send it to the given ASP -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/41400?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I567ed206eab1add21836bfd937f3790d3d7a00d7 Gerrit-Change-Number: 41400 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-bsc[master]: Replace ipa_prepend_header() with osmo_ipa_msg_push_header(s)()
by pespin 11 Nov '25

11 Nov '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/41401?usp=email ) Change subject: Replace ipa_prepend_header() with osmo_ipa_msg_push_header(s)() ...................................................................... Replace ipa_prepend_header() with osmo_ipa_msg_push_header(s)() This is a step further into the transition of having most of the ipa protocol code in libosmo-netif. Also, the osmo_ipa_msg_push_headers() is easier to understand than having 2 API calls prepending 2 headers. Change-Id: Ic0391ad664c43ea52837e42cea0cc0b82dd961ab --- M src/ipaccess/ipaccess-config-e1-driver.c M src/osmo-bsc/bsc_ctrl.c M src/osmo-bsc/osmo_bsc_mgcp.c 3 files changed, 6 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/01/41401/1 diff --git a/src/ipaccess/ipaccess-config-e1-driver.c b/src/ipaccess/ipaccess-config-e1-driver.c index 17a5dde..631e430 100644 --- a/src/ipaccess/ipaccess-config-e1-driver.c +++ b/src/ipaccess/ipaccess-config-e1-driver.c @@ -179,8 +179,8 @@ return -EINVAL; } - msg->l2h = msg->data; - ipa_prepend_header(msg, sign_link->tei); + /* msg->l2h is set here: */ + osmo_ipa_msg_push_header(msg, sign_link->tei); LOGPITS(e1i_ts, DLMI, LOGL_DEBUG, "TX: %s\n", osmo_hexdump(msg->l2h, msgb_l2len(msg))); osmo_stream_cli_send(cli, msg); @@ -213,7 +213,7 @@ if (!nmsg2) return NULL; msgb_v_put(nmsg2, IPAC_MSGT_ID_ACK); - ipa_prepend_header(nmsg2, IPAC_PROTO_IPACCESS); + osmo_ipa_msg_push_header(nmsg2, IPAC_PROTO_IPACCESS); return nmsg2; } diff --git a/src/osmo-bsc/bsc_ctrl.c b/src/osmo-bsc/bsc_ctrl.c index f24395a..1efeeaf 100644 --- a/src/osmo-bsc/bsc_ctrl.c +++ b/src/osmo-bsc/bsc_ctrl.c @@ -710,9 +710,7 @@ if (!msg) return -1; - ipa_prepend_header_ext(msg, IPAC_PROTO_EXT_CTRL); - ipa_prepend_header(msg, IPAC_PROTO_OSMO); - + osmo_ipa_msg_push_headers(msg, IPAC_PROTO_OSMO, IPAC_PROTO_EXT_CTRL); return osmo_ss7_asp_send(asp, msg); } @@ -726,9 +724,7 @@ if (!msg) return -1; - ipa_prepend_header_ext(msg, IPAC_PROTO_EXT_CTRL); - ipa_prepend_header(msg, IPAC_PROTO_OSMO); - + osmo_ipa_msg_push_headers(msg, IPAC_PROTO_OSMO, IPAC_PROTO_EXT_CTRL); return bsc_sccplite_msc_send(msc, msg); } diff --git a/src/osmo-bsc/osmo_bsc_mgcp.c b/src/osmo-bsc/osmo_bsc_mgcp.c index 4114cc3..978ff8c 100644 --- a/src/osmo-bsc/osmo_bsc_mgcp.c +++ b/src/osmo-bsc/osmo_bsc_mgcp.c @@ -195,6 +195,6 @@ msg->l2h[rc] = '\0'; LOGP(DMSC, LOGL_NOTICE, "Received MGCP on UDP proxy socket: %s\n", msg->l2h); - ipa_prepend_header(msg, IPAC_PROTO_MGCP_OLD); + osmo_ipa_msg_push_header(msg, IPAC_PROTO_MGCP_OLD); return bsc_sccplite_msc_send(msc, msg); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/41401?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic0391ad664c43ea52837e42cea0cc0b82dd961ab Gerrit-Change-Number: 41401 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

2025

2024

2023

2022

gerrit-log November 2025