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

[M] Change in libosmo-sigtran[master]: Send DUNA during ASP ACT time

by osmith

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

3 weeks, 5 days

1
0
0 0

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

by osmith

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

3 weeks, 5 days

1
0
0 0

[M] Change in osmo-bsc[master]: bsc: Make sure MSC PC is added to sccp-addressbook

by pespin

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

3 weeks, 5 days

1
0
0 0

[M] Change in libosmo-sigtran[master]: sccp_sap.h: Add APIs to insert and update addresses in address book

by pespin

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>

3 weeks, 5 days

1
0
0 0

[XS] Change in libosmo-sigtran[master]: Fix static str buf in osmo_ss7_route_print() too small

by pespin

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>

3 weeks, 5 days

1
0
0 0

[M] Change in libosmo-sigtran[master]: xua_snm: Add fully qualified dynamic routes to track announced PCs

by pespin

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>

3 weeks, 5 days

1
0
0 0

[M] Change in libosmo-sigtran[master]: Introduce initial route status support

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40556?usp=email ) Change subject: Introduce initial route status support ...................................................................... Introduce initial route status support Mark route avail/unavail based on DAVA/DUNA from SG. Related: OS#6754 Change-Id: Icb4f78f8da9de5a611cb6311722bf3acf1a68fc5 --- M src/ss7.c M src/ss7_combined_linkset.c M src/ss7_combined_linkset.h M src/ss7_internal.h M src/ss7_route.c M src/ss7_route.h M src/ss7_route_table.c M src/ss7_route_table.h M src/ss7_vty.c M src/xua_snm.c M tests/vty/osmo_stp_route_prio.vty 11 files changed, 178 insertions(+), 20 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/src/ss7.c b/src/ss7.c index 902479d..e2f2ca9 100644 --- a/src/ss7.c +++ b/src/ss7.c @@ -89,13 +89,18 @@ return pc_fmt->component_len[0] + pc_fmt->component_len[1] + pc_fmt->component_len[2]; } +/* Obtain a full-width mask matching a single DPC in this ss7_instance. */ +uint32_t ss7_pc_full_mask(const struct osmo_ss7_pc_fmt *pc_fmt) +{ + return (1 << osmo_ss7_pc_width(pc_fmt)) - 1; +} + /* truncate pc or mask to maximum permitted length. This solves * callers specifying arbitrary large masks which then evade duplicate * detection with longer mask lengths */ uint32_t osmo_ss7_pc_normalize(const struct osmo_ss7_pc_fmt *pc_fmt, uint32_t pc) { - uint32_t mask = (1 << osmo_ss7_pc_width(pc_fmt))-1; - return pc & mask; + return pc & ss7_pc_full_mask(pc_fmt); } /*********************************************************************** diff --git a/src/ss7_combined_linkset.c b/src/ss7_combined_linkset.c index eb19b85..0b6dd3c 100644 --- a/src/ss7_combined_linkset.c +++ b/src/ss7_combined_linkset.c @@ -172,6 +172,20 @@ ss7_combined_linkset_free(clset); } +/* Whether any route in the combined linkset is available: */ +bool ss7_combined_linkset_is_available(const struct osmo_ss7_combined_linkset *clset) +{ + bool avail = false; + struct osmo_ss7_route *rt; + llist_for_each_entry(rt, &clset->routes, list) { + if (ss7_route_is_available(rt)) { + avail = true; + break; + } + } + return avail; +} + static ext_sls_t osmo_ss7_instance_calc_itu_ext_sls(const struct osmo_ss7_instance *inst, const struct osmo_ss7_route_label *rtlabel) { /* Take 6 bits from OPC and DPC according to config: */ diff --git a/src/ss7_combined_linkset.h b/src/ss7_combined_linkset.h index 432ebd7..e3756b6 100644 --- a/src/ss7_combined_linkset.h +++ b/src/ss7_combined_linkset.h @@ -57,6 +57,7 @@ ss7_combined_linkset_del_route(struct osmo_ss7_route *rt); struct osmo_ss7_route * ss7_combined_linkset_lookup_route(struct osmo_ss7_combined_linkset *clset, const struct osmo_ss7_route_label *rtlabel); +bool ss7_combined_linkset_is_available(const struct osmo_ss7_combined_linkset *clset); #define LOGPCLSET(clset, subsys, level, fmt, args ...) do { \ char _pc_str[MAX_PC_STR_LEN]; \ diff --git a/src/ss7_internal.h b/src/ss7_internal.h index d931351..cfa092a 100644 --- a/src/ss7_internal.h +++ b/src/ss7_internal.h @@ -15,6 +15,8 @@ bool ss7_ipv6_sctp_supported(const char *host, bool bind); +uint32_t ss7_pc_full_mask(const struct osmo_ss7_pc_fmt *pc_fmt); + struct osmo_ss7_asp *ss7_asp_find_by_socket_addr(int fd, int trans_proto); bool ss7_asp_protocol_check_trans_proto(enum osmo_ss7_asp_protocol proto, int trans_proto); diff --git a/src/ss7_route.c b/src/ss7_route.c index ec41a8a..c432c49 100644 --- a/src/ss7_route.c +++ b/src/ss7_route.c @@ -38,6 +38,14 @@ * SS7 Routes ***********************************************************************/ + /* ITU Q.704 3.4 Status of signalling routes */ +const struct value_string ss7_route_status_names[] = { + { OSMO_SS7_ROUTE_STATUS_UNAVAILABLE, "unavailable" }, + { OSMO_SS7_ROUTE_STATUS_AVAILABLE, "available" }, + { OSMO_SS7_ROUTE_STATUS_RESTRICTED, "restricted" }, + {} +}; + /*! \brief Allocate a route entry * \param[in] rtbl Routing Table where the route belongs * \param[in] pc Point Code of the destination of the route @@ -79,6 +87,7 @@ /* Mark it as not being inserted yet in rtbl */ INIT_LLIST_HEAD(&rt->list); rt->rtable = rtbl; + rt->status = OSMO_SS7_ROUTE_STATUS_AVAILABLE; /* truncate mask to maximum. Let's avoid callers specifying arbitrary large * masks to ensure we don't fail duplicate detection with longer mask lengths */ rt->cfg.mask = osmo_ss7_pc_normalize(&rtbl->inst->cfg.pc_fmt, mask); @@ -374,9 +383,29 @@ bool ss7_route_is_available(const struct osmo_ss7_route *rt) { OSMO_ASSERT(rt); + if (!ss7_route_dest_is_available(rt)) + return false; + return rt->status == OSMO_SS7_ROUTE_STATUS_AVAILABLE; +} + +bool ss7_route_dest_is_available(const struct osmo_ss7_route *rt) +{ + OSMO_ASSERT(rt); if (rt->dest.as) return osmo_ss7_as_active(rt->dest.as); if (rt->dest.linkset) return ss7_linkset_is_available(rt->dest.linkset); return false; } + +/* Whether route mask identifies a single DPC. */ +bool ss7_route_is_fully_qualified(const struct osmo_ss7_route *rt) +{ + return rt->cfg.mask == ss7_pc_full_mask(&rt->rtable->inst->cfg.pc_fmt); +} + +void ss7_route_update_route_status(struct osmo_ss7_route *rt, enum osmo_ss7_route_status status) +{ + LOGPRT(rt, DLSS7, LOGL_NOTICE, "changed to status '%s'\n", ss7_route_status_name(status)); + rt->status = status; +} diff --git a/src/ss7_route.h b/src/ss7_route.h index 7ba7ba5..2e35d1f 100644 --- a/src/ss7_route.h +++ b/src/ss7_route.h @@ -15,6 +15,16 @@ #define OSMO_SS7_ROUTE_PRIO_DEFAULT 5 +/* ITU Q.704 3.4 Status of signalling routes */ +enum osmo_ss7_route_status { + OSMO_SS7_ROUTE_STATUS_UNAVAILABLE, + OSMO_SS7_ROUTE_STATUS_AVAILABLE, + OSMO_SS7_ROUTE_STATUS_RESTRICTED, +}; +extern const struct value_string ss7_route_status_names[]; +static inline const char *ss7_route_status_name(enum osmo_ss7_route_status val) +{ return get_value_string(ss7_route_status_names, val); } + struct osmo_ss7_route { /*! member in \ref osmo_ss7_combined_linkset.routes */ struct llist_head list; @@ -23,6 +33,8 @@ /* Combined linkset this route is part of */ struct osmo_ss7_combined_linkset *clset; + enum osmo_ss7_route_status status; + struct { /*! pointer to linkset (destination) of route */ struct osmo_ss7_linkset *linkset; @@ -59,15 +71,26 @@ int ss7_route_set_linkset(struct osmo_ss7_route *rt, const char *linkset_name); int ss7_route_insert(struct osmo_ss7_route *rt); +bool ss7_route_dest_is_available(const struct osmo_ss7_route *rt); bool ss7_route_is_available(const struct osmo_ss7_route *rt); + +bool ss7_route_is_fully_qualified(const struct osmo_ss7_route *rt); +static inline bool ss7_route_is_summary(const struct osmo_ss7_route *rt) +{ + return !ss7_route_is_fully_qualified(rt); +} + +void ss7_route_update_route_status(struct osmo_ss7_route *rt, enum osmo_ss7_route_status status); + #define LOGPRT(rt, subsys, level, fmt, args ...) do { \ char _pc_str[MAX_PC_STR_LEN]; \ char _mask_str[MAX_PC_STR_LEN]; \ _LOGSS7((rt)->rtable->inst, subsys, level, \ - "RT(dpc=%u=%s,mask=0x%x=%s,prio=%u,via=%s) " fmt, \ + "RT(dpc=%u=%s,mask=0x%x=%s,prio=%u,via=%s,st=%s) " fmt, \ (rt)->cfg.pc, osmo_ss7_pointcode_print_buf(_pc_str, MAX_PC_STR_LEN, (rt)->rtable->inst, (rt)->cfg.pc), \ (rt)->cfg.mask, osmo_ss7_pointcode_print_buf(_mask_str, MAX_PC_STR_LEN, (rt)->rtable->inst, (rt)->cfg.mask), \ (rt)->cfg.priority, \ (rt)->cfg.linkset_name ? (rt)->cfg.linkset_name : "", \ + ss7_route_status_name((rt)->status), \ ## args); \ } while (0) diff --git a/src/ss7_route_table.c b/src/ss7_route_table.c index c816e36..f216cff 100644 --- a/src/ss7_route_table.c +++ b/src/ss7_route_table.c @@ -209,6 +209,25 @@ return clset; } +void ss7_route_table_update_route_status_by_as(struct osmo_ss7_route_table *rtbl, enum osmo_ss7_route_status status, + const struct osmo_ss7_as *as, uint32_t dpc) +{ + struct osmo_ss7_combined_linkset *clset; + + llist_for_each_entry(clset, &rtbl->combined_linksets, list) { + struct osmo_ss7_route *rt; + llist_for_each_entry(rt, &clset->routes, list) { + if (rt->dest.as != as) + continue; + if (rt->cfg.pc != dpc) + continue; + if (ss7_route_is_summary(rt)) + continue; /* Only interested in fully qualified routes */ + ss7_route_update_route_status(rt, status); + } + } +} + /* find any routes pointing to this AS and remove them */ void ss7_route_table_del_routes_by_as(struct osmo_ss7_route_table *rtbl, struct osmo_ss7_as *as) { diff --git a/src/ss7_route_table.h b/src/ss7_route_table.h index 9f27412..1155600 100644 --- a/src/ss7_route_table.h +++ b/src/ss7_route_table.h @@ -9,6 +9,7 @@ ***********************************************************************/ struct osmo_ss7_instance; +enum osmo_ss7_route_status; struct osmo_ss7_route_label { uint32_t opc; @@ -54,5 +55,7 @@ struct osmo_ss7_combined_linkset * ss7_route_table_find_combined_linkset(struct osmo_ss7_route_table *rtbl, uint32_t dpc, uint32_t mask, uint32_t prio); +void ss7_route_table_update_route_status_by_as(struct osmo_ss7_route_table *rtbl, enum osmo_ss7_route_status status, + const struct osmo_ss7_as *as, uint32_t dpc); void ss7_route_table_del_routes_by_as(struct osmo_ss7_route_table *rtbl, struct osmo_ss7_as *as); void ss7_route_table_del_routes_by_linkset(struct osmo_ss7_route_table *rtbl, struct osmo_ss7_linkset *lset); diff --git a/src/ss7_vty.c b/src/ss7_vty.c index ab9784c..9e9ceaa 100644 --- a/src/ss7_vty.c +++ b/src/ss7_vty.c @@ -515,23 +515,48 @@ if ((filter_pc != OSMO_SS7_PC_INVALID) && ((filter_pc & clset->cfg.mask) != clset->cfg.pc)) continue; /* Skip combined linksets not matching destination */ + bool clset_avail = ss7_combined_linkset_is_available(clset); llist_for_each_entry(rt, &clset->routes, list) { - bool rt_avail = ss7_route_is_available(rt); + bool dst_avail = ss7_route_dest_is_available(rt); bool first_rt_in_clset = (rt == llist_first_entry(&clset->routes, struct osmo_ss7_route, list)); + const char *nonadj_str, *rtavail_str; /* Print route str only in first rt in combined linkset. * This allows users to easily determine visually combined * linksets: */ - const char *rt_str = first_rt_in_clset ? osmo_ss7_route_print(rt) : ""; + const char *rt_str, *clsetavail_str; + if (first_rt_in_clset) { + rt_str = osmo_ss7_route_print(rt); + clsetavail_str = clset_avail ? "acces" : "INACC"; + } else { + rt_str = ""; + clsetavail_str = ""; + } + switch (rt->status) { + case OSMO_SS7_ROUTE_STATUS_UNAVAILABLE: + nonadj_str = "PROHIB"; + rtavail_str = "UNAVAIL"; + break; + case OSMO_SS7_ROUTE_STATUS_AVAILABLE: + nonadj_str = "allowed"; + rtavail_str = dst_avail ? "avail" : "UNAVAIL"; + break; + case OSMO_SS7_ROUTE_STATUS_RESTRICTED: + nonadj_str = "RESTRIC"; + rtavail_str = dst_avail ? "RESTRIC" : "UNAVAIL"; + break; + default: + OSMO_ASSERT(0); + } vty_out(vty, "%-16s %-5s %c %c %u %-19s %-7s %-7s %-7s %-3s%s", rt_str, - rt_avail ? "acces" : "INACC", + clsetavail_str, ' ', '0' + rt->cfg.qos_class, rt->cfg.priority, rt->cfg.linkset_name, - rt_avail ? "avail" : "UNAVAIL", - "?", - rt_avail ? "avail" : "UNAVAIL", + dst_avail ? "avail" : "UNAVAIL", + nonadj_str, + rtavail_str, rt->cfg.dyn_allocated ? "dyn" : "", VTY_NEWLINE); } diff --git a/src/xua_snm.c b/src/xua_snm.c index f3c8bb8..42361c9 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -33,6 +33,7 @@ #include "ss7_as.h" #include "ss7_asp.h" +#include "ss7_route.h" #include "ss7_internal.h" #include "ss7_route_table.h" #include "xua_internal.h" @@ -149,6 +150,39 @@ } } +/* Figure 43/Q.704, Figure 44/Q.704 */ +/* 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) +{ + struct osmo_ss7_instance *s7i = as->inst; + enum osmo_ss7_route_status new_status; + + new_status = available ? OSMO_SS7_ROUTE_STATUS_AVAILABLE : + OSMO_SS7_ROUTE_STATUS_UNAVAILABLE; + + 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 */ + uint32_t _aff_pc = ntohl(aff_pc[i]); + uint32_t pc = _aff_pc & 0xffffff; + uint8_t mask = _aff_pc >> 24; + + if (!mask) { + ss7_route_table_update_route_status_by_as(s7i->rtable_system, new_status, as, pc); + } 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); + } + } +} + /* advertise availability of point codes (with masks) */ void xua_snm_pc_available(struct osmo_ss7_as *as, const uint32_t *aff_pc, unsigned int num_aff_pc, const char *info_str, bool available) @@ -158,6 +192,9 @@ uint32_t rctx[OSMO_SS7_MAX_RCTX_COUNT]; unsigned int num_rctx; + xua_snm_srm_pc_available(as, aff_pc, num_aff_pc, available); + + /* inform local users via a MTP-{PAUSE, RESUME} primitive */ if (s7i->sccp) xua_snm_pc_available_to_sccp(s7i->sccp, aff_pc, num_aff_pc, available); diff --git a/tests/vty/osmo_stp_route_prio.vty b/tests/vty/osmo_stp_route_prio.vty index f2bfd1e..d9e3add 100644 --- a/tests/vty/osmo_stp_route_prio.vty +++ b/tests/vty/osmo_stp_route_prio.vty @@ -92,9 +92,9 @@ Destination C Q P Linkset Name Linkset Non-adj Route ---------------------- - - - ------------------- ------- ------- ------- -3.2.1/14 INACC 0 2 as3 UNAVAIL ? UNAVAIL -3.2.1/14 INACC 0 5 as2 UNAVAIL ? UNAVAIL -3.2.1/14 INACC 7 6 as1 UNAVAIL ? UNAVAIL +3.2.1/14 INACC 0 2 as3 UNAVAIL allowed UNAVAIL +3.2.1/14 INACC 0 5 as2 UNAVAIL allowed UNAVAIL +3.2.1/14 INACC 7 6 as1 UNAVAIL allowed UNAVAIL OsmoSTP(config-cs7-rt)# ! NOW ADD MORE GENERIC ROUTES (SMALLER BITMASK LENGTH) OsmoSTP(config-cs7-rt)# update route 3.2.0 7.255.0 linkset as3 priority 3 @@ -122,14 +122,14 @@ Destination C Q P Linkset Name Linkset Non-adj Route ---------------------- - - - ------------------- ------- ------- ------- -3.2.1/14 INACC 0 2 as3 UNAVAIL ? UNAVAIL -3.2.1/14 INACC 0 5 as2 UNAVAIL ? UNAVAIL -3.2.1/14 INACC 7 6 as1 UNAVAIL ? UNAVAIL -3.2.0/11 INACC 0 1 as1 UNAVAIL ? UNAVAIL - INACC 0 1 as2 UNAVAIL ? UNAVAIL - INACC 0 1 as3 UNAVAIL ? UNAVAIL -3.2.0/11 INACC 0 2 as3 UNAVAIL ? UNAVAIL -3.2.0/11 INACC 0 3 as3 UNAVAIL ? UNAVAIL +3.2.1/14 INACC 0 2 as3 UNAVAIL allowed UNAVAIL +3.2.1/14 INACC 0 5 as2 UNAVAIL allowed UNAVAIL +3.2.1/14 INACC 7 6 as1 UNAVAIL allowed UNAVAIL +3.2.0/11 INACC 0 1 as1 UNAVAIL allowed UNAVAIL + 0 1 as2 UNAVAIL allowed UNAVAIL + 0 1 as3 UNAVAIL allowed UNAVAIL +3.2.0/11 INACC 0 2 as3 UNAVAIL allowed UNAVAIL +3.2.0/11 INACC 0 3 as3 UNAVAIL allowed UNAVAIL OsmoSTP(config-cs7-rt)# do show cs7 instance 0 route binding-table 3.2.1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40556?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: Icb4f78f8da9de5a611cb6311722bf3acf1a68fc5 Gerrit-Change-Number: 40556 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: pespin <pespin(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de>

3 weeks, 5 days

1
0
0 0

[S] Change in libosmo-sigtran[master]: route_table: Constify args of serveral APIs

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40559?usp=email ) Change subject: route_table: Constify args of serveral APIs ...................................................................... route_table: Constify args of serveral APIs Change-Id: I45387df6b6d598676cd8dcd152e1f8b4cd35bba4 --- M src/ss7_route_table.c M src/ss7_route_table.h 2 files changed, 15 insertions(+), 15 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve daniel: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/ss7_route_table.c b/src/ss7_route_table.c index e59fd55..bd7b305 100644 --- a/src/ss7_route_table.c +++ b/src/ss7_route_table.c @@ -109,7 +109,7 @@ * 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(struct osmo_ss7_route_table *rtbl, uint32_t dpc, +ss7_route_table_find_route_by_dpc_mask(const struct osmo_ss7_route_table *rtbl, uint32_t dpc, uint32_t mask, bool dynamic) { struct osmo_ss7_combined_linkset *clset; @@ -142,7 +142,7 @@ * 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, +ss7_route_table_find_route_by_dpc_mask_as(const 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; @@ -173,7 +173,7 @@ } struct osmo_ss7_combined_linkset * -ss7_route_table_find_combined_linkset_by_dpc(struct osmo_ss7_route_table *rtbl, uint32_t dpc) +ss7_route_table_find_combined_linkset_by_dpc(const struct osmo_ss7_route_table *rtbl, uint32_t dpc) { struct osmo_ss7_combined_linkset *clset; @@ -192,7 +192,7 @@ } struct osmo_ss7_combined_linkset * -ss7_route_table_find_combined_linkset_by_dpc_mask(struct osmo_ss7_route_table *rtbl, uint32_t dpc, uint32_t mask) +ss7_route_table_find_combined_linkset_by_dpc_mask(const struct osmo_ss7_route_table *rtbl, uint32_t dpc, uint32_t mask) { struct osmo_ss7_combined_linkset *clset; @@ -213,7 +213,7 @@ } struct osmo_ss7_combined_linkset * -ss7_route_table_find_combined_linkset(struct osmo_ss7_route_table *rtbl, uint32_t dpc, uint32_t mask, uint32_t prio) +ss7_route_table_find_combined_linkset(const struct osmo_ss7_route_table *rtbl, uint32_t dpc, uint32_t mask, uint32_t prio) { struct osmo_ss7_combined_linkset *clset; @@ -244,7 +244,7 @@ return clset; } -void ss7_route_table_update_route_status_by_as(struct osmo_ss7_route_table *rtbl, enum osmo_ss7_route_status status, +void ss7_route_table_update_route_status_by_as(const struct osmo_ss7_route_table *rtbl, enum osmo_ss7_route_status status, const struct osmo_ss7_as *as, uint32_t dpc) { struct osmo_ss7_combined_linkset *clset; @@ -300,7 +300,7 @@ } struct osmo_ss7_route * -ss7_route_table_lookup_route(struct osmo_ss7_route_table *rtbl, const struct osmo_ss7_route_label *rtlabel) +ss7_route_table_lookup_route(const struct osmo_ss7_route_table *rtbl, const struct osmo_ss7_route_label *rtlabel) { struct osmo_ss7_combined_linkset *clset; struct osmo_ss7_route *rt; diff --git a/src/ss7_route_table.h b/src/ss7_route_table.h index a128915..5141c18 100644 --- a/src/ss7_route_table.h +++ b/src/ss7_route_table.h @@ -39,26 +39,26 @@ void ss7_route_table_destroy(struct osmo_ss7_route_table *rtbl); struct osmo_ss7_route * -ss7_route_table_find_route_by_dpc_mask(struct osmo_ss7_route_table *rtbl, uint32_t dpc, +ss7_route_table_find_route_by_dpc_mask(const 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, +ss7_route_table_find_route_by_dpc_mask_as(const 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); +ss7_route_table_lookup_route(const struct osmo_ss7_route_table *rtbl, const struct osmo_ss7_route_label *rtlabel); struct osmo_ss7_combined_linkset * -ss7_route_table_find_combined_linkset(struct osmo_ss7_route_table *rtbl, uint32_t dpc, uint32_t mask, uint32_t prio); +ss7_route_table_find_combined_linkset(const struct osmo_ss7_route_table *rtbl, uint32_t dpc, uint32_t mask, uint32_t prio); struct osmo_ss7_combined_linkset * ss7_route_table_find_or_create_combined_linkset(struct osmo_ss7_route_table *rtbl, uint32_t pc, uint32_t mask, uint32_t prio); struct osmo_ss7_combined_linkset * -ss7_route_table_find_combined_linkset_by_dpc(struct osmo_ss7_route_table *rtbl, uint32_t dpc); +ss7_route_table_find_combined_linkset_by_dpc(const struct osmo_ss7_route_table *rtbl, uint32_t dpc); struct osmo_ss7_combined_linkset * -ss7_route_table_find_combined_linkset_by_dpc_mask(struct osmo_ss7_route_table *rtbl, uint32_t dpc, uint32_t mask); +ss7_route_table_find_combined_linkset_by_dpc_mask(const struct osmo_ss7_route_table *rtbl, uint32_t dpc, uint32_t mask); struct osmo_ss7_combined_linkset * -ss7_route_table_find_combined_linkset(struct osmo_ss7_route_table *rtbl, uint32_t dpc, uint32_t mask, uint32_t prio); +ss7_route_table_find_combined_linkset(const struct osmo_ss7_route_table *rtbl, uint32_t dpc, uint32_t mask, uint32_t prio); -void ss7_route_table_update_route_status_by_as(struct osmo_ss7_route_table *rtbl, enum osmo_ss7_route_status status, +void ss7_route_table_update_route_status_by_as(const struct osmo_ss7_route_table *rtbl, enum osmo_ss7_route_status status, const struct osmo_ss7_as *as, uint32_t dpc); void ss7_route_table_del_routes_by_as(struct osmo_ss7_route_table *rtbl, struct osmo_ss7_as *as); void ss7_route_table_del_routes_by_linkset(struct osmo_ss7_route_table *rtbl, struct osmo_ss7_linkset *lset); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40559?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: I45387df6b6d598676cd8dcd152e1f8b4cd35bba4 Gerrit-Change-Number: 40559 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>

3 weeks, 5 days

1
0
0 0

[M] Change in libosmo-sigtran[master]: route_table: Introduce ss7_route_table_dpc_is_accessible() API

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40560?usp=email ) Change subject: route_table: Introduce ss7_route_table_dpc_is_accessible() API ...................................................................... route_table: Introduce ss7_route_table_dpc_is_accessible() API In some places we don't need to select/choose a specific route (hence requiring a loadshare decision and hence modifying state), but simply figure out whether there's an available route for a given rmeote PC. Change-Id: Ia3b2eb17afae71dc7cec34b521693e776fa3576d --- M src/sccp_scrc.c M src/ss7_route_table.c M src/ss7_route_table.h M src/xua_snm.c 4 files changed, 29 insertions(+), 25 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index ebc9a11..d7a6428 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -70,9 +70,8 @@ static bool dpc_accessible(struct osmo_sccp_instance *inst, uint32_t dpc) { struct osmo_ss7_instance *ss7 = inst->ss7; - struct osmo_ss7_route *rt; - struct osmo_ss7_route_label rtlabel; char buf_dpc[MAX_PC_STR_LEN]; + bool found; if (osmo_ss7_pc_is_local(ss7, dpc)) { LOGPSCI(inst, LOGL_DEBUG, "dpc_accessible(DPC=%u=%s): true (local)\n", @@ -80,22 +79,14 @@ return true; } - rtlabel = (struct osmo_ss7_route_label){ - .opc = 0, - .dpc = dpc, - .sls = 0, - }; + found = ss7_route_table_dpc_is_accessible(ss7->rtable_system, dpc); - rt = ss7_instance_lookup_route(ss7, &rtlabel); - if (!rt) { - LOGPSCI(inst, LOGL_INFO, "dpc_accessible(DPC=%u=%s): false\n", - dpc, osmo_ss7_pointcode_print_buf(buf_dpc, sizeof(buf_dpc), ss7, dpc)); - return false; - } + LOGPSCI(inst, found ? LOGL_DEBUG : LOGL_INFO, + "dpc_accessible(DPC=%u=%s): %s\n", + dpc, osmo_ss7_pointcode_print_buf(buf_dpc, sizeof(buf_dpc), ss7, dpc), + found ? "true" : "false"); + return found; - LOGPSCI(inst, LOGL_DEBUG, "dpc_accessible(DPC=%u=%s): true\n", - dpc, osmo_ss7_pointcode_print_buf(buf_dpc, sizeof(buf_dpc), ss7, dpc)); - return true; } static bool sccp_available(struct osmo_sccp_instance *inst, diff --git a/src/ss7_route_table.c b/src/ss7_route_table.c index bd7b305..16eb9bd 100644 --- a/src/ss7_route_table.c +++ b/src/ss7_route_table.c @@ -299,6 +299,8 @@ } } +/* Choose a specific route to transmit a packet. + * Note: This function potentially modifies loadsharing state context of chosen combined linkset. */ struct osmo_ss7_route * ss7_route_table_lookup_route(const struct osmo_ss7_route_table *rtbl, const struct osmo_ss7_route_label *rtlabel) { @@ -322,3 +324,20 @@ } return NULL; } + +/* Figure out whether a remote PC is accessible over any route in the routing table. + * Note: Unlike ss7_route_table_lookup_route(), this function is read-only and doesn't modify any state. */ +bool ss7_route_table_dpc_is_accessible(const struct osmo_ss7_route_table *rtbl, uint32_t dpc) +{ + struct osmo_ss7_combined_linkset *clset; + /* 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 (ss7_combined_linkset_is_available(clset)) + return true; + } + return false; +} diff --git a/src/ss7_route_table.h b/src/ss7_route_table.h index 5141c18..582a8d3 100644 --- a/src/ss7_route_table.h +++ b/src/ss7_route_table.h @@ -46,6 +46,7 @@ uint32_t mask, const struct osmo_ss7_as *as, bool dynamic); struct osmo_ss7_route * ss7_route_table_lookup_route(const struct osmo_ss7_route_table *rtbl, const struct osmo_ss7_route_label *rtlabel); +bool ss7_route_table_dpc_is_accessible(const struct osmo_ss7_route_table *rtbl, uint32_t dpc); struct osmo_ss7_combined_linkset * ss7_route_table_find_combined_linkset(const struct osmo_ss7_route_table *rtbl, uint32_t dpc, uint32_t mask, uint32_t prio); diff --git a/src/xua_snm.c b/src/xua_snm.c index d4c9a75..207b042 100644 --- a/src/xua_snm.c +++ b/src/xua_snm.c @@ -375,16 +375,10 @@ uint8_t mask = _aff_pc >> 24; bool is_available; - struct osmo_ss7_route_label rtlabel = { - .opc = xua->mtp.opc, /* Use OPC of received DAUD. */ - .dpc = pc, - .sls = 0, - }; - if (mask == 0) { /* one single point code */ /* Check if there's an "active" route available: */ - is_available = !!ss7_instance_lookup_route(s7i, &rtlabel); + is_available = ss7_route_table_dpc_is_accessible(s7i->rtable_system, pc); xua_tx_snm_available(asp, rctx, num_rctx, &aff_pc[i], 1, "Response to DAUD", is_available); @@ -397,8 +391,7 @@ uint32_t *aff_pc_avail = talloc_size(asp, sizeof(uint32_t)*(1 << mask)); uint32_t *aff_pc_unavail = talloc_size(asp, sizeof(uint32_t)*(1 << mask)); for (fullpc = (pc & ~maskbits); fullpc <= (pc | maskbits); fullpc++) { - rtlabel.dpc = fullpc; - is_available = !!ss7_instance_lookup_route(s7i, &rtlabel); + is_available = ss7_route_table_dpc_is_accessible(s7i->rtable_system, fullpc); if (is_available) aff_pc_avail[num_aff_pc_avail++] = htonl(fullpc); /* mask = 0 */ else -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40560?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: Ia3b2eb17afae71dc7cec34b521693e776fa3576d Gerrit-Change-Number: 40560 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>

3 weeks, 5 days

1
0
0 0

[M] Change in libosmo-sigtran[master]: Make sure MTP-PAUSE.ind is sent to SCCP when AS goes down

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40488?usp=email ) Change subject: Make sure MTP-PAUSE.ind is sent to SCCP when AS goes down ...................................................................... Make sure MTP-PAUSE.ind is sent to SCCP when AS goes down Whenever an SCTP link goes down, it may affect current set of accessible DPCs if any of the routes (AS) using that ASP become inactive. The approach presented in this patch is to, based on existing route table, figure out which DPCs may have been accessible before the AS went down, and then figure out which of those are not reachable anymore, then send MTP-PAUSE.ind for those. In turn, SCCP will trigger N-PCSTATE.ind towards its users. Change-Id: I0f28b049045fbea93fe91c99251e7aaa40c014e5 --- M src/xua_as_fsm.c 1 file changed, 93 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c index 6a8941b..eb3ac49 100644 --- a/src/xua_as_fsm.c +++ b/src/xua_as_fsm.c @@ -22,9 +22,11 @@ #include "xua_msg.h" #include <osmocom/sigtran/protocol/sua.h> #include <osmocom/sigtran/protocol/m3ua.h> +#include <sys/types.h> #include "ss7_as.h" #include "ss7_asp.h" +#include "ss7_combined_linkset.h" #include "ss7_route.h" #include "ss7_route_table.h" #include "xua_asp_fsm.h" @@ -417,12 +419,79 @@ } } +/* AS became inactive, trigger SNM PC unavailability for PCs it served: */ +static void as_snm_pc_unavailable(struct osmo_ss7_as *as) +{ + struct osmo_ss7_instance *s7i = as->inst; + struct osmo_ss7_route_table *rtbl = s7i->rtable_system; + struct osmo_ss7_combined_linkset *clset; + struct osmo_ss7_route *rt; + uint32_t aff_pc; + + LOGPAS(as, DLSS7, LOGL_INFO, "AS became inactive, some routes to remote PCs may have become unavailable\n"); + /* 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) { + llist_for_each_entry(rt, &clset->routes, list) { + if (rt->dest.as != as) + continue; + if (rt->status == OSMO_SS7_ROUTE_STATUS_UNAVAILABLE) + continue; /* Route was not available before regardless of AS state... */ + if (ss7_route_is_summary(rt)) + continue; /* Only announce changes for fully qualified routes */ + /* We found a PC served by the AS which went down. If no + * alternative route is still in place now towards that PC, announce unavailability + * to upper layers. */ + if (ss7_route_table_dpc_is_accessible(rtbl, rt->cfg.pc)) + continue; + LOGPAS(as, DLSS7, LOGL_INFO, "AS became inactive => remote pc=%u=%s is now unavailable\n", + rt->cfg.pc, osmo_ss7_pointcode_print(s7i, rt->cfg.pc)); + aff_pc = htonl(rt->cfg.pc); + xua_snm_pc_available(as, &aff_pc, 1, NULL, false); + } + } +} + +/* AS became active, trigger SNM PC availability for PCs it served: */ +static void as_snm_pc_available(struct osmo_ss7_as *as) +{ + struct osmo_ss7_instance *s7i = as->inst; + struct osmo_ss7_route_table *rtbl = s7i->rtable_system; + struct osmo_ss7_combined_linkset *clset; + struct osmo_ss7_route *rt; + uint32_t aff_pc; + + LOGPAS(as, DLSS7, LOGL_INFO, "AS became active, some routes to remote PCs may have become available\n"); + /* 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) { + llist_for_each_entry(rt, &clset->routes, list) { + if (rt->dest.as != as) + continue; + if (ss7_route_is_summary(rt)) + continue; /* Only announce changes for fully qualified routes */ + /* We found a PC served by the AS which went up. If there's + * a route now in place towards that PC, announce availability + * to upper layers. */ + if (!ss7_route_table_dpc_is_accessible(rtbl, rt->cfg.pc)) + continue; + LOGPAS(as, DLSS7, LOGL_INFO, "AS became active => remote pc=%u=%s is now available\n", + rt->cfg.pc, osmo_ss7_pointcode_print(s7i, rt->cfg.pc)); + aff_pc = htonl(rt->cfg.pc); + xua_snm_pc_available(as, &aff_pc, 1, NULL, true); + } + } +} + /* onenter call-back responsible of transmitting NTFY to all ASPs in * case of AS state changes */ static void xua_as_fsm_onenter(struct osmo_fsm_inst *fi, uint32_t old_state) { struct xua_as_fsm_priv *xafp = (struct xua_as_fsm_priv *) fi->priv; struct osmo_ss7_as *as = xafp->as; + struct osmo_ss7_instance *s7i = as->inst; struct osmo_xlm_prim_notify npar; switch (fi->state) { @@ -460,15 +529,31 @@ as_notify_all_asp(xafp->as, &npar); - /* only if we are the SG, we must start broadcasting availability information - * to everyone else */ - if (get_local_role(xafp->as) == OSMO_SS7_ASP_ROLE_SG) { + bool became_available = (old_state != XUA_AS_S_ACTIVE && fi->state == XUA_AS_S_ACTIVE); + bool became_unavailable = (old_state == XUA_AS_S_ACTIVE && fi->state != XUA_AS_S_ACTIVE); + int role = get_local_role(xafp->as); + + switch (role) { + case OSMO_SS7_ASP_ROLE_ASP: + if (s7i->sccp) { + if (became_available) + as_snm_pc_available(as); + else if (became_unavailable) + as_snm_pc_unavailable(as); + } + break; + case OSMO_SS7_ASP_ROLE_SG: + /* only if we are the SG, we must start broadcasting availability information + * to everyone else */ /* advertise availability of the routing key to others */ - uint32_t aff_pc = htonl(as->cfg.routing_key.pc); - if (old_state != XUA_AS_S_ACTIVE && fi->state == XUA_AS_S_ACTIVE) - xua_snm_pc_available(as, &aff_pc, 1, NULL, true); - else if (old_state == XUA_AS_S_ACTIVE && fi->state != XUA_AS_S_ACTIVE) - xua_snm_pc_available(as, &aff_pc, 1, NULL, false); + if (became_available || became_unavailable) { + uint32_t aff_pc = htonl(as->cfg.routing_key.pc); + xua_snm_pc_available(as, &aff_pc, 1, NULL, became_available); + } + break; + case OSMO_SS7_ASP_ROLE_IPSP: + /* TODO */ + break; } }; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40488?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: I0f28b049045fbea93fe91c99251e7aaa40c014e5 Gerrit-Change-Number: 40488 Gerrit-PatchSet: 6 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> Gerrit-CC: osmith <osmith(a)sysmocom.de>

3 weeks, 5 days

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2025