February 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ci[master]: jobs/registry-update-base…: remove almalinux8

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35975?usp=email ) Change subject: jobs/registry-update-base…: remove almalinux8 ...................................................................... jobs/registry-update-base…: remove almalinux8 Related: https://osmocom.org/news/246 Related: SYS#6759 Change-Id: If921a5844ce602a7bda84b9e4d1507796c10948f --- M jobs/registry-update-base-images.yml 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/registry-update-base-images.yml b/jobs/registry-update-base-images.yml index f3f20e3..b51ae95 100644 --- a/jobs/registry-update-base-images.yml +++ b/jobs/registry-update-base-images.yml @@ -27,7 +27,6 @@ debian:sid centos:centos7 - almalinux:8 " for i in $IMAGES; do src=$i -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35975?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If921a5844ce602a7bda84b9e4d1507796c10948f Gerrit-Change-Number: 35975 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[S] Change in osmo-ci[master]: jobs/repo-install-test: remove centos8

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35973?usp=email ) Change subject: jobs/repo-install-test: remove centos8 ...................................................................... jobs/repo-install-test: remove centos8 Related: https://osmocom.org/news/246 Related: SYS#6759 Change-Id: I311ccfe61b86e467996022107294ad560eee8bdf --- M jobs/repo-install-test.yml 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/jobs/repo-install-test.yml b/jobs/repo-install-test.yml index 1340e20..0891e24 100644 --- a/jobs/repo-install-test.yml +++ b/jobs/repo-install-test.yml @@ -4,8 +4,6 @@ jobs: - Osmocom-repo-install-{distro} distro: - - centos8: - feeds: !!python/tuple [nightly, latest] # next: disabled (OS#5322) - debian10: feeds: !!python/tuple [nightly, latest] - debian11: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35973?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I311ccfe61b86e467996022107294ad560eee8bdf Gerrit-Change-Number: 35973 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[S] Change in osmo-ci[master]: jobs/gerrit-verifications: remove almalinux8

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35972?usp=email ) Change subject: jobs/gerrit-verifications: remove almalinux8 ...................................................................... jobs/gerrit-verifications: remove almalinux8 Related: https://osmocom.org/news/246 Related: SYS#6759 Change-Id: Ia180ac87251c39d9715276cf23a2663fb917f50a --- M jobs/gerrit-verifications.yml 1 file changed, 14 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 2efac00..2998619 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -92,7 +92,7 @@ # Which jobs to run in the pipeline pipeline_build: true pipeline_lint: true - pipeline_binpkgs: "almalinux:8 debian:10 debian:12" + pipeline_binpkgs: "debian:10 debian:12" # in alphabetical order repos: @@ -126,9 +126,7 @@ - libtelnet: pipeline_binpkgs: "" - - libusrp: - # centos8/almalinux doesn't have SDCC (OS#5898) - pipeline_binpkgs: "debian:10 debian:12" + - libusrp - openbsc: a1_name: SMPP @@ -394,7 +392,7 @@ {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - osmo-upf: - pipeline_binpkgs: "almalinux:8 debian:11 debian:12" + pipeline_binpkgs: "debian:11 debian:12" - pysim: concurrent: false -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35972?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia180ac87251c39d9715276cf23a2663fb917f50a Gerrit-Change-Number: 35972 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[M] Change in osmo-ci[master]: jobs/ttcn3-testsuites: remove centos8

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35974?usp=email ) Change subject: jobs/ttcn3-testsuites: remove centos8 ...................................................................... jobs/ttcn3-testsuites: remove centos8 Related: https://osmocom.org/news/246 Related: SYS#6759 Change-Id: I4142c5ababb85b74a890a0cbfc302bd15d44268e --- M jobs/ttcn3-testsuites.yml 1 file changed, 11 insertions(+), 84 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index ce18cfb..b367c49 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -202,76 +202,6 @@ - TTCN3-centos7-pcap-client-test-latest: timer: H 10 * * * - # centos8 nightly - - TTCN3-centos-ggsn-test: - timer: H 10 * * * - - TTCN3-centos-msc-test: - timer: H 10 * * * - - TTCN3-centos-pcu-test: - timer: H 10 * * * - - TTCN3-centos-pcu-test-sns: - timer: H 10 * * * - - TTCN3-centos-sgsn-test: - timer: H 11 * * * - - TTCN3-centos-bsc-test: - timer: H 11 * * * - - TTCN3-centos-mgw-test: - timer: H 11 * * * - - TTCN3-centos-hlr-test: - timer: H 11 * * * - - TTCN3-centos-bts-test: - timer: H 11 * * * - - TTCN3-centos-sip-test: - timer: H 11 * * * - - TTCN3-centos-bsc-test-sccplite: - timer: H 11 * * * - - TTCN3-centos-remsim-test: - timer: H 11 * * * - disabled: true - - TTCN3-centos-stp-test: - timer: H 11 * * * - - TTCN3-centos-gbproxy-test: - timer: H 11 * * * - - TTCN3-centos-cbc-test: - timer: H 12 * * * - - # centos8 latest stable - - TTCN3-centos-ggsn-test-latest: - timer: H 12 * * * - - TTCN3-centos-msc-test-latest: - timer: H 12 * * * - - TTCN3-centos-pcu-test-latest: - timer: H 12 * * * - - TTCN3-centos-pcu-test-sns-latest: - timer: H 12 * * * - - TTCN3-centos-sgsn-test-latest: - timer: H 12 * * * - - TTCN3-centos-bsc-test-latest: - timer: H 12 * * * - - TTCN3-centos-mgw-test-latest: - timer: H 12 * * * - - TTCN3-centos-hlr-test-latest: - timer: H 12 * * * - - TTCN3-centos-bts-test-latest: - timer: H 12 * * * - - TTCN3-centos-sip-test-latest: - timer: H 13 * * * - - TTCN3-centos-bsc-test-sccplite-latest: - timer: H 13 * * * - - TTCN3-centos-remsim-test-latest: - timer: H 13 * * * - disabled: true - - TTCN3-centos-stp-test-latest: - timer: H 13 * * * - - TTCN3-centos-smlc-test-latest: - timer: H 13 * * * - - TTCN3-centos-sccp-test-latest: - timer: H 13 * * * - - TTCN3-centos-gbproxy-test-latest: - timer: H 13 * * * - - TTCN3-centos-cbc-test-latest: - timer: H 13 * * * - - job-template: name: '{job-name}' project-type: freestyle @@ -322,24 +252,10 @@ export KERNEL_REMOTE_NAME="torvalds" export KERNEL_BRANCH="master" ;; - TTCN3-centos-*-latest) - DIR="$(echo "{job-name}" | sed s/^TTCN3-centos\-/ttcn3-/ | sed s/\-latest$//)" - export IMAGE_SUFFIX="latest-centos8" - ;; TTCN3-centos7-*-latest) DIR="$(echo "{job-name}" | sed s/^TTCN3-centos7\-/ttcn3-/ | sed s/\-latest$//)" export IMAGE_SUFFIX="latest-centos7" ;; - TTCN3-centos-*-20*q*) - export OSMOCOM_REPO_PATH="osmo-maintained" - export OSMOCOM_REPO_VERSION="$(echo "{job-name}" | grep -o -P -- "20\d\dq.*$")" # e.g. "2021q1" - export IMAGE_SUFFIX="$OSMOCOM_REPO_VERSION-centos8" - DIR="$(echo "{job-name}" | sed s/^TTCN3-centos\-/ttcn3-/ | sed s/\-$OSMOCOM_REPO_VERSION$//)" - ;; - TTCN3-centos-*) - DIR="$(echo "{job-name}" | sed s/^TTCN3-centos\-/ttcn3-/)" - export IMAGE_SUFFIX="master-centos8" - ;; TTCN3-centos7-*) DIR="$(echo "{job-name}" | sed s/^TTCN3-centos7\-/ttcn3-/)" export IMAGE_SUFFIX="master-centos7" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35974?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4142c5ababb85b74a890a0cbfc302bd15d44268e Gerrit-Change-Number: 35974 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[L] Change in libosmo-sccp[master]: Implement M3UA-over-TCP (in addition to SCTP)

by fixeria

Attention is currently required from: jolly, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35796?usp=email ) Change subject: Implement M3UA-over-TCP (in addition to SCTP) ...................................................................... Patch Set 4: (1 comment) File include/osmocom/sigtran/osmo_ss7.h: https://gerrit.osmocom.org/c/libosmo-sccp/+/35796/comment/fc3b2353_436deaaf PS3, Line 616: osmo_sccp_simple_client2(void *ctx, const char *name, uint32_t default_pc, > Any input is welcome. I'll continue investigating this. Actually, better halt here and wait for feedback. > ... this way we keep osmo-stp support separated from other apps using the simple_client/server stuff, like osmo-bsc. Just to clarify: do we still want to support other transport protocols (e.g. M3UA-over-TCP) outside of osmo-stp, i.e. in apps like osmo-bsc and osmo-msc? -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35796?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8c76d271472befacbeb998a93bbdc9e8660d9b5d Gerrit-Change-Number: 35796 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 14 Feb 2024 23:37:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[L] Change in libosmo-sccp[master]: Implement M3UA-over-TCP (in addition to SCTP)

by fixeria

Attention is currently required from: jolly, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35796?usp=email ) Change subject: Implement M3UA-over-TCP (in addition to SCTP) ...................................................................... Patch Set 4: (1 comment) File include/osmocom/sigtran/osmo_ss7.h: https://gerrit.osmocom.org/c/libosmo-sccp/+/35796/comment/ddb66e4c_9c85285f PS3, Line 616: osmo_sccp_simple_client2(void *ctx, const char *name, uint32_t default_pc, > Done Having done this, I can no longer get osmo-bsc to talk to osmo-stp using M3UA/TCP. AFAICS, osmo-bsc is actually using this API and since this API is assuming the default transport protocol (SCTP), something is definitely going wrong: ``` DMSC NOTICE osmo_bsc_sigtran.c:648 Initializing SCCP connection for A/m3ua on cs7 instance 0 DLSCCP NOTICE sccp_user.c:567 A-0-m3ua: Using SS7 instance 0, pc:0.23.3 DLSCCP NOTICE sccp_user.c:585 A-0-m3ua: Using AS instance as-clnt-OsmoBSC-A DLSCCP NOTICE sccp_user.c:590 A-0-m3ua: Creating default route DLSS7 INFO osmo_ss7.c:781 0: Creating route: pc=0=0.0.0 mask=0x0 via AS 'as-clnt-OsmoBSC-A' DLSCCP NOTICE sccp_user.c:632 A-0-m3ua: No unassociated ASP for m3ua, creating new ASP asp-clnt-A-0-m3ua DLSS7 INFO osmo_ss7_as.c:110 0: as-as-clnt-OsmoBSC-A: Adding ASP asp-clnt-A-0-m3ua to AS DLGLOBAL ERROR osmo_ss7_as.c:118 Trying to dispatch event 17 to non-existent FSM instance! DLGLOBAL ERROR backtrace.c:42 backtrace() returned 9 addresses DLGLOBAL ERROR backtrace.c:53 /opt/osmocom/lib/libosmocore.so.21(_osmo_fsm_inst_dispatch+0x3a3) [0x7660c5671443] DLGLOBAL ERROR backtrace.c:53 /opt/osmocom/lib/libosmo-sigtran.so.9(osmo_ss7_as_add_asp+0x31e) [0x7660c57da45e] DLGLOBAL ERROR backtrace.c:53 /opt/osmocom/lib/libosmo-sigtran.so.9(osmo_sccp_simple_client_on_ss7_id+0x101a) [0x7660c58055ca] DLGLOBAL ERROR backtrace.c:53 ./src/osmo-bsc/osmo-bsc(+0x1ee30c) [0x5f63af78430c] DLGLOBAL ERROR backtrace.c:53 ./src/osmo-bsc/osmo-bsc(+0x25bb7) [0x5f63af5bbbb7] DLGLOBAL ERROR backtrace.c:53 /usr/lib/libc.so.6(+0x27cd0) [0x7660c5151cd0] DLGLOBAL ERROR backtrace.c:53 /usr/lib/libc.so.6(__libc_start_main+0x8a) [0x7660c5151d8a] DLGLOBAL ERROR backtrace.c:53 ./src/osmo-bsc/osmo-bsc(+0x25165) [0x5f63af5bb165] ``` Note the `No unassociated ASP for m3ua, creating new ASP` line. This is despite I am using the following configuration in osmo-bsc.cfg: ``` cs7 instance 0 point-code 0.23.3 asp asp-clnt-OsmoBSC-A 2905 0 m3ua tcp remote-ip 127.0.0.1 role asp transport-role client as as-clnt-OsmoBSC-A m3ua asp asp-clnt-OsmoBSC-A routing-key 3 0.23.3 ``` Any input is welcome. I'll continue investigating this. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35796?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8c76d271472befacbeb998a93bbdc9e8660d9b5d Gerrit-Change-Number: 35796 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 14 Feb 2024 23:33:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[L] Change in libosmo-sccp[master]: Implement M3UA-over-TCP (in addition to SCTP)

by fixeria

Attention is currently required from: jolly, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35796?usp=email ) Change subject: Implement M3UA-over-TCP (in addition to SCTP) ...................................................................... Patch Set 4: (1 comment) File src/osmo_ss7_asp.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/35796/comment/9db5cc5b_fd97a032 PS1, Line 853: ss7_asp_m3ua_tcp_srv_conn_cb (re-opening the thread, since this was not addressed yet) > ... As jolly is trying to fix that right now, I guess the half-life of this code is going to be very low. @laforge@osmocom.org IIUC this means that this code is going to be reworked anyway once we migrate to `osmo_stream_srv_create2()` and I should not be spending time trying to reduce code duplication as was suggested by @pespin@sysmocom.de. @andreas@eversberg.eu feel free to ping me in case of the merge conflicts with this patch! -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35796?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8c76d271472befacbeb998a93bbdc9e8660d9b5d Gerrit-Change-Number: 35796 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 14 Feb 2024 22:54:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[L] Change in libosmo-sccp[master]: Implement M3UA-over-TCP (in addition to SCTP)

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35796?usp=email ) Change subject: Implement M3UA-over-TCP (in addition to SCTP) ...................................................................... Patch Set 4: (11 comments) This change is ready for review. Patchset: PS1: > IMHO we shouldn't do those more neutral, but rather keep them specific. […] I hope later patchset revisions are now closer to what we concluded here, so marking as resolved. The question whether to rename `sctp-role (client|server)` is now being discussed in a separate thread. File include/osmocom/sigtran/osmo_ss7.h: https://gerrit.osmocom.org/c/libosmo-sccp/+/35796/comment/35c6700d_e8d1d87b PS3, Line 293: bool osmo_ss7_asp_proto_check_trans_proto(enum osmo_ss7_asp_protocol proto, int trans_proto); > Ack, I will drop the `osmo_` prefix and move to `ss7_internal.h`. […] Done https://gerrit.osmocom.org/c/libosmo-sccp/+/35796/comment/28e3372c_1bf846c0 PS3, Line 349: struct osmo_ss7_as *osmo_ss7_as_find_by_proto2(struct osmo_ss7_instance *inst, > I added this because internally this function looks for a matching ASP: […] Done https://gerrit.osmocom.org/c/libosmo-sccp/+/35796/comment/e287e85b_ea919b35 PS3, Line 616: osmo_sccp_simple_client2(void *ctx, const char *name, uint32_t default_pc, > Ok, I will revert my changes to the `simple_{server,client}` API and let it use the default transpor […] Done File src/osmo_ss7_asp.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/35796/comment/4bb8cd94_f2964a84 PS3, Line 137: case PROTO_MUX(OSMO_SS7_ASP_PROT_IPA, IPPROTO_TCP): > I can do `ipproto << 16`, which would allow for values up to 65535. […] Actually, we don't need to change anything here because by doing: ```((trans_proto << 8) | (asp_proto << 0))``` we leave one byte and thus 256 unique values for the `asp_proto` (`OSMO_SS7_ASP_PROT_*`), and 3 or 7 bytes for the `trans_proto` (depending on the architecture). Does that make sense? Or am I missing something? https://gerrit.osmocom.org/c/libosmo-sccp/+/35796/comment/d532c02d_16cc31b3 PS3, Line 532: "ASP protocol '%s' is not compatible with transport protocol %d\n", > Ack, I'll then reword as follows: […] Done File src/osmo_ss7_vty.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/35796/comment/7a3189a3_dbacd8ec PS3, Line 65: #define IPPROTO_VAR_STR "([sctp]|[tcp])" > I will see what I can do here, but I am really not getting what's so special about using this syntax […] I implemented the optional transport protocol parameter using aliases. Marking as resolved. https://gerrit.osmocom.org/c/libosmo-sccp/+/35796/comment/37e9bf09_3058db9f PS3, Line 995: DEFUN_ATTR(sctp_role, asp_sctp_role_cmd, > > Why don't have "transport-protocol (sctp|tcp)" command around here? […] Done in a separate change: https://gerrit.osmocom.org/c/libosmo-sccp/+/35978 VTY: rename 'sctp-role' to 'transport-role', add an alias https://gerrit.osmocom.org/c/libosmo-sccp/+/35796/comment/ea0563bc_28cbc19a PS3, Line 1641: get_value_string(ipproto_vals, asp->cfg.trans_proto), > Ack Done File src/xua_rkm.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/35796/comment/b2fa22d9_fac97148 PS1, Line 240: M3UA-over-SCTP or M3UA-over-TCP? Can we use asp->cfg.proto maybe? > The XUA vs IPA has significant differences in the layer on top of TCP/SCTP which back the fact of ha […] This is no longer a relevant question, marking thread as resolved. File tests/vty/ss7_asp_test.vty: https://gerrit.osmocom.org/c/libosmo-sccp/+/35796/comment/49f8d013_3099aaca PS3, Line 408: sctp > well, the fact that it shows up in a VTY transcript test means (to my understanding) that loading an […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35796?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8c76d271472befacbeb998a93bbdc9e8660d9b5d Gerrit-Change-Number: 35796 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 14 Feb 2024 22:41:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in libosmo-sccp[master]: return CMD_WARNING if osmo_ss7_xua_server_create() fails

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35968?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: return CMD_WARNING if osmo_ss7_xua_server_create() fails ...................................................................... return CMD_WARNING if osmo_ss7_xua_server_create() fails Change-Id: I12bbfd48e16166c0f508ccbf2ed4fa786e786082 Related: SYS#5424 --- M src/osmo_ss7_vty.c 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/68/35968/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35968?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I12bbfd48e16166c0f508ccbf2ed4fa786e786082 Gerrit-Change-Number: 35968 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

[M] Change in libosmo-sccp[master]: VTY: rename 'sctp-role' to 'transport-role', add an alias

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35978?usp=email ) Change subject: VTY: rename 'sctp-role' to 'transport-role', add an alias ...................................................................... VTY: rename 'sctp-role' to 'transport-role', add an alias Now that we're adding support for M3UA-over-TCP, the transport layer role is no longer an SCTP specific paremeter, but rather a generic one. This is also the case for the OSMO_SS7_ASP_PROT_IPA, which employs TCP, and for which we can also choose between the client and server role. The 'sctp-role' now becomes an alias to 'transport-role', so that we keep backwards compatibility with old config files. Change-Id: Iab6c898181d79a5ed2bea767ee90e55bc3af16a5 Related: SYS#5424 --- M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7_vty.c M src/sccp_user.c M tests/vty/ss7_asp_test.vty 4 files changed, 53 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/78/35978/1 diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index fa7f830..1afccea 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -433,7 +433,7 @@ bool is_server; enum osmo_ss7_asp_role role; bool role_set_by_vty; - bool sctp_role_set_by_vty; + bool trans_role_set_by_vty; struct osmo_ss7_asp_peer local; struct osmo_ss7_asp_peer remote; diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index b5c2449..8addd57 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -1029,11 +1029,11 @@ return CMD_SUCCESS; } -DEFUN_ATTR(sctp_role, asp_sctp_role_cmd, - "sctp-role (client|server)", - "Specify the SCTP role for this ASP\n" - "Operate as SCTP client; connect to a server\n" - "Operate as SCTP server; wait for client connections\n", +DEFUN_ATTR(asp_transport_role, asp_transport_role_cmd, + "transport-role (client|server)", + "Specify the transport layer role for this ASP\n" + "Operate as a client; connect to a server\n" + "Operate as a server; wait for client connections\n", CMD_ATTR_NODE_EXIT) { struct osmo_ss7_asp *asp = vty->index; @@ -1045,10 +1045,17 @@ else OSMO_ASSERT(0); - asp->cfg.sctp_role_set_by_vty = true; + asp->cfg.trans_role_set_by_vty = true; return CMD_SUCCESS; } +ALIAS_ATTR(asp_transport_role, asp_sctp_role_cmd, + "sctp-role (client|server)", + "Specify the SCTP role for this ASP\n" + "Operate as SCTP client; connect to a server\n" + "Operate as SCTP server; wait for client connections\n", + CMD_ATTR_HIDDEN | CMD_ATTR_NODE_EXIT); + #define ASP_SCTP_PARAM_INIT_DESC \ "Configure SCTP parameters\n" \ "Configure INIT related parameters\n" \ @@ -1694,7 +1701,7 @@ vty_out(vty, " qos-class %u%s", asp->cfg.qos_class, VTY_NEWLINE); vty_out(vty, " role %s%s", osmo_str_tolower(get_value_string(osmo_ss7_asp_role_names, asp->cfg.role)), VTY_NEWLINE); - vty_out(vty, " sctp-role %s%s", asp->cfg.is_server ? "server" : "client", VTY_NEWLINE); + vty_out(vty, " transport-role %s%s", asp->cfg.is_server ? "server" : "client", VTY_NEWLINE); if (asp->cfg.sctp_init.num_ostreams_present) vty_out(vty, " sctp-param init num-ostreams %u%s", asp->cfg.sctp_init.num_ostreams_value, VTY_NEWLINE); if (asp->cfg.sctp_init.max_instreams_present) @@ -2958,6 +2965,7 @@ install_lib_element(L_CS7_ASP_NODE, &asp_no_local_ip_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_qos_class_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_role_cmd); + install_lib_element(L_CS7_ASP_NODE, &asp_transport_role_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_sctp_role_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_sctp_param_init_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_no_sctp_param_init_cmd); diff --git a/src/sccp_user.c b/src/sccp_user.c index 9520464..f79832f 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -639,7 +639,7 @@ if (!asp) goto out_rt; asp_created = true; - /* Ensure that the ASP we use is set to sctp-role client. */ + /* Ensure that the ASP we use is set to operate as a client. */ asp->cfg.is_server = false; /* Ensure that the ASP we use is set to role ASP. */ asp->cfg.role = OSMO_SS7_ASP_ROLE_ASP; @@ -658,7 +658,7 @@ /* Extra sanity checks if the ASP asp-clnt-* was pre-configured over VTY: */ if (!asp->simple_client_allocated) { /* Forbid ASPs defined through VTY that are not entirely - * configured. "role" and "sctp-role" must be explicitly provided: + * configured. "role" and "transport-role" must be explicitly provided: */ if (!asp->cfg.role_set_by_vty) { LOGP(DLSCCP, LOGL_ERROR, @@ -666,9 +666,9 @@ name, asp->cfg.name); goto out_asp; } - if (!asp->cfg.sctp_role_set_by_vty) { + if (!asp->cfg.trans_role_set_by_vty) { LOGP(DLSCCP, LOGL_ERROR, - "%s: ASP %s defined in VTY but 'sctp-role' was not set there, please set it.\n", + "%s: ASP %s defined in VTY but 'transport-role' was not set there, please set it.\n", name, asp->cfg.name); goto out_asp; } @@ -676,17 +676,17 @@ /* If ASP was configured through VTY it may be explicitly configured as * SCTP server. It may be a bit confusing since this function is to create * a "SCCP simple client", but this allows users of this API such as - * osmo-hnbgw to support SCTP-role server if properly configured through VTY. + * osmo-hnbgw to support transport-role server if properly configured through VTY. */ if (asp->cfg.is_server) { struct osmo_xua_server *xs; LOGP(DLSCCP, LOGL_NOTICE, - "%s: Requesting an SCCP simple client on ASP %s configured with 'sctp-role server'\n", + "%s: Requesting an SCCP simple client on ASP %s configured with 'transport-role server'\n", name, asp->cfg.name); xs = osmo_ss7_xua_server_find2(ss7, trans_proto, prot, asp->cfg.local.port); if (!xs) { LOGP(DLSCCP, LOGL_ERROR, "%s: Requesting an SCCP simple client on ASP %s configured " - "with 'sctp-role server' but no matching xUA server was configured!\n", + "with 'transport-role server' but no matching xUA server was configured!\n", name, asp->cfg.name); goto out_asp; } diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index b1cfb04..64baddb 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -256,7 +256,7 @@ no local-ip (A.B.C.D|X:X::X:X) qos-class <0-255> role (sg|asp|ipsp) - sctp-role (client|server) + transport-role (client|server) sctp-param init (num-ostreams|max-instreams|max-attempts|timeout) <0-65535> no sctp-param init (num-ostreams|max-instreams|max-attempts|timeout) block @@ -265,16 +265,16 @@ ss7_asp_vty_test(config-cs7-asp)# ? ... - description Save human-readable description of the object - remote-ip Specify Remote IP Address of ASP - no Negate a command or set its defaults - local-ip Specify Local IP Address from which to contact ASP - qos-class Specify QoS Class of ASP - role Specify the xUA role for this ASP - sctp-role Specify the SCTP role for this ASP - sctp-param Configure SCTP parameters - block Allows a SCTP Association with ASP, but doesn't let it become active - shutdown Terminates SCTP association; New associations will be rejected + description Save human-readable description of the object + remote-ip Specify Remote IP Address of ASP + no Negate a command or set its defaults + local-ip Specify Local IP Address from which to contact ASP + qos-class Specify QoS Class of ASP + role Specify the xUA role for this ASP + transport-role Specify the transport layer role for this ASP + sctp-param Configure SCTP parameters + block Allows a SCTP Association with ASP, but doesn't let it become active + shutdown Terminates SCTP association; New associations will be rejected ... ss7_asp_vty_test(config-cs7-asp)# no ? @@ -422,7 +422,7 @@ remote-ip 127.0.0.200 remote-ip 127.0.0.201 role sg - sctp-role server + transport-role server as my-ass m3ua asp my-asp routing-key 0 3.2.1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35978?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Iab6c898181d79a5ed2bea767ee90e55bc3af16a5 Gerrit-Change-Number: 35978 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2024