October 2026 - gerrit-log - lists.osmocom.org

[M] Change in osmocom-bb[master]: contrib/jenkins: upload to downloads.osmocom.org
by osmith 19 Oct '26

19 Oct '26

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/43916?usp=email ) Change subject: contrib/jenkins: upload to downloads.osmocom.org ...................................................................... contrib/jenkins: upload to downloads.osmocom.org Related: OS#6879 Change-Id: Ice48e7cc347c822aab19bb6646726591d2841cc3 --- M .gitignore M contrib/jenkins.sh A contrib/upload_firmware.sh 3 files changed, 95 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index 2232749..de644c9 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,6 @@ doc/manuals/osmocombb-usermanual.xml doc/manuals/common doc/manuals/build + +osmo-ci +.copy-done diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index c4b409f..fce8744 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -69,4 +69,9 @@ cd "$base/src/target/trx_toolkit" python3 -m unittest discover -v +# Upload firmware to downloads.osmocom.org +if [ "$PUBLISH" = "1" ]; then + "$base"/contrib/upload_firmware.sh +fi + osmo-clean-workspace.sh diff --git a/contrib/upload_firmware.sh b/contrib/upload_firmware.sh new file mode 100755 index 0000000..18914f3 --- /dev/null +++ b/contrib/upload_firmware.sh @@ -0,0 +1,87 @@ +#!/bin/sh -e +TOPDIR="$(realpath $(dirname "$0")/..)" +GIT_VERSION="$("$TOPDIR"/src/shared/libosmocore/git-version-gen .tarball-version)" + +copy_with_latest_and_version() { + local marker="$TOPDIR"/.copy-done + + if [ -e "$marker" ]; then + return + fi + + echo "Copying binaries with "-latest" and "-$GIT_VERSION" appended..." + + # Example paths: + # * src/target/firmware/board/se_k2xx/hello_world.highram.elf + # * src/target/firmware/board/se_k2xx/hello_world.highram.bin + cd "$TOPDIR"/src/target/firmware/board + for ext in bin elf; do + for file in */*."$ext"; do + without_ext="${file%.*}" + cp -v "$file" "$without_ext-latest.$ext" + cp -v "$file" "$without_ext-$GIT_VERSION.$ext" + done + done + + touch "$marker" +} + +prepare_ssh_cmd() { + if ! [ -d "$TOPDIR"/osmo-ci ]; then + # Get known_hosts from osmo-ci + git -C "$TOPDIR" clone -q --depth=1 https://gerrit.osmocom.org/osmo-ci + fi + export SSH_COMMAND="ssh -o UserKnownHostsFile=$TOPDIR/osmo-ci/contrib/known_hosts -p 48" +} + +ssh_mkdir_p() { + $SSH_COMMAND binaries(a)ftp.osmocom.org -- mkdir -p -v /downloads/home/binaries/"$1" +} + +upload_board_latest() { + echo "[$BOARD] Uploading latest files" + + ssh_mkdir_p web-files/osmocom-bb/firmware/"$BOARD"/latest + + rsync \ + --archive \ + --verbose \ + --compress \ + --delete \ + --rsh "$SSH_COMMAND" \ + "$BOARD"/*-latest.bin \ + "$BOARD"/*-latest.elf \ + binaries@ftp.osmocom.org:web-files/osmocom-bb/firmware/"$BOARD"/latest/ +} + +upload_board_versioned() { + echo "[$BOARD] Uploading $GIT_VERSION files" + + ssh_mkdir_p web-files/osmocom-bb/firmware/"$BOARD"/all + + rsync \ + --archive \ + --verbose \ + --compress \ + --rsh "$SSH_COMMAND" \ + --exclude "$BOARD/*-latest.{bin,elf}" \ + "$BOARD"/*-*-*.bin \ + "$BOARD"/*-*-*.elf \ + binaries@ftp.osmocom.org:web-files/osmocom-bb/firmware/"$BOARD"/all/ +} + +upload_boards_all() { + cd "$TOPDIR"/src/target/firmware/board + for BOARD in *; do + if [ -z "$(find "$BOARD" -name '*.elf')" ]; then + echo "[$BOARD] has no elf files, skipping" + continue + fi + upload_board_latest + upload_board_versioned + done +} + +copy_with_latest_and_version +prepare_ssh_cmd +upload_boards_all -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/43916?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ice48e7cc347c822aab19bb6646726591d2841cc3 Gerrit-Change-Number: 43916 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ci[master]: jobs/master-builds: osmocom-bb: allow binaries upload
by osmith 19 Oct '26

19 Oct '26

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/43917?usp=email ) Change subject: jobs/master-builds: osmocom-bb: allow binaries upload ...................................................................... jobs/master-builds: osmocom-bb: allow binaries upload Make the SSH key for uploading binaries available for the osmocom-bb job, so it can upload the binaries at the end. Related: OS#6879 Change-Id: I566bd56a95087907bd5b794d900a387cc0d534c2 --- M jobs/master-builds.yml 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index d915ccb..a0c0ad7 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -572,7 +572,11 @@ -e WITH_MANUALS="$WITH_MANUALS" \ "$DOCKER_IMG" {wrapper_cmd} $SETARCH_CMD /build/contrib/jenkins.sh - - osmocom-bb + - osmocom-bb: + ssh: + - binaries_ftp.osmocom.org + - docs_ftp.osmocom.org + - osmo-sysmon - osmo-remsim - osmo-asf4-dfu: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43917?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I566bd56a95087907bd5b794d900a387cc0d534c2 Gerrit-Change-Number: 43917 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmocom-bb[master]: contrib/jenkins: upload to downloads.osmocom.org
by osmith 19 Oct '26

19 Oct '26

Attention is currently required from: fixeria, laforge. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmocom-bb/+/43916?usp=email ) Change subject: contrib/jenkins: upload to downloads.osmocom.org ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS1: > For most of the targets, the firmware does read and apply the calibration data. […] Marking this as resolved, whether to enable Tx or not by default / for the images published is something that should be done separately IMHO. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/43916?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ice48e7cc347c822aab19bb6646726591d2841cc3 Gerrit-Change-Number: 43916 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 Oct 2026 06:23:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmocom-bb[master]: contrib/jenkins: build all with werr + distcheck
by osmith 19 Oct '26

19 Oct '26

osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/43915?usp=email ) Change subject: contrib/jenkins: build all with werr + distcheck ...................................................................... Abandoned https://gerrit.osmocom.org/c/osmocom-bb/+/43858 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/43915?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I902262a9e6ab0e6279cc1da09992701925ea87ea Gerrit-Change-Number: 43915 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmocom-bb[master]: osmocon: fix "make distcheck"
by osmith 19 Oct '26

19 Oct '26

osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/43914?usp=email ) Change subject: osmocon: fix "make distcheck" ...................................................................... Abandoned https://gerrit.osmocom.org/c/osmocom-bb/+/43856 https://gerrit.osmocom.org/c/osmocom-bb/+/43857 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/43914?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2008312609eaa0cf60233b0e95818a2fc76ae48b Gerrit-Change-Number: 43914 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmocom-bb[master]: osmocon: fix -Werror=old-style-definition
by osmith 19 Oct '26

19 Oct '26

osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/43913?usp=email ) Change subject: osmocon: fix -Werror=old-style-definition ...................................................................... Abandoned https://gerrit.osmocom.org/c/osmocom-bb/+/43855/1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/43913?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9bdb9439685c00403b5a09a81ef7bf556c709b7b Gerrit-Change-Number: 43913 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: Create dynamic routes for AS statically configured routing-key
by pespin 17 Oct '26

17 Oct '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/43831?usp=email ) Change subject: Create dynamic routes for AS statically configured routing-key ...................................................................... Create dynamic routes for AS statically configured routing-key We already do so for routing-keys registered through RKM. Let's do it too for statically configured ones. This makes it easier to configure default routing on an STP, since there's no need to set up "update route" for the most usual cases. If specific routing is required (eg. combined linkset loadsharing use over multiple AS on a given PC), it can still be configured manually using a higher prio in the routing table. The newly created dynamic routes contain the "match_as_routing_key" setting, which means they are only usable to route a given message if its routing label matches the routing-key of the AS. This opens the door to improved traffic forwarding security as well as more fine-grained traffic routing selection based on eg. OPC. So far only matching on DPC and optionaly on OPC is supported. Matching on SI and SSN is left as TODO work for the future. Related: OS#7070 Change-Id: Ie74f4b502d4e5beacbf1ac5cd772b8735ea853ed --- M src/ss7_as.c M src/ss7_as_vty.c M src/ss7_combined_linkset.c M src/ss7_route.c M src/ss7_route.h M src/ss7_vty.c M tests/vty/osmo_stp_route_prio.vty 7 files changed, 76 insertions(+), 21 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/src/ss7_as.c b/src/ss7_as.c index 3d856b3..59e9e06 100644 --- a/src/ss7_as.c +++ b/src/ss7_as.c @@ -757,6 +757,8 @@ if (ss7_route_set_linkset(rt, as->cfg.name) < 0) goto ret_free; + rt->cfg.match_as_routing_key = true; + rc = ss7_route_insert(rt); if (rc == -EADDRINUSE) { talloc_free(rt); @@ -783,6 +785,13 @@ if (!rt) return -ENOENT; + if (!rt->cfg.match_as_routing_key) { + LOGPAS(as, DLSS7, LOGL_NOTICE, + "Skip removing route %s without match-routing-key field!\n", + osmo_ss7_route_name(rt, false)); + return 0; + } + /* Release the associated route */ ss7_route_destroy(rt); return 0; diff --git a/src/ss7_as_vty.c b/src/ss7_as_vty.c index ca00ae3..a481a2b 100644 --- a/src/ss7_as_vty.c +++ b/src/ss7_as_vty.c @@ -446,6 +446,9 @@ ssn = OSSMO_SS7_RKEY_SSN_UNSET; } + /* Drop previous route if exists: */ + ss7_as_routing_key_delete_route(as); + rkey->context = rctx; /* truncate mask to maximum. Let's avoid callers specifying arbitrary large * masks to ensure we don't fail duplicate detection with longer mask lengths */ @@ -454,6 +457,13 @@ rkey->opc_mask = osmo_ss7_pc_normalize(&as->inst->cfg.pc_fmt, opc_mask); rkey->si = si; rkey->ssn = ssn; + + /* Add fully qualified route for routing-key: */ + if (ss7_as_routing_key_create_route(as) < 0) { + vty_out(vty, "Failed adding dynamic match-routing-key route for AS %s!%s", + as->cfg.name, VTY_NEWLINE); + return CMD_WARNING; + } return CMD_SUCCESS; } diff --git a/src/ss7_combined_linkset.c b/src/ss7_combined_linkset.c index 9f53b7b..59c7007 100644 --- a/src/ss7_combined_linkset.c +++ b/src/ss7_combined_linkset.c @@ -193,11 +193,12 @@ } /* ITU Q.704 4.2.1: "current link set (combined link set)". Pick available already selected route */ -struct osmo_ss7_route *current_rt(const struct osmo_ss7_esls_entry *eslse) +struct osmo_ss7_route *current_rt(const struct osmo_ss7_esls_entry *eslse, + const struct osmo_ss7_route_label *rtlabel) { - if (eslse->normal_rt && ss7_route_is_available(eslse->normal_rt)) + if (eslse->normal_rt && ss7_route_is_available_for_rtlabel(eslse->normal_rt, rtlabel)) return eslse->normal_rt; - if (eslse->alt_rt && ss7_route_is_available(eslse->alt_rt)) + if (eslse->alt_rt && ss7_route_is_available_for_rtlabel(eslse->alt_rt, rtlabel)) return eslse->alt_rt; return NULL; } @@ -223,13 +224,14 @@ } /* Pick an available route from Combined Linkset in a round-robin fashion, to send a message through. */ -static struct osmo_ss7_route *ss7_combined_linkset_select_route_roundrobin(struct osmo_ss7_combined_linkset *clset) +static struct osmo_ss7_route *ss7_combined_linkset_select_route_roundrobin(struct osmo_ss7_combined_linkset *clset, + const struct osmo_ss7_route_label *rtlabel) { struct osmo_ss7_route *rt; for (unsigned int i = 0; i < clset->num_routes; i++) { rt = ss7_llist_round_robin(&clset->routes, &clset->last_route_roundrobin_tx, struct osmo_ss7_route, list); - if (rt && ss7_route_is_available(rt)) + if (rt && ss7_route_is_available_for_rtlabel(rt, rtlabel)) return rt; } return NULL; @@ -245,7 +247,7 @@ char buf[256]; /* First check if we have a cached route for this ESLS */ - rt = current_rt(eslse); + rt = current_rt(eslse, rtlabel); if (rt) { if (rt == eslse->normal_rt) { /* We can transmit over normal route. @@ -279,7 +281,7 @@ if (!rt) return NULL; eslse->normal_rt = rt; - rt_avail = ss7_route_is_available(eslse->normal_rt); + rt_avail = ss7_route_is_available_for_rtlabel(eslse->normal_rt, rtlabel); LOGPCLSET(clset, DLSS7, LOGL_INFO, "RT loookup: %s -> eSLS=%u: " "picked Normal Route via '%s' round-robin style (%s)\n", ss7_route_label_to_str(buf, sizeof(buf), inst, rtlabel), esls, @@ -295,7 +297,7 @@ /* Normal route unavailable and no alternative route (or unavailable too). * start ITU Q.704 section 7 "forced rerouting" procedure: */ - rt = ss7_combined_linkset_select_route_roundrobin(clset); + rt = ss7_combined_linkset_select_route_roundrobin(clset, rtlabel); if (rt) { eslse->alt_rt = rt; LOGPCLSET(clset, DLSS7, LOGL_NOTICE, "RT Lookup: %s -> eSLS=%u: " diff --git a/src/ss7_route.c b/src/ss7_route.c index a75b32c..d0a6c69 100644 --- a/src/ss7_route.c +++ b/src/ss7_route.c @@ -147,6 +147,7 @@ rt->cfg.pc = osmo_ss7_pc_normalize(&rtbl->inst->cfg.pc_fmt, pc); rt->cfg.priority = OSMO_SS7_ROUTE_PRIO_DEFAULT; rt->cfg.dyn_allocated = dynamic; + rt->cfg.match_as_routing_key = false; osmo_timer_setup(&rt->t10_audit_timer, t10_audit_timer_cb, rt); @@ -228,7 +229,8 @@ struct osmo_ss7_route *prev_rt; llist_for_each_entry(prev_rt, &clset->routes, list) { if (strcmp(prev_rt->cfg.linkset_name, rt->cfg.linkset_name) == 0 && - prev_rt->cfg.dyn_allocated == rt->cfg.dyn_allocated) { + prev_rt->cfg.dyn_allocated == rt->cfg.dyn_allocated && + prev_rt->cfg.match_as_routing_key == rt->cfg.match_as_routing_key) { LOGPRT(rt, DLSS7, LOGL_ERROR, "Refusing to create route with existing linkset/AS name '%s'\n", rt->cfg.linkset_name); return -EADDRINUSE; @@ -384,6 +386,8 @@ if (rt->dest.as) { struct osmo_ss7_as *as = rt->dest.as; + if (rt->cfg.match_as_routing_key) + APPEND(" match-routing-key"); APPEND(" via AS %s proto=%s", as->cfg.name, osmo_ss7_asp_protocol_name(as->cfg.proto)); if (list_asps) { @@ -457,6 +461,25 @@ return false; } +bool ss7_route_is_available_for_rtlabel(const struct osmo_ss7_route *rt, + const struct osmo_ss7_route_label *rtlabel) +{ + if (!ss7_route_dest_is_available(rt)) + return false; + if (rt->cfg.match_as_routing_key) { + struct osmo_ss7_as *as = rt->dest.as; + OSMO_ASSERT(as); + struct osmo_ss7_routing_key *rkey = &as->cfg.routing_key; + if (rtlabel->dpc != rkey->pc) + return false; + if ((rtlabel->opc & rkey->opc_mask) != rkey->opc) + return false; + /* TODO: match rkey->si */ + /* TODO: match rkey->ssn */ + } + return true; +} + /* Whether route mask identifies a single DPC. */ bool ss7_route_is_fully_qualified(const struct osmo_ss7_route *rt) { diff --git a/src/ss7_route.h b/src/ss7_route.h index 437a5d8..fa6bdc9 100644 --- a/src/ss7_route.h +++ b/src/ss7_route.h @@ -10,6 +10,7 @@ struct osmo_ss7_instance; struct osmo_ss7_route_table; +struct osmo_ss7_route_label; struct osmo_ss7_linkset; struct osmo_ss7_as; @@ -54,6 +55,7 @@ uint32_t priority; uint8_t qos_class; bool dyn_allocated; + bool match_as_routing_key; } cfg; }; @@ -75,6 +77,8 @@ 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_available_for_rtlabel(const struct osmo_ss7_route *rt, + const struct osmo_ss7_route_label *rtlabel); 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) diff --git a/src/ss7_vty.c b/src/ss7_vty.c index 935529e..2127958 100644 --- a/src/ss7_vty.c +++ b/src/ss7_vty.c @@ -609,7 +609,7 @@ default: OSMO_ASSERT(0); } - vty_out(vty, "%-16s %-5s %c %c %u %-19s %-7s %-7s %-7s %-3s%s", + vty_out(vty, "%-16s %-5s %c %c %u %-19s %-7s %-7s %-7s %-3s %-17s%s", rt_str, clsetavail_str, ' ', @@ -620,6 +620,7 @@ nonadj_str, rtavail_str, rt->cfg.dyn_allocated ? "dyn" : "", + rt->cfg.match_as_routing_key ? "match-routing-key" : "", VTY_NEWLINE); } } diff --git a/tests/vty/osmo_stp_route_prio.vty b/tests/vty/osmo_stp_route_prio.vty index 54c9475..2422043 100644 --- a/tests/vty/osmo_stp_route_prio.vty +++ b/tests/vty/osmo_stp_route_prio.vty @@ -94,9 +94,12 @@ Destination C Q P Linkset Name Linkset Non-adj Route ---------------------- - - - ------------------- ------- ------- ------- -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.1/14 INACC 0 2 as3 UNAVAIL allowed UNAVAIL +0.1.2/14 INACC 0 5 as1 UNAVAIL allowed UNAVAIL dyn match-routing-key +0.1.3/14 INACC 0 5 as2 UNAVAIL allowed UNAVAIL dyn match-routing-key +0.1.4/14 INACC 0 5 as3 UNAVAIL allowed UNAVAIL dyn match-routing-key +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 @@ -124,14 +127,17 @@ Destination C Q P Linkset Name Linkset Non-adj Route ---------------------- - - - ------------------- ------- ------- ------- -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 +3.2.1/14 INACC 0 2 as3 UNAVAIL allowed UNAVAIL +0.1.2/14 INACC 0 5 as1 UNAVAIL allowed UNAVAIL dyn match-routing-key +0.1.3/14 INACC 0 5 as2 UNAVAIL allowed UNAVAIL dyn match-routing-key +0.1.4/14 INACC 0 5 as3 UNAVAIL allowed UNAVAIL dyn match-routing-key +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/+/43831?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: Ie74f4b502d4e5beacbf1ac5cd772b8735ea853ed Gerrit-Change-Number: 43831 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-sigtran[master]: ss7_as_vty: Warn user that AS routing-key filtering based on SSN is n...
by pespin 17 Oct '26

17 Oct '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/43911?usp=email ) Change subject: ss7_as_vty: Warn user that AS routing-key filtering based on SSN is not implemented ...................................................................... ss7_as_vty: Warn user that AS routing-key filtering based on SSN is not implemented The feature is not yet ready, so better warn the user in case expectancy is the feature to work. Related: OS#7070 Change-Id: I8ff07699e3436c76b1859f0a02cf1279d3c2399d --- M src/ss7_as_vty.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/ss7_as_vty.c b/src/ss7_as_vty.c index a481a2b..6197093 100644 --- a/src/ss7_as_vty.c +++ b/src/ss7_as_vty.c @@ -441,6 +441,8 @@ osmo_ss7_asp_protocol_name(as->cfg.proto), VTY_NEWLINE); return CMD_WARNING; } + vty_out(vty, "%% NOTE: routing-key based on SSN is not yet implemented, " + "all SSNs will be accepted regardless of configuration (See OS#7070)%s", VTY_NEWLINE); } } else { ssn = OSSMO_SS7_RKEY_SSN_UNSET; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/43911?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: I8ff07699e3436c76b1859f0a02cf1279d3c2399d Gerrit-Change-Number: 43911 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in libosmo-sigtran[master]: Support AS routing filtering based on its routing-key SI
by pespin 17 Oct '26

17 Oct '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/43845?usp=email ) Change subject: Support AS routing filtering based on its routing-key SI ...................................................................... Support AS routing filtering based on its routing-key SI Pass the full ss7_mtp3_rtlabel instead of the generic osmo_ss7_routing_label to combined_linkset() lookup, which contains also the SIO of the message being routed. Then, update ss7_route_is_available_for_rtlabel() -> ss7_route_is_available_for_mtp3_rtlabel() to also take into account the SIO field when figuring out if the message can be routed to an AS. Also update the VTY "route-lookup" command to require an SI from the user, since routing may changed based on it now. Related: OS#7070 Change-Id: Iec4af5d9a3607747006c26e2baa61ab945f88532 --- M src/ss7_combined_linkset.c M src/ss7_combined_linkset.h M src/ss7_route.c M src/ss7_route.h M src/ss7_route_table.c M src/ss7_vty.c M tests/ss7/ss7_test.err M tests/vty/osmo_stp_route_prio.vty M tests/vty/osmo_stp_test.vty M tests/vty/ss7_asp_test.vty 10 files changed, 55 insertions(+), 51 deletions(-) Approvals: Jenkins Builder: Verified osmith: 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 diff --git a/src/ss7_combined_linkset.c b/src/ss7_combined_linkset.c index 59c7007..b3b4ccd 100644 --- a/src/ss7_combined_linkset.c +++ b/src/ss7_combined_linkset.c @@ -172,11 +172,11 @@ 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) +static ext_sls_t osmo_ss7_instance_calc_itu_ext_sls(const struct osmo_ss7_instance *inst, const struct ss7_mtp3_rtlabel *mtp3_rtlb) { /* Take 6 bits from OPC and DPC according to config: */ - uint8_t opc6 = (uint8_t)((rtlabel->opc >> inst->cfg.opc_shift) & 0x3f); - uint8_t dpc6 = (uint8_t)((rtlabel->dpc >> inst->cfg.dpc_shift) & 0x3f); + uint8_t opc6 = (uint8_t)((mtp3_rtlb->rtlabel.opc >> inst->cfg.opc_shift) & 0x3f); + uint8_t dpc6 = (uint8_t)((mtp3_rtlb->rtlabel.dpc >> inst->cfg.dpc_shift) & 0x3f); /* Derivate 3-bit value from OPC and DPC: */ uint8_t opc3 = ((opc6 >> 3) ^ (opc6 & 0x07)) & 0x07; @@ -184,7 +184,7 @@ uint8_t opc_dpc3 = (opc3 ^ dpc3) & 0x07; /* Generate 7 bit extended-SLS: 3-bit OPC-DPC + 4 bit SLS: */ - uint8_t ext_sls = (opc_dpc3 << 4) | ((rtlabel->sls) & 0x0f); + uint8_t ext_sls = (opc_dpc3 << 4) | ((mtp3_rtlb->rtlabel.sls) & 0x0f); OSMO_ASSERT(ext_sls < NUM_EXT_SLS); /* Pick extended-SLS bits according to config: */ @@ -194,11 +194,11 @@ /* ITU Q.704 4.2.1: "current link set (combined link set)". Pick available already selected route */ struct osmo_ss7_route *current_rt(const struct osmo_ss7_esls_entry *eslse, - const struct osmo_ss7_route_label *rtlabel) + const struct ss7_mtp3_rtlabel *mtp3_rtlb) { - if (eslse->normal_rt && ss7_route_is_available_for_rtlabel(eslse->normal_rt, rtlabel)) + if (eslse->normal_rt && ss7_route_is_available_for_mtp3_rtlabel(eslse->normal_rt, mtp3_rtlb)) return eslse->normal_rt; - if (eslse->alt_rt && ss7_route_is_available_for_rtlabel(eslse->alt_rt, rtlabel)) + if (eslse->alt_rt && ss7_route_is_available_for_mtp3_rtlabel(eslse->alt_rt, mtp3_rtlb)) return eslse->alt_rt; return NULL; } @@ -225,29 +225,29 @@ /* Pick an available route from Combined Linkset in a round-robin fashion, to send a message through. */ static struct osmo_ss7_route *ss7_combined_linkset_select_route_roundrobin(struct osmo_ss7_combined_linkset *clset, - const struct osmo_ss7_route_label *rtlabel) + const struct ss7_mtp3_rtlabel *mtp3_rtlb) { struct osmo_ss7_route *rt; for (unsigned int i = 0; i < clset->num_routes; i++) { rt = ss7_llist_round_robin(&clset->routes, &clset->last_route_roundrobin_tx, struct osmo_ss7_route, list); - if (rt && ss7_route_is_available_for_rtlabel(rt, rtlabel)) + if (rt && ss7_route_is_available_for_mtp3_rtlabel(rt, mtp3_rtlb)) return rt; } return NULL; } struct osmo_ss7_route * -ss7_combined_linkset_lookup_route(struct osmo_ss7_combined_linkset *clset, const struct osmo_ss7_route_label *rtlabel) +ss7_combined_linkset_lookup_route(struct osmo_ss7_combined_linkset *clset, const struct ss7_mtp3_rtlabel *mtp3_rtlb) { struct osmo_ss7_route *rt; struct osmo_ss7_instance *inst = clset->rtable->inst; - ext_sls_t esls = osmo_ss7_instance_calc_itu_ext_sls(inst, rtlabel); + ext_sls_t esls = osmo_ss7_instance_calc_itu_ext_sls(inst, mtp3_rtlb); struct osmo_ss7_esls_entry *eslse = &clset->esls_table[esls]; char buf[256]; /* First check if we have a cached route for this ESLS */ - rt = current_rt(eslse, rtlabel); + rt = current_rt(eslse, mtp3_rtlb); if (rt) { if (rt == eslse->normal_rt) { /* We can transmit over normal route. @@ -255,14 +255,14 @@ if (eslse->alt_rt) { LOGPCLSET(clset, DLSS7, LOGL_NOTICE, "RT lookup: %s -> eSLS=%u: " "Normal Route via '%s' became available, drop use of Alternative Route via '%s'\n", - ss7_route_label_to_str(buf, sizeof(buf), inst, rtlabel), esls, + ss7_mtp3_rtlabel_to_str(buf, sizeof(buf), inst, mtp3_rtlb), esls, eslse->normal_rt->dest.as ? eslse->normal_rt->dest.as->cfg.name : "<linkset>", eslse->alt_rt->dest.as ? eslse->alt_rt->dest.as->cfg.name : "<linkset>"); eslse->alt_rt = NULL; } LOGPCLSET(clset, DLSS7, LOGL_DEBUG, "RT lookup: %s -> eSLS=%u: use Normal Route via '%s'\n", - ss7_route_label_to_str(buf, sizeof(buf), inst, rtlabel), esls, + ss7_mtp3_rtlabel_to_str(buf, sizeof(buf), inst, mtp3_rtlb), esls, eslse->normal_rt->dest.as ? eslse->normal_rt->dest.as->cfg.name : "<linkset>"); return rt; } @@ -281,10 +281,10 @@ if (!rt) return NULL; eslse->normal_rt = rt; - rt_avail = ss7_route_is_available_for_rtlabel(eslse->normal_rt, rtlabel); + rt_avail = ss7_route_is_available_for_mtp3_rtlabel(eslse->normal_rt, mtp3_rtlb); LOGPCLSET(clset, DLSS7, LOGL_INFO, "RT loookup: %s -> eSLS=%u: " "picked Normal Route via '%s' round-robin style (%s)\n", - ss7_route_label_to_str(buf, sizeof(buf), inst, rtlabel), esls, + ss7_mtp3_rtlabel_to_str(buf, sizeof(buf), inst, mtp3_rtlb), esls, rt->dest.as ? rt->dest.as->cfg.name : "<linkset>", rt_avail ? "available" : "unavailable"); if (rt_avail) { @@ -297,19 +297,19 @@ /* Normal route unavailable and no alternative route (or unavailable too). * start ITU Q.704 section 7 "forced rerouting" procedure: */ - rt = ss7_combined_linkset_select_route_roundrobin(clset, rtlabel); + rt = ss7_combined_linkset_select_route_roundrobin(clset, mtp3_rtlb); if (rt) { eslse->alt_rt = rt; LOGPCLSET(clset, DLSS7, LOGL_NOTICE, "RT Lookup: %s -> eSLS=%u: " "Normal Route via '%s' unavailable, picked Alternative Route via '%s' round-robin style\n", - ss7_route_label_to_str(buf, sizeof(buf), inst, rtlabel), esls, + ss7_mtp3_rtlabel_to_str(buf, sizeof(buf), inst, mtp3_rtlb), esls, eslse->normal_rt->dest.as ? eslse->normal_rt->dest.as->cfg.name : "<linkset>", eslse->alt_rt->dest.as ? eslse->alt_rt->dest.as->cfg.name : "<linkset>"); } else { /* No alternative route found, NULL is returned. */ LOGPCLSET(clset, DLSS7, LOGL_INFO, "RT Lookup: %s -> eSLS=%u: " "Normal Route via '%s' unavailable, all Alternative Routes unavailable\n", - ss7_route_label_to_str(buf, sizeof(buf), inst, rtlabel), esls, + ss7_mtp3_rtlabel_to_str(buf, sizeof(buf), inst, mtp3_rtlb), esls, eslse->normal_rt->dest.as ? eslse->normal_rt->dest.as->cfg.name : "<linkset>"); } return rt; diff --git a/src/ss7_combined_linkset.h b/src/ss7_combined_linkset.h index e3756b6..8058b6a 100644 --- a/src/ss7_combined_linkset.h +++ b/src/ss7_combined_linkset.h @@ -10,7 +10,7 @@ struct osmo_ss7_instance; struct osmo_ss7_link; -struct osmo_ss7_route_label; +struct ss7_mtp3_rtlabel; #define NUM_EXT_SLS 128 typedef uint8_t ext_sls_t; /* range: 0-127, 7 bit */ @@ -56,7 +56,7 @@ void 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); +ss7_combined_linkset_lookup_route(struct osmo_ss7_combined_linkset *clset, const struct ss7_mtp3_rtlabel *mtp3_rtlb); bool ss7_combined_linkset_is_available(const struct osmo_ss7_combined_linkset *clset); #define LOGPCLSET(clset, subsys, level, fmt, args ...) do { \ diff --git a/src/ss7_route.c b/src/ss7_route.c index d0a6c69..550bfae 100644 --- a/src/ss7_route.c +++ b/src/ss7_route.c @@ -461,8 +461,8 @@ return false; } -bool ss7_route_is_available_for_rtlabel(const struct osmo_ss7_route *rt, - const struct osmo_ss7_route_label *rtlabel) +bool ss7_route_is_available_for_mtp3_rtlabel(const struct osmo_ss7_route *rt, + const struct ss7_mtp3_rtlabel *mtp3_rtlb) { if (!ss7_route_dest_is_available(rt)) return false; @@ -470,11 +470,13 @@ struct osmo_ss7_as *as = rt->dest.as; OSMO_ASSERT(as); struct osmo_ss7_routing_key *rkey = &as->cfg.routing_key; - if (rtlabel->dpc != rkey->pc) + if (mtp3_rtlb->rtlabel.dpc != rkey->pc) return false; - if ((rtlabel->opc & rkey->opc_mask) != rkey->opc) + if ((mtp3_rtlb->rtlabel.opc & rkey->opc_mask) != rkey->opc) return false; - /* TODO: match rkey->si */ + if (rkey->si != OSSMO_SS7_RKEY_SI_UNSET && + MTP_SIO_SI(mtp3_rtlb->sio) != rkey->si) + return false; /* TODO: match rkey->ssn */ } return true; diff --git a/src/ss7_route.h b/src/ss7_route.h index fa6bdc9..04edb8c 100644 --- a/src/ss7_route.h +++ b/src/ss7_route.h @@ -10,7 +10,7 @@ struct osmo_ss7_instance; struct osmo_ss7_route_table; -struct osmo_ss7_route_label; +struct ss7_mtp3_rtlabel; struct osmo_ss7_linkset; struct osmo_ss7_as; @@ -77,8 +77,8 @@ 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_available_for_rtlabel(const struct osmo_ss7_route *rt, - const struct osmo_ss7_route_label *rtlabel); +bool ss7_route_is_available_for_mtp3_rtlabel(const struct osmo_ss7_route *rt, + const struct ss7_mtp3_rtlabel *mtp3_rtlb); 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) diff --git a/src/ss7_route_table.c b/src/ss7_route_table.c index 9523d99..b115c24 100644 --- a/src/ss7_route_table.c +++ b/src/ss7_route_table.c @@ -361,7 +361,7 @@ llist_for_each_entry(clset, &rtbl->combined_linksets, list) { if ((rtlb.rtlabel.dpc & clset->cfg.mask) != clset->cfg.pc) continue; - rt = ss7_combined_linkset_lookup_route(clset, &rtlb.rtlabel); + rt = ss7_combined_linkset_lookup_route(clset, &rtlb); if (!rt) continue; return rt; diff --git a/src/ss7_vty.c b/src/ss7_vty.c index 2127958..e53f36f 100644 --- a/src/ss7_vty.c +++ b/src/ss7_vty.c @@ -736,19 +736,21 @@ } DEFUN(show_cs7_route_lookup, show_cs7_route_lookup_cmd, - "show cs7 instance <0-15> route-lookup POINT_CODE from POINT_CODE sls <0-15> [list-asps]", + "show cs7 instance <0-15> route-lookup POINT_CODE from POINT_CODE sls <0-15> si <0-15> [list-asps]", SHOW_STR CS7_STR INST_STR INST_STR "Look up route\n" "Destination PC\n" "From\n" "Origin PC\n" "SLS\n" "SLS value\n" + "Service Indicator\n" "SI value\n" "List ASPs of the AS if route points to an AS") { int id = atoi(argv[0]); - bool list_asps = argc > 4; + bool list_asps = argc > 5; struct osmo_ss7_instance *inst; struct osmo_ss7_route *rt; struct ss7_mtp3_rtlabel mtp3_rtlb = {}; int pc; + int si; inst = osmo_ss7_instance_find(id); if (!inst) { @@ -769,16 +771,16 @@ return CMD_WARNING; } mtp3_rtlb.rtlabel.opc = pc; - mtp3_rtlb.rtlabel.sls = atoi(argv[3]); - /* TODO: set mtp3_rtlb.sio through VTY param once we use it during route lookup below: */ + si = atoi(argv[4]); + mtp3_rtlb.sio = MTP_SIO(si, inst->cfg.network_indicator); rt = ss7_instance_lookup_route(inst, &mtp3_rtlb); if (!rt) { char buf[256]; vty_out(vty, "No route found for label '%s'%s", - ss7_route_label_to_str(buf, sizeof(buf), inst, &mtp3_rtlb.rtlabel), VTY_NEWLINE); + ss7_mtp3_rtlabel_to_str(buf, sizeof(buf), inst, &mtp3_rtlb), VTY_NEWLINE); return CMD_WARNING; } diff --git a/tests/ss7/ss7_test.err b/tests/ss7/ss7_test.err index 7333bb6..358f7bb 100644 --- a/tests/ss7/ss7_test.err +++ b/tests/ss7/ss7_test.err @@ -10,20 +10,20 @@ DLSS7 INFO 0: Creating Linkset b DLSS7 INFO 0: Creating Link b:0 DLSS7 INFO 0: RT(dpc=12=0.1.4,mask=0x3fff=7.255.7,prio=5,via=a,st=available) Creating route: pc=12=0.1.4 mask=0x3fff=7.255.7 prio=5 via linkset a -DLSS7 INFO 0: CombinedLinkset(dpc=12=0.1.4,mask=0x3fff=7.255.7,prio=5) RT loookup: OPC=0=0.0.0,DPC=12=0.1.4,SLS=0 -> eSLS=80: picked Normal Route via '<linkset>' round-robin style (available) +DLSS7 INFO 0: CombinedLinkset(dpc=12=0.1.4,mask=0x3fff=7.255.7,prio=5) RT loookup: OPC=0=0.0.0,DPC=12=0.1.4,SLS=0,SIO=3=sccp -> eSLS=80: picked Normal Route via '<linkset>' round-robin style (available) DLSS7 INFO 0: RT(dpc=12=0.1.4,mask=0x3fff=7.255.7,prio=5,via=a,st=available) Destroying route: pc=12=0.1.4 mask=0x3fff=7.255.7 prio=5 via linkset a DLSS7 INFO 0: RT(dpc=8=0.1.0,mask=0x3ff8=7.255.0,prio=5,via=a,st=available) Creating route: pc=8=0.1.0 mask=0x3ff8=7.255.0 prio=5 via linkset a -DLSS7 INFO 0: CombinedLinkset(dpc=8=0.1.0,mask=0x3ff8=7.255.0,prio=5) RT loookup: OPC=0=0.0.0,DPC=8=0.1.0,SLS=0 -> eSLS=16: picked Normal Route via '<linkset>' round-robin style (available) -DLSS7 INFO 0: CombinedLinkset(dpc=8=0.1.0,mask=0x3ff8=7.255.0,prio=5) RT loookup: OPC=0=0.0.0,DPC=9=0.1.1,SLS=0 -> eSLS=0: picked Normal Route via '<linkset>' round-robin style (available) -DLSS7 INFO 0: CombinedLinkset(dpc=8=0.1.0,mask=0x3ff8=7.255.0,prio=5) RT loookup: OPC=0=0.0.0,DPC=12=0.1.4,SLS=0 -> eSLS=80: picked Normal Route via '<linkset>' round-robin style (available) -DLSS7 INFO 0: CombinedLinkset(dpc=8=0.1.0,mask=0x3ff8=7.255.0,prio=5) RT loookup: OPC=0=0.0.0,DPC=15=0.1.7,SLS=0 -> eSLS=96: picked Normal Route via '<linkset>' round-robin style (available) +DLSS7 INFO 0: CombinedLinkset(dpc=8=0.1.0,mask=0x3ff8=7.255.0,prio=5) RT loookup: OPC=0=0.0.0,DPC=8=0.1.0,SLS=0,SIO=3=sccp -> eSLS=16: picked Normal Route via '<linkset>' round-robin style (available) +DLSS7 INFO 0: CombinedLinkset(dpc=8=0.1.0,mask=0x3ff8=7.255.0,prio=5) RT loookup: OPC=0=0.0.0,DPC=9=0.1.1,SLS=0,SIO=3=sccp -> eSLS=0: picked Normal Route via '<linkset>' round-robin style (available) +DLSS7 INFO 0: CombinedLinkset(dpc=8=0.1.0,mask=0x3ff8=7.255.0,prio=5) RT loookup: OPC=0=0.0.0,DPC=12=0.1.4,SLS=0,SIO=3=sccp -> eSLS=80: picked Normal Route via '<linkset>' round-robin style (available) +DLSS7 INFO 0: CombinedLinkset(dpc=8=0.1.0,mask=0x3ff8=7.255.0,prio=5) RT loookup: OPC=0=0.0.0,DPC=15=0.1.7,SLS=0,SIO=3=sccp -> eSLS=96: picked Normal Route via '<linkset>' round-robin style (available) DLSS7 INFO 0: RT(dpc=12=0.1.4,mask=0x3fff=7.255.7,prio=5,via=b,st=available) Creating route: pc=12=0.1.4 mask=0x3fff=7.255.7 prio=5 via linkset b -DLSS7 INFO 0: CombinedLinkset(dpc=12=0.1.4,mask=0x3fff=7.255.7,prio=5) RT loookup: OPC=0=0.0.0,DPC=12=0.1.4,SLS=0 -> eSLS=80: picked Normal Route via '<linkset>' round-robin style (available) -DLSS7 DEBUG 0: CombinedLinkset(dpc=8=0.1.0,mask=0x3ff8=7.255.0,prio=5) RT lookup: OPC=0=0.0.0,DPC=15=0.1.7,SLS=0 -> eSLS=96: use Normal Route via '<linkset>' +DLSS7 INFO 0: CombinedLinkset(dpc=12=0.1.4,mask=0x3fff=7.255.7,prio=5) RT loookup: OPC=0=0.0.0,DPC=12=0.1.4,SLS=0,SIO=3=sccp -> eSLS=80: picked Normal Route via '<linkset>' round-robin style (available) +DLSS7 DEBUG 0: CombinedLinkset(dpc=8=0.1.0,mask=0x3ff8=7.255.0,prio=5) RT lookup: OPC=0=0.0.0,DPC=15=0.1.7,SLS=0,SIO=3=sccp -> eSLS=96: use Normal Route via '<linkset>' DLSS7 INFO 0: RT(dpc=0=0.0.0,mask=0x0=0.0.0,prio=5,via=a,st=available) Creating route: pc=0=0.0.0 mask=0x0=0.0.0 prio=5 via linkset a -DLSS7 DEBUG 0: CombinedLinkset(dpc=12=0.1.4,mask=0x3fff=7.255.7,prio=5) RT lookup: OPC=0=0.0.0,DPC=12=0.1.4,SLS=0 -> eSLS=80: use Normal Route via '<linkset>' -DLSS7 DEBUG 0: CombinedLinkset(dpc=8=0.1.0,mask=0x3ff8=7.255.0,prio=5) RT lookup: OPC=0=0.0.0,DPC=15=0.1.7,SLS=0 -> eSLS=96: use Normal Route via '<linkset>' -DLSS7 INFO 0: CombinedLinkset(dpc=0=0.0.0,mask=0x0=0.0.0,prio=5) RT loookup: OPC=0=0.0.0,DPC=16=0.2.0,SLS=0 -> eSLS=32: picked Normal Route via '<linkset>' round-robin style (available) +DLSS7 DEBUG 0: CombinedLinkset(dpc=12=0.1.4,mask=0x3fff=7.255.7,prio=5) RT lookup: OPC=0=0.0.0,DPC=12=0.1.4,SLS=0,SIO=3=sccp -> eSLS=80: use Normal Route via '<linkset>' +DLSS7 DEBUG 0: CombinedLinkset(dpc=8=0.1.0,mask=0x3ff8=7.255.0,prio=5) RT lookup: OPC=0=0.0.0,DPC=15=0.1.7,SLS=0,SIO=3=sccp -> eSLS=96: use Normal Route via '<linkset>' +DLSS7 INFO 0: CombinedLinkset(dpc=0=0.0.0,mask=0x0=0.0.0,prio=5) RT loookup: OPC=0=0.0.0,DPC=16=0.2.0,SLS=0,SIO=3=sccp -> eSLS=32: picked Normal Route via '<linkset>' round-robin style (available) DLSS7 INFO 0: RT(dpc=0=0.0.0,mask=0x0=0.0.0,prio=5,via=a,st=available) Destroying route: pc=0=0.0.0 mask=0x0=0.0.0 prio=5 via linkset a DLSS7 INFO 0: RT(dpc=12=0.1.4,mask=0x3fff=7.255.7,prio=5,via=b,st=available) Destroying route: pc=12=0.1.4 mask=0x3fff=7.255.7 prio=5 via linkset b DLSS7 INFO 0: RT(dpc=8=0.1.0,mask=0x3ff8=7.255.0,prio=5,via=a,st=available) Destroying route: pc=8=0.1.0 mask=0x3ff8=7.255.0 prio=5 via linkset a diff --git a/tests/vty/osmo_stp_route_prio.vty b/tests/vty/osmo_stp_route_prio.vty index 2422043..a40e6f8 100644 --- a/tests/vty/osmo_stp_route_prio.vty +++ b/tests/vty/osmo_stp_route_prio.vty @@ -274,5 +274,5 @@ 127 - - - - OsmoSTP(config-cs7-rt)# ! NOW TEST LOOKUP FAILS AS EXPECTED (all route links are down): -OsmoSTP(config-cs7-rt)# do show cs7 instance 0 route-lookup 3.2.1 from 0.0.1 sls 0 -No route found for label 'OPC=1=0.0.1,DPC=6161=3.2.1,SLS=0' +OsmoSTP(config-cs7-rt)# do show cs7 instance 0 route-lookup 3.2.1 from 0.0.1 sls 0 si 3 +No route found for label 'OPC=1=0.0.1,DPC=6161=3.2.1,SLS=0,SIO=3=sccp' diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index 1fe3bab..86048ed 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -15,7 +15,7 @@ show cs7 instance <0-15> as binding-table name AS_NAME show cs7 instance <0-15> route [POINT_CODE] show cs7 instance <0-15> route binding-table [POINT_CODE] [all-matches] - show cs7 instance <0-15> route-lookup POINT_CODE from POINT_CODE sls <0-15> [list-asps] + show cs7 instance <0-15> route-lookup POINT_CODE from POINT_CODE sls <0-15> si <0-15> [list-asps] show cs7 instance <0-15> sccp addressbook ... show cs7 instance <0-15> sccp users @@ -44,7 +44,7 @@ show cs7 instance <0-15> as binding-table name AS_NAME show cs7 instance <0-15> route [POINT_CODE] show cs7 instance <0-15> route binding-table [POINT_CODE] [all-matches] - show cs7 instance <0-15> route-lookup POINT_CODE from POINT_CODE sls <0-15> [list-asps] + show cs7 instance <0-15> route-lookup POINT_CODE from POINT_CODE sls <0-15> si <0-15> [list-asps] show cs7 instance <0-15> sccp addressbook ... show cs7 instance <0-15> sccp users diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index 6edbcec..1f712d7 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -15,7 +15,7 @@ show cs7 instance <0-15> as binding-table name AS_NAME show cs7 instance <0-15> route [POINT_CODE] show cs7 instance <0-15> route binding-table [POINT_CODE] [all-matches] - show cs7 instance <0-15> route-lookup POINT_CODE from POINT_CODE sls <0-15> [list-asps] + show cs7 instance <0-15> route-lookup POINT_CODE from POINT_CODE sls <0-15> si <0-15> [list-asps] show cs7 instance <0-15> sccp addressbook show cs7 instance <0-15> sccp users show cs7 instance <0-15> sccp ssn <0-65535> @@ -43,7 +43,7 @@ show cs7 instance <0-15> as binding-table name AS_NAME show cs7 instance <0-15> route [POINT_CODE] show cs7 instance <0-15> route binding-table [POINT_CODE] [all-matches] - show cs7 instance <0-15> route-lookup POINT_CODE from POINT_CODE sls <0-15> [list-asps] + show cs7 instance <0-15> route-lookup POINT_CODE from POINT_CODE sls <0-15> si <0-15> [list-asps] show cs7 instance <0-15> sccp addressbook show cs7 instance <0-15> sccp users show cs7 instance <0-15> sccp ssn <0-65535> -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/43845?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: Iec4af5d9a3607747006c26e2baa61ab945f88532 Gerrit-Change-Number: 43845 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: tests/vty/osmo_stp_test.vty: validate routing-key opc and si fields
by pespin 17 Oct '26

17 Oct '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/43912?usp=email ) Change subject: tests/vty/osmo_stp_test.vty: validate routing-key opc and si fields ...................................................................... tests/vty/osmo_stp_test.vty: validate routing-key opc and si fields Change-Id: Iaebef65b0630546aab56abf58c3c69633b2aa55d --- M tests/vty/osmo_stp_test.vty 1 file changed, 15 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index 86048ed..ec2a47d 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -673,27 +673,35 @@ ------------ ------------ ------------- ---- ---- --------- ----------------------- ----------------------- my-asp my-ass ASP_DOWN m3ua sg server (127.0.0.100|127.0.0.101):54321 (127.0.0.200|127.0.0.201):12345 -OsmoSTP(config-cs7-as)# exit -OsmoSTP(config-cs7)# do show cs7 instance 0 asp +OsmoSTP(config-cs7-as)# do show cs7 instance 0 asp ASP Name AS Name State Type Role SCTP Role Local Addresses Remote Addresses ------------ ------------ ------------- ---- ---- --------- ----------------------- ----------------------- my-asp my-ass ASP_DOWN m3ua sg server (127.0.0.100|127.0.0.101):54321 (127.0.0.200|127.0.0.201):12345 -OsmoSTP(config-cs7)# exit -OsmoSTP(config)# do show cs7 instance 0 asp +OsmoSTP(config-cs7-as)# do show cs7 instance 0 asp ASP Name AS Name State Type Role SCTP Role Local Addresses Remote Addresses ------------ ------------ ------------- ---- ---- --------- ----------------------- ----------------------- my-asp my-ass ASP_DOWN m3ua sg server (127.0.0.100|127.0.0.101):54321 (127.0.0.200|127.0.0.201):12345 -OsmoSTP(config)# do show cs7 instance 0 as all +OsmoSTP(config-cs7-as)# do show cs7 instance 0 as all Routing Routing Key Cic Cic Traffic AS Name State Context Dpc Si Opc Ssn Min Max Mode ------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- ------- my-ass AS_DOWN 0 3.2.1 override +OsmoSTP(config-cs7-as)# routing-key 0 3.2.1 opc 2.7.0 7.255.4 si sccp ssn 45 +m3ua AS doesn't support matching on AS; only permitted on SUA AS +OsmoSTP(config-cs7-as)# routing-key 0 3.2.1 opc 2.7.0 7.255.4 si sccp ssn 0 +OsmoSTP(config-cs7-as)# do show cs7 instance 0 as all + Routing Routing Key Cic Cic Traffic +AS Name State Context Dpc Si Opc Ssn Min Max Mode +------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- ------- +my-ass AS_DOWN 0 3.2.1 3 2.7.0/7.255.4 override +OsmoSTP(config-cs7-as)# exit +OsmoSTP(config-cs7)# exit OsmoSTP(config)# show running-config ... @@ -710,7 +718,7 @@ no shutdown as my-ass m3ua asp my-asp - routing-key 0 3.2.1 + routing-key 0 3.2.1 opc 2.7.0 7.255.4 si sccp route-table system listen m3ua 2905 local-ip 127.0.0.2 @@ -753,7 +761,7 @@ Routing Routing Key Cic Cic Traffic AS Name State Context Dpc Si Opc Ssn Min Max Mode ------------ ------------ ---------- ------------- ---- ------------- --- ----- ----- ------- -my-ass AS_DOWN 0 3.2.1 override +my-ass AS_DOWN 0 3.2.1 3 2.7.0/7.255.4 override OsmoSTP(config-cs7)# do show cs7 instance 0 sccp timers -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/43912?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: Iaebef65b0630546aab56abf58c3c69633b2aa55d Gerrit-Change-Number: 43912 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log October 2026