- gerrit-log - lists.osmocom.org

[XS] Change in libosmo-sigtran[master]: xua_rkm: Reply RKM RKEY REG with err insufficient resources
by osmith 03 Jul '25

03 Jul '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40574?usp=email ) Change subject: xua_rkm: Reply RKM RKEY REG with err insufficient resources ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40574?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: I352dbc0a1319348b127e173599a1d967ef7bcb26 Gerrit-Change-Number: 40574 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Jul 2025 12:44:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-sigtran[master]: xua_rkm: Improve handling of newly_assigned_as array
by osmith 03 Jul '25

03 Jul '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40573?usp=email ) Change subject: xua_rkm: Improve handling of newly_assigned_as array ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40573?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: I4fbac8ff61541c6804e2f01a9c965ec630d59080 Gerrit-Change-Number: 40573 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Jul 2025 12:41:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-sigtran[master]: xua_rkm: Simplify handle_rkey_reg() with early return path
by osmith 03 Jul '25

03 Jul '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40572?usp=email ) Change subject: xua_rkm: Simplify handle_rkey_reg() with early return path ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40572?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: I6f848716e9239dc4a4f0b35297462dd3915502c2 Gerrit-Change-Number: 40572 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Jul 2025 12:36:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-sigtran[master]: Improve error log when adding >16 ASPs to an AS
by osmith 03 Jul '25

03 Jul '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40571?usp=email ) Change subject: Improve error log when adding >16 ASPs to an AS ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40571?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: Id9d13e6de24acd6465a099052a48c8b322a8f245 Gerrit-Change-Number: 40571 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Jul 2025 12:35:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmo-sigtran[master]: Send DUNA during ASP ACT time
by osmith 03 Jul '25

03 Jul '25

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40564?usp=email ) Change subject: Send DUNA during ASP ACT time ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40564?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: Id9d92c3fda7423a9c79fffac6b650abba9651853 Gerrit-Change-Number: 40564 Gerrit-PatchSet: 4 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Jul 2025 12:34:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmo-sigtran[master]: Indicate PC (un)availability from address-book when AS goes up/down
by osmith 03 Jul '25

03 Jul '25

Attention is currently required from: daniel, laforge, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40563?usp=email ) Change subject: Indicate PC (un)availability from address-book when AS goes up/down ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40563?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: I8b15b2ce46ced1be8fb6467cb3239337731b1090 Gerrit-Change-Number: 40563 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> 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, 03 Jul 2025 12:30:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-bsc[master]: bsc: Make sure MSC PC is added to sccp-addressbook
by pespin 03 Jul '25

03 Jul '25

Attention is currently required from: daniel, laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-bsc/+/40562?usp=email ) Change subject: bsc: Make sure MSC PC is added to sccp-addressbook ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: Fails to build because it depends on libosmo-sigtran patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/40562?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: I57dca92eb5f482e9017d9b19cd7f8feebd9e2721 Gerrit-Change-Number: 40562 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Jul 2025 12:17:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[M] Change in libosmo-sigtran[master]: sccp_sap.h: Add APIs to insert and update addresses in address book
by pespin 03 Jul '25

03 Jul '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40561?usp=email ) Change subject: sccp_sap.h: Add APIs to insert and update addresses in address book ...................................................................... sccp_sap.h: Add APIs to insert and update addresses in address book This will be used by applications to dynamically add addresses in the address book, which later on libosmo-sigtran can make use of to eg. send DAUD for intereting DPCs. Change-Id: I9d2452d9cc8e443050927a047b7ebacd2b2f37e1 --- M include/osmocom/sigtran/sccp_sap.h M src/ss7_instance.c M src/ss7_vty.c M tests/vty/osmo_stp_test.vty M tests/vty/ss7_asp_test.vty 5 files changed, 93 insertions(+), 27 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve daniel: Looks good to me, but someone else must approve diff --git a/include/osmocom/sigtran/sccp_sap.h b/include/osmocom/sigtran/sccp_sap.h index 98a48be..65eff74 100644 --- a/include/osmocom/sigtran/sccp_sap.h +++ b/include/osmocom/sigtran/sccp_sap.h @@ -330,12 +330,12 @@ int osmo_sccp_user_sap_down(struct osmo_sccp_user *scu, struct osmo_prim_hdr *oph); int osmo_sccp_user_sap_down_nofree(struct osmo_sccp_user *scu, struct osmo_prim_hdr *oph); +int osmo_sccp_addr_create(struct osmo_ss7_instance *inst, const char *name, const struct osmo_sccp_addr *dest_addr); +int osmo_sccp_addr_update(struct osmo_ss7_instance *inst, const char *name, const struct osmo_sccp_addr *dest_addr); struct osmo_ss7_instance *osmo_sccp_addr_by_name(struct osmo_sccp_addr *dest_addr, const char *name); int osmo_sccp_addr_by_name_local(struct osmo_sccp_addr *dest_addr, const char *name, const struct osmo_ss7_instance *inst); - const char *osmo_sccp_name_by_addr(const struct osmo_sccp_addr *addr); - void osmo_sccp_local_addr_by_instance(struct osmo_sccp_addr *dest_addr, const struct osmo_sccp_instance *inst, uint32_t ssn); diff --git a/src/ss7_instance.c b/src/ss7_instance.c index ef0fbd8..b583b98 100644 --- a/src/ss7_instance.c +++ b/src/ss7_instance.c @@ -619,6 +619,74 @@ * (see also .cfg in struct osmo_ss7_instance) */ LLIST_HEAD(sccp_address_book_global); +static struct osmo_sccp_addr_entry *addr_entry_alloc(struct osmo_ss7_instance *inst, const char *name, + const struct osmo_sccp_addr *addr) +{ + struct osmo_sccp_addr_entry *entry; + + entry = talloc_zero(inst, struct osmo_sccp_addr_entry); + OSMO_STRLCPY_ARRAY(entry->name, name); + entry->inst = inst; + memcpy(&entry->addr, addr, sizeof(entry->addr)); + llist_add_tail(&entry->list, &inst->cfg.sccp_address_book); + llist_add_tail(&entry->list_global, &sccp_address_book_global); + return entry; +} + +/*! \brief Add an SCCP address entry to the addressbook. + * \param[int] inst cs7 instance where this address belongs + * \param[in] name of the address to create + * \param[in] dest_addr address value to add to the addressbook. + * \returns 0 on success, negative error code on error. + * + * Validates that the name is unique among all cs7 instances of the process, and + * that no such entry already exists. */ +int osmo_sccp_addr_create(struct osmo_ss7_instance *inst, const char *name, + const struct osmo_sccp_addr *dest_addr) +{ + struct osmo_sccp_addr_entry *entry; + if (strlen(name) >= sizeof(entry->name)) { + LOGSS7(inst, LOGL_ERROR, "%s: SCCP address name too long: '%s'\n", + __func__, name); + return -ENOSPC; + } + + /* Ensure that we do not use address names that + * are already used in other ss7 instances. */ + entry = addr_entry_by_name_global(name); + if (entry) { + LOGSS7(inst, LOGL_ERROR, "%s: SCCP address name already used in cs7 instance %u: '%s'\n", + __func__, entry->inst->cfg.id, entry->name); + return -EALREADY; + } + + entry = addr_entry_alloc(inst, name, dest_addr); + OSMO_ASSERT(entry); + return 0; +} + +/*! \brief Update the value of an SCCP address entry already present in the addressbook. + * \param[int] inst cs7 instance where this address belongs + * \param[in] name of the address to update + * \param[in] dest_addr address value to store in the addressbook. + * \returns 0 on success, negative error code on error. + */ +int osmo_sccp_addr_update(struct osmo_ss7_instance *inst, const char *name, const struct osmo_sccp_addr *dest_addr) +{ + struct osmo_sccp_addr_entry *entry; + + /* Ensure that we do not use address names that + * are already used in other ss7 instances. */ + entry = addr_entry_by_name_local(name, inst); + if (!entry) { + LOGSS7(inst, LOGL_ERROR, "%s: SCCP address '%s' not found in cs7 instance %u\n", + __func__, name, inst->cfg.id); + return -ENOKEY; + } + memcpy(&entry->addr, dest_addr, sizeof(entry->addr)); + return 0; +} + /* Pick an SCCP address entry from the addressbook list by its name */ struct osmo_sccp_addr_entry *addr_entry_by_name_local(const char *name, diff --git a/src/ss7_vty.c b/src/ss7_vty.c index 9e9ceaa..a3f1a34 100644 --- a/src/ss7_vty.c +++ b/src/ss7_vty.c @@ -952,36 +952,34 @@ struct osmo_ss7_instance *inst = (struct osmo_ss7_instance *)vty->index; struct osmo_sccp_addr_entry *entry; const char *name = argv[0]; + int rc; - if (strlen(name) >= sizeof(entry->name)) { - vty_out(vty, "Error: SCCP address name too long: '%s'%s", - name, VTY_NEWLINE); - return CMD_ERR_INCOMPLETE; - } - - /* Ensure that we do not use address names that - * are already used in other ss7 instances. */ - entry = addr_entry_by_name_global(name); - if (entry != NULL) { - vty_out(vty, - "Error: SCCP address name already used in cs7 instance %u: '%s'%s", - entry->inst->cfg.id, entry->name, VTY_NEWLINE); - return CMD_ERR_INCOMPLETE; + entry = addr_entry_by_name_local(name, inst); + if (!entry) { + /* Create a new addressbook entry if we can not find an + * already existing entry */ + struct osmo_sccp_addr sccp_addr = { + .ri = OSMO_SCCP_RI_SSN_PC, + }; + rc = osmo_sccp_addr_create(inst, name, &sccp_addr); + if (rc < 0) { + if (rc == -ENOSPC) + vty_out(vty, "Error: SCCP address name too long: '%s'%s", + name, VTY_NEWLINE); + if (rc == -EALREADY) + vty_out(vty, "Error: SCCP address name already used in cs7 instance other than %u: '%s'%s", + inst->cfg.id, name, VTY_NEWLINE); + return CMD_ERR_INCOMPLETE; + } } entry = addr_entry_by_name_local(name, inst); - - /* Create a new addressbook entry if we can not find an - * already existing entry */ if (!entry) { - entry = talloc_zero(inst, struct osmo_sccp_addr_entry); - osmo_strlcpy(entry->name, name, sizeof(entry->name)); - llist_add_tail(&entry->list, &inst->cfg.sccp_address_book); - llist_add_tail(&entry->list_global, &sccp_address_book_global); - entry->addr.ri = OSMO_SCCP_RI_SSN_PC; + vty_out(vty, "%% Error: Unable to find SCCP address '%s' just created in instance %u%s", + name, inst->cfg.id, VTY_NEWLINE); + return CMD_WARNING; } - entry->inst = (struct osmo_ss7_instance *)vty->index; vty->node = L_CS7_SCCPADDR_NODE; vty->index = entry; diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index 2c5b5d8..4502c74 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -259,7 +259,7 @@ OsmoSTP(config-cs7)# exit OsmoSTP(config)# cs7 instance 1 OsmoSTP(config-cs7)# sccp-address foo -Error: SCCP address name already used in cs7 instance 0: 'foo' +Error: SCCP address name already used in cs7 instance other than 1: 'foo' % Command incomplete. OsmoSTP(config-cs7)# sccp-address bar OsmoSTP(config-cs7-sccpaddr)# point-code 1.2.3 diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index b565557..2bf753d 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -238,7 +238,7 @@ ss7_asp_vty_test(config-cs7)# exit ss7_asp_vty_test(config)# cs7 instance 1 ss7_asp_vty_test(config-cs7)# sccp-address foo -Error: SCCP address name already used in cs7 instance 0: 'foo' +Error: SCCP address name already used in cs7 instance other than 1: 'foo' % Command incomplete. ss7_asp_vty_test(config-cs7)# sccp-address bar ss7_asp_vty_test(config-cs7-sccpaddr)# point-code 1.2.3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40561?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: I9d2452d9cc8e443050927a047b7ebacd2b2f37e1 Gerrit-Change-Number: 40561 Gerrit-PatchSet: 1 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: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: Fix static str buf in osmo_ss7_route_print() too small
by pespin 03 Jul '25

03 Jul '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40557?usp=email ) Change subject: Fix static str buf in osmo_ss7_route_print() too small ...................................................................... Fix static str buf in osmo_ss7_route_print() too small Related: Coverity CID#528692 Change-Id: I40c9ac38b60b01f64bec01ddd10a63759dbdec81 --- M src/ss7_route.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/ss7_route.c b/src/ss7_route.c index c432c49..713cc6a 100644 --- a/src/ss7_route.c +++ b/src/ss7_route.c @@ -271,7 +271,7 @@ const char *osmo_ss7_route_print(const struct osmo_ss7_route *rt) { - static char buf[64]; + static char buf[MAX_PC_STR_LEN * 2 + 1]; struct osmo_strbuf sb = { .buf = buf, .len = sizeof(buf) }; char buf_pc[MAX_PC_STR_LEN]; const struct osmo_ss7_instance *inst = rt->rtable->inst; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40557?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: I40c9ac38b60b01f64bec01ddd10a63759dbdec81 Gerrit-Change-Number: 40557 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: xua_snm: Add fully qualified dynamic routes to track announced PCs
by pespin 03 Jul '25

03 Jul '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40558?usp=email ) Change subject: xua_snm: Add fully qualified dynamic routes to track announced PCs ...................................................................... xua_snm: Add fully qualified dynamic routes to track announced PCs This allows building up a set of "concerned remote PCs" which can be used to indicate (MTP-PAUSE/RESUME.ind, N-PCSTATE.ind) upper layers that specific remote PCs went down eg. when a local AS becomes inactive (for instance because the last ASP SCTP/TCP link goes down). Change-Id: Icd72e7b15ea3f18c7d1a9a7c821d6d7f7ab11a96 --- M src/ss7_route_table.c M src/ss7_route_table.h M src/xua_snm.c 3 files changed, 63 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/ss7_route_table.c b/src/ss7_route_table.c index f216cff..e59fd55 100644 --- a/src/ss7_route_table.c +++ b/src/ss7_route_table.c @@ -137,6 +137,41 @@ return NULL; } +/*! \brief Find a SS7 route for given destination point code + mask in given table via given AS. + * + * This function is used for route management procedures, not for packet routing lookup procedures! + */ +struct osmo_ss7_route * +ss7_route_table_find_route_by_dpc_mask_as(struct osmo_ss7_route_table *rtbl, uint32_t dpc, + uint32_t mask, const struct osmo_ss7_as *as, bool dynamic) +{ + struct osmo_ss7_combined_linkset *clset; + struct osmo_ss7_route *rt; + + OSMO_ASSERT(ss7_initialized); + + dpc = osmo_ss7_pc_normalize(&rtbl->inst->cfg.pc_fmt, dpc); + mask = osmo_ss7_pc_normalize(&rtbl->inst->cfg.pc_fmt, mask); + + /* we assume the combined_links are sorted by mask length, i.e. more + * specific combined links first, and less specific combined links with shorter + * mask later */ + llist_for_each_entry(clset, &rtbl->combined_linksets, list) { + if ((dpc & clset->cfg.mask) != clset->cfg.pc) + continue; + if (mask != clset->cfg.mask) + continue; + llist_for_each_entry(rt, &clset->routes, list) { + if (rt->dest.as != as) + continue; + if (rt->cfg.dyn_allocated != dynamic) + continue; + return rt; + } + } + return NULL; +} + struct osmo_ss7_combined_linkset * ss7_route_table_find_combined_linkset_by_dpc(struct osmo_ss7_route_table *rtbl, uint32_t dpc) { diff --git a/src/ss7_route_table.h b/src/ss7_route_table.h index 1155600..a128915 100644 --- a/src/ss7_route_table.h +++ b/src/ss7_route_table.h @@ -42,6 +42,9 @@ ss7_route_table_find_route_by_dpc_mask(struct osmo_ss7_route_table *rtbl, uint32_t dpc, uint32_t mask, bool dynamic); struct osmo_ss7_route * +ss7_route_table_find_route_by_dpc_mask_as(struct osmo_ss7_route_table *rtbl, uint32_t dpc, + uint32_t mask, const struct osmo_ss7_as *as, bool dynamic); +struct osmo_ss7_route * ss7_route_table_lookup_route(struct osmo_ss7_route_table *rtbl, const struct osmo_ss7_route_label *rtlabel); struct osmo_ss7_combined_linkset * diff --git a/src/xua_snm.c b/src/xua_snm.c index 42361c9..d4c9a75 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -154,16 +154,36 @@ /* RFC4666 1.4.2.5: "maintain a dynamic table of available SGP routes * for the SS7 destinations, taking into account the SS7 destination * availability/restricted/congestion status received from the SGP "*/ -static void xua_snm_srm_pc_available(struct osmo_ss7_as *as, - const uint32_t *aff_pc, unsigned int num_aff_pc, - bool available) +static void xua_snm_srm_pc_available_single(struct osmo_ss7_as *as, uint32_t pc, bool available) { struct osmo_ss7_instance *s7i = as->inst; enum osmo_ss7_route_status new_status; + struct osmo_ss7_route *rt; new_status = available ? OSMO_SS7_ROUTE_STATUS_AVAILABLE : OSMO_SS7_ROUTE_STATUS_UNAVAILABLE; + /* Check if we already have a dynamic fully qualified route towards that AS: */ + rt = ss7_route_table_find_route_by_dpc_mask_as(s7i->rtable_system, pc, 0xffffff, as, true); + if (!rt) { + /* No dynamic fully qualified route found. Add dynamic fully + * squalified route and mark it as (un)available: */ + rt = ss7_route_create(s7i->rtable_system, pc, 0xffffff, true, as->cfg.name); + if (!rt) { + LOGPAS(as, DLSS7, LOGL_ERROR, "Unable to create dynamic route for pc=%u=%s status=%s\n", + pc, osmo_ss7_pointcode_print(s7i, pc), ss7_route_status_name(new_status)); + return; + } + ss7_route_update_route_status(rt, new_status); + /* No need to iterate over rtable below, since we know there was no route: */ + return; + } + ss7_route_table_update_route_status_by_as(s7i->rtable_system, new_status, as, pc); +} +static void xua_snm_srm_pc_available(struct osmo_ss7_as *as, + const uint32_t *aff_pc, unsigned int num_aff_pc, + bool available) +{ for (unsigned int i = 0; i < num_aff_pc; i++) { /* 32bit "Affected Point Code" consists of a 7-bit mask followed by 14/16/24-bit SS7 PC, * see RFC 4666 3.4.1 */ @@ -172,13 +192,13 @@ uint8_t mask = _aff_pc >> 24; if (!mask) { - ss7_route_table_update_route_status_by_as(s7i->rtable_system, new_status, as, pc); + xua_snm_srm_pc_available_single(as, pc, available); } else { /* Update only full DPC routes. */ uint32_t maskbits = (1 << mask) - 1; uint32_t fullpc; for (fullpc = (pc & ~maskbits); fullpc <= (pc | maskbits); fullpc++) - ss7_route_table_update_route_status_by_as(s7i->rtable_system, new_status, as, fullpc); + xua_snm_srm_pc_available_single(as, fullpc, available); } } } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40558?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: Icd72e7b15ea3f18c7d1a9a7c821d6d7f7ab11a96 Gerrit-Change-Number: 40558 Gerrit-PatchSet: 1 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: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log