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

Change in osmo-msc[master]: ESME: use osmo_sock_get_name() for logging

by msuraev

Attention is currently required from: pespin, msuraev. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/28841 to look at the new patch set (#4). Change subject: ESME: use osmo_sock_get_name() for logging ...................................................................... ESME: use osmo_sock_get_name() for logging This allows us to drop single-use parameters from osmo_esme to facilitate further code changes. Related: OS#5568 Change-Id: I34bd4c145b0f6287a323e2350808feb59f1d3187 --- M src/libmsc/smpp_smsc.c M src/libmsc/smpp_smsc.h M src/libmsc/smpp_vty.c 3 files changed, 2 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/41/28841/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I34bd4c145b0f6287a323e2350808feb59f1d3187 Gerrit-Change-Number: 28841 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: tests: use common stubs for SMS queue test

by msuraev

Attention is currently required from: pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/28842 to look at the new patch set (#4). Change subject: tests: use common stubs for SMS queue test ...................................................................... tests: use common stubs for SMS queue test Related: OS#5568 Change-Id: Ic854eb919e6fcc82bd0245f62c72985b938c6b7a --- M tests/sms_queue/Makefile.am M tests/sms_queue/sms_queue_test.c M tests/stubs.c 3 files changed, 4 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/42/28842/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic854eb919e6fcc82bd0245f62c72985b938c6b7a Gerrit-Change-Number: 28842 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: SMPP: clarify (re)start logic

by msuraev

Attention is currently required from: msuraev. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/28843 to look at the new patch set (#4). Change subject: SMPP: clarify (re)start logic ...................................................................... SMPP: clarify (re)start logic Having smpp_smsc_stop() called from within smpp_smsc_start() instead of explicitly inside smpp_smsc_restart() is confusing and could lead to hard-to-trace bugs. Let's get this fixed first before going further. Related: OS#5568 Change-Id: I353f5b82c9f5308d93e926538d4ef7e24d0b0339 --- M src/libmsc/smpp_smsc.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/43/28843/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I353f5b82c9f5308d93e926538d4ef7e24d0b0339 Gerrit-Change-Number: 28843 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: tests: use common stubs for SMS queue test

by msuraev

Attention is currently required from: pespin. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28842 ) Change subject: tests: use common stubs for SMS queue test ...................................................................... Patch Set 3: (1 comment) File tests/stubs.c: https://gerrit.osmocom.org/c/osmo-msc/+/28842/comment/5bf37326_2d7469e1 PS1, Line 42: char *osmo_stream_srv_link_get_sockname(const struct osmo_stream_srv_link *link) { return NULL; } > not sure if returning NULL instead of "" here may be an issue? It hadn't so far. If it ever does than we could change either stub or the test depending on the view of defensive programming. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic854eb919e6fcc82bd0245f62c72985b938c6b7a Gerrit-Change-Number: 28842 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 30 Jul 2022 08:01:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: Ignore .deb build byproducts

by msuraev

Attention is currently required from: pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/28839 to look at the new patch set (#3). Change subject: Ignore .deb build byproducts ...................................................................... Ignore .deb build byproducts Change-Id: I0ff10ef5766edf5f2aacf62acc98f25f01706ab4 --- M .gitignore 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/39/28839/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0ff10ef5766edf5f2aacf62acc98f25f01706ab4 Gerrit-Change-Number: 28839 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: cosmetic: use proper name for SMPP handlers

by msuraev

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/28840 to look at the new patch set (#3). Change subject: cosmetic: use proper name for SMPP handlers ...................................................................... cosmetic: use proper name for SMPP handlers Change-Id: I0d714e927e287a0ea9362008ed050a492510e22b --- M include/osmocom/msc/smpp.h M src/libmsc/smpp_openbsc.c M src/osmo-msc/msc_main.c 3 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/40/28840/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0d714e927e287a0ea9362008ed050a492510e22b Gerrit-Change-Number: 28840 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: cosmetic: use proper name for SMPP handlers

by msuraev

Attention is currently required from: fixeria, pespin. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28840 ) Change subject: cosmetic: use proper name for SMPP handlers ...................................................................... Patch Set 2: (1 comment) File src/libmsc/smpp_openbsc.c: https://gerrit.osmocom.org/c/osmo-msc/+/28840/comment/84fba344_c893c910 PS1, Line 831: int smpp_openbsc_alloc_init(void *ctx) > Ack, and remove 'openbsc' from the filename. Indeed. Though it might require extra work in the follow-up patches so I'd hold on for now to see if other fixes are working first. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0d714e927e287a0ea9362008ed050a492510e22b Gerrit-Change-Number: 28840 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 30 Jul 2022 05:39:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: Ignore .deb build byproducts

by msuraev

Attention is currently required from: pespin. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28839 ) Change subject: Ignore .deb build byproducts ...................................................................... Patch Set 2: (1 comment) File .gitignore: https://gerrit.osmocom.org/c/osmo-msc/+/28839/comment/ded563dd_9390c66a PS1, Line 83: doc/manuals/vty/*.xml > This is wrong. Why do you want to exclude msc_vty_additions. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0ff10ef5766edf5f2aacf62acc98f25f01706ab4 Gerrit-Change-Number: 28839 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 30 Jul 2022 05:39:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: Ignore .deb build byproducts

by msuraev

Attention is currently required from: msuraev. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/28839 to look at the new patch set (#2). Change subject: Ignore .deb build byproducts ...................................................................... Ignore .deb build byproducts Signed-off-by: Max <msuraev(a)sysmocom.de> Change-Id: I0ff10ef5766edf5f2aacf62acc98f25f01706ab4 --- M .gitignore 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/39/28839/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0ff10ef5766edf5f2aacf62acc98f25f01706ab4 Gerrit-Change-Number: 28839 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: ESME: use osmo_sock_get_name() for logging

by msuraev

Attention is currently required from: pespin, msuraev. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/28841 to look at the new patch set (#2). Change subject: ESME: use osmo_sock_get_name() for logging ...................................................................... ESME: use osmo_sock_get_name() for logging This allows us to drop single-use parameters from osmo_esme to facilitate further code changes. Related: OS#5568 Change-Id: I34bd4c145b0f6287a323e2350808feb59f1d3187 --- M src/libmsc/smpp_smsc.c M src/libmsc/smpp_smsc.h M src/libmsc/smpp_vty.c 3 files changed, 2 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/41/28841/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I34bd4c145b0f6287a323e2350808feb59f1d3187 Gerrit-Change-Number: 28841 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Change default cbsp/sbcap ports to allow multiple bsc/mme

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28857 ) Change subject: cbc: Change default cbsp/sbcap ports to allow multiple bsc/mme ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib443aba9396aebe0a56b1a79719bbcf66302a1aa Gerrit-Change-Number: 28857 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 22:50:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Enable MMEs and BSCs selectively

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28856 ) Change subject: cbc: Enable MMEs and BSCs selectively ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I79ee41f183ef49e9fd606d2a3efa2767628bf142 Gerrit-Change-Number: 28856 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 22:50:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Fix use of incorrect variable in loop

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28855 ) Change subject: cbc: Fix use of incorrect variable in loop ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I978c92819cb4e218c95bc719ade71787dc474b23 Gerrit-Change-Number: 28855 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 22:49:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: tests/ranap_rab_ass: fix potential NULL pointer dereferences

by fixeria

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28837 ) Change subject: tests/ranap_rab_ass: fix potential NULL pointer dereferences ...................................................................... Patch Set 3: (1 comment) File tests/ranap_rab_ass/ranap_rab_ass_test.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28837/comment/16dd9be1_29579720 PS2, Line 67: if (encoded != NULL) { > maybe use OSMO_ASSERT here as well. There should be an encoded result, otherwise the test is failed. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I16fea7b2a8cb1d693e01c91d7633550e2e599ceb Gerrit-Change-Number: 28837 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 22:49:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: tests/ranap_rab_ass: fix potential NULL pointer dereferences

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, pespin, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28837 to look at the new patch set (#3). Change subject: tests/ranap_rab_ass: fix potential NULL pointer dereferences ...................................................................... tests/ranap_rab_ass: fix potential NULL pointer dereferences Change-Id: I16fea7b2a8cb1d693e01c91d7633550e2e599ceb Related: CID#275345 --- M tests/ranap_rab_ass/ranap_rab_ass_test.c M tests/ranap_rab_ass/ranap_rab_ass_test.ok 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/37/28837/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I16fea7b2a8cb1d693e01c91d7633550e2e599ceb Gerrit-Change-Number: 28837 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

Change in docker-playground[master]: ttcn3-cbc: Adapt ports in osmo-cbc.git to default ttcn3 ones

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28858 ) Change subject: ttcn3-cbc: Adapt ports in osmo-cbc.git to default ttcn3 ones ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib1387284c8f361572057b6d036429366238382a6 Gerrit-Change-Number: 28858 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 22:46:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: *_smscb_peer_fsm: Immediately NACK if Tx of msg failed

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28854 ) Change subject: *_smscb_peer_fsm: Immediately NACK if Tx of msg failed ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I1f3911accb327f3378d65902d53d86fb298fd528 Gerrit-Change-Number: 28854 Gerrit-PatchSet: 2 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 22:46:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: Propagate error to caller when tx cbsp/sbcap Write-Replace-Req fails

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28853 ) Change subject: Propagate error to caller when tx cbsp/sbcap Write-Replace-Req fails ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ie40c8e41c297398bbec48f7bb2c60cfdc703fa5d Gerrit-Change-Number: 28853 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 22:44:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: cbc_main: Enable logging of fsm timeouts

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28852 ) Change subject: cbc_main: Enable logging of fsm timeouts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I6ffbfbc8eddb3efff0b6401223b9b5563cf83b51 Gerrit-Change-Number: 28852 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 22:43:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: f_est_rll_mo(): add waiting timeout (2s)

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28832 ) Change subject: BTS_Tests: f_est_rll_mo(): add waiting timeout (2s) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I71ab69d85f453964749270d970c55e6f577a73a1 Gerrit-Change-Number: 28832 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 22:42:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: improve L1CTL connection related logging

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28864 ) Change subject: trxcon: improve L1CTL connection related logging ...................................................................... trxcon: improve L1CTL connection related logging * l1ctl_client_conn_close(): log "Closing L1CTL connection"; * l1ctl_client_read_cb(): more precise logging, use strerror(). Change-Id: Ie932513f93fd7f1a5f5e70f4d78235551f7599c8 Related: OS#5599 --- M src/host/trxcon/src/l1ctl_server.c 1 file changed, 14 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/64/28864/1 diff --git a/src/host/trxcon/src/l1ctl_server.c b/src/host/trxcon/src/l1ctl_server.c index cf98c6f..f9d34fa 100644 --- a/src/host/trxcon/src/l1ctl_server.c +++ b/src/host/trxcon/src/l1ctl_server.c @@ -50,12 +50,19 @@ /* Attempt to read from socket */ rc = read(ofd->fd, &len, L1CTL_MSG_LEN_FIELD); - if (rc < L1CTL_MSG_LEN_FIELD) { - LOGP_CLI(client, DL1D, LOGL_NOTICE, - "L1CTL server has lost connection (id=%u)\n", - client->id); - if (rc >= 0) + if (rc != L1CTL_MSG_LEN_FIELD) { + if (rc == 0) { + LOGP_CLI(client, DL1D, LOGL_NOTICE, + "L1CTL connection closed by remote peer\n"); + } else if (rc < 0) { + LOGP_CLI(client, DL1D, LOGL_NOTICE, + "L1CTL connection error (rc=%d): %s\n", + rc, strerror(errno)); + } else { + LOGP_CLI(client, DL1D, LOGL_NOTICE, + "L1CTL connection error: short read\n"); rc = -EIO; + } l1ctl_client_conn_close(client); return rc; } @@ -199,6 +206,8 @@ { struct l1ctl_server *server = client->server; + LOGP_CLI(client, DL1C, LOGL_NOTICE, "Closing L1CTL connection\n"); + if (server->cfg->conn_close_cb != NULL) server->cfg->conn_close_cb(client); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie932513f93fd7f1a5f5e70f4d78235551f7599c8 Gerrit-Change-Number: 28864 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rework TRXC/TRXD cleanup logic, add trx_fsm_cleanup_cb()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28861 ) Change subject: trxcon: rework TRXC/TRXD cleanup logic, add trx_fsm_cleanup_cb() ...................................................................... trxcon: rework TRXC/TRXD cleanup logic, add trx_fsm_cleanup_cb() Change-Id: Ic599b51067cb5a331fca521a5b46ab0a2804e499 Related: OS#5599 --- M src/host/trxcon/src/trx_if.c 1 file changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/61/28861/1 diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index af879c1..5e4e696 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -46,6 +46,9 @@ #define S(x) (1 << (x)) +static void trx_fsm_cleanup_cb(struct osmo_fsm_inst *fi, + enum osmo_fsm_term_cause cause); + static struct value_string trx_evt_names[] = { { 0, NULL } /* no events? */ }; @@ -82,6 +85,7 @@ .num_states = ARRAY_SIZE(trx_fsm_states), .log_subsys = DTRXC, .event_names = trx_evt_names, + .cleanup = &trx_fsm_cleanup_cb, }; static int trx_udp_open(void *priv, struct osmo_fd *ofd, const char *host_local, @@ -738,7 +742,11 @@ if (rc < 0) goto udp_error; + /* Reparent trx_instance from trxcon to trx->fi */ + talloc_reparent(trxcon, trx->fi, trx); + trx->trxcon = trxcon; + trx->fi->priv = trx; return trx; @@ -768,13 +776,22 @@ void trx_if_close(struct trx_instance *trx) { + if (trx == NULL || trx->fi == NULL) + return; + osmo_fsm_inst_term(trx->fi, OSMO_FSM_TERM_REQUEST, NULL); +} + +static void trx_fsm_cleanup_cb(struct osmo_fsm_inst *fi, + enum osmo_fsm_term_cause cause) +{ static const char cmd_poweroff[] = "CMD POWEROFF"; + struct trx_instance *trx = fi->priv; /* May be unallocated due to init error */ if (!trx) return; - LOGPFSML(trx->fi, LOGL_NOTICE, "Shutdown transceiver interface\n"); + LOGPFSML(fi, LOGL_NOTICE, "Shutdown transceiver interface\n"); /* Abort TRXC response timer (if pending) */ osmo_timer_del(&trx->trx_ctrl_timer); @@ -791,7 +808,7 @@ trx_udp_close(&trx->trx_ofd_data); /* Free memory */ - osmo_fsm_inst_free(trx->fi); + trx->fi->priv = NULL; talloc_free(trx); } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic599b51067cb5a331fca521a5b46ab0a2804e499 Gerrit-Change-Number: 28861 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rework trxcon_inst cleanup logic, add trxcon_fsm_pre_term_cb()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28862 ) Change subject: trxcon: rework trxcon_inst cleanup logic, add trxcon_fsm_pre_term_cb() ...................................................................... trxcon: rework trxcon_inst cleanup logic, add trxcon_fsm_pre_term_cb() Change-Id: I5eb8ef6f62b1dc949dc60eaa558f123b3b93819c Related: OS#5599 --- M src/host/trxcon/src/trxcon.c M src/host/trxcon/src/trxcon_fsm.c 2 files changed, 33 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/62/28862/1 diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 35687d7..539fb47 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -267,6 +267,9 @@ osmo_fsm_inst_update_id_f(trxcon->fi, "%u", id); trxcon->id = id; + /* Reparent trxcon_inst from ctx to trxcon->fi */ + talloc_reparent(ctx, trxcon->fi, trxcon); + /* Logging context to be used by both l1ctl and l1sched modules */ trxcon->log_prefix = talloc_asprintf(trxcon, "%s: ", osmo_fsm_inst_name(trxcon->fi)); @@ -297,18 +300,9 @@ void trxcon_inst_free(struct trxcon_inst *trxcon) { - /* Shutdown the scheduler */ - if (trxcon->sched != NULL) - l1sched_free(trxcon->sched); - /* Close active connections */ - if (trxcon->l2if != NULL) - l1ctl_client_conn_close(trxcon->l2if); - if (trxcon->phyif != NULL) - trx_if_close(trxcon->phyif); - - if (trxcon->fi != NULL) - osmo_fsm_inst_free(trxcon->fi); - talloc_free(trxcon); + if (trxcon == NULL || trxcon->fi == NULL) + return; + osmo_fsm_inst_term(trxcon->fi, OSMO_FSM_TERM_REQUEST, NULL); } static void l1ctl_conn_accept_cb(struct l1ctl_client *l1c) @@ -334,10 +328,6 @@ return; osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_L2IF_FAILURE, NULL); - - /* l2if is free()ed by the caller */ - trxcon->l2if = NULL; - trxcon_inst_free(trxcon); } static void print_usage(const char *app) diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 3032764..911f14e 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -46,10 +46,12 @@ switch (event) { case TRXCON_EV_PHYIF_FAILURE: + trxcon->phyif = NULL; + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); + break; case TRXCON_EV_L2IF_FAILURE: - LOGPFSML(fi, LOGL_NOTICE, "Event %s is not handled\n", - osmo_fsm_event_name(&trxcon_fsm_def, event)); - /* TODO: osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); */ + trxcon->l2if = NULL; + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); break; case TRXCON_EV_RESET_FULL_REQ: if (fi->state != TRXCON_ST_RESET) @@ -388,6 +390,27 @@ } } +static void trxcon_fsm_pre_term_cb(struct osmo_fsm_inst *fi, + enum osmo_fsm_term_cause cause) +{ + struct trxcon_inst *trxcon = fi->priv; + + if (trxcon == NULL) + return; + + /* Shutdown the scheduler */ + if (trxcon->sched != NULL) + l1sched_free(trxcon->sched); + /* Close active connections */ + if (trxcon->l2if != NULL) + l1ctl_client_conn_close(trxcon->l2if); + if (trxcon->phyif != NULL) + trx_if_close(trxcon->phyif); + + talloc_free(trxcon); + fi->priv = NULL; +} + static const struct osmo_fsm_state trxcon_fsm_states[] = { [TRXCON_ST_RESET] = { .name = "RESET", @@ -474,6 +497,7 @@ | S(TRXCON_EV_PHY_CONFIG_REQ), .allstate_action = &trxcon_allstate_action, .timer_cb = &trxcon_timer_cb, + .pre_term = &trxcon_fsm_pre_term_cb, }; static __attribute__((constructor)) void on_dso_load(void) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5eb8ef6f62b1dc949dc60eaa558f123b3b93819c Gerrit-Change-Number: 28862 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: handle l1sched_config_req via TRXCON_EV_PHY_CONFIG_REQ

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28863 ) Change subject: trxcon: handle l1sched_config_req via TRXCON_EV_PHY_CONFIG_REQ ...................................................................... trxcon: handle l1sched_config_req via TRXCON_EV_PHY_CONFIG_REQ Calling l1sched_free() from trxcon_fsm_pre_term_cb() may result in l1sched_handle_config_req() being called when trxcon->phyif is NULL. Handling l1sched_config_req via TRXCON_EV_PHY_CONFIG_REQ guards us against NULL pointer dereference during teardown of a trxcon_fsm instance, if it's caused by TRXCON_EV_PHYIF_FAILURE. Change-Id: I44bbc695e8a406a7acb9c163bf223f4ea966ea12 Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/trxcon.c M src/host/trxcon/src/trxcon_fsm.c 4 files changed, 43 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/63/28863/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 3d87bb9..6a43bcb 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -62,8 +62,20 @@ /* param of TRXCON_EV_PHY_CONFIG_REQ */ struct trxcon_param_phy_config_req { - uint8_t timing_advance; - uint8_t tx_power; + enum { + TRXCON_PHY_CFGT_PCHAN_COMB, + TRXCON_PHY_CFGT_TX_PARAMS, + } type; + union { + struct { + uint8_t tn; + uint8_t pchan; + } pchan_comb; + struct { + uint8_t timing_advance; + uint8_t tx_power; + } tx_params; + }; }; /* param of TRXCON_EV_TX_{TRAFFIC,DATA}_REQ */ diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index af1ff77..b907917 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -667,8 +667,11 @@ par_req->ta, par_req->tx_power); struct trxcon_param_phy_config_req req = { - .timing_advance = par_req->ta, - .tx_power = par_req->tx_power, + .type = TRXCON_PHY_CFGT_TX_PARAMS, + .tx_params = { + .timing_advance = par_req->ta, + .tx_power = par_req->tx_power, + } }; osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_PHY_CONFIG_REQ, &req); diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 539fb47..b3f32ab 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -112,9 +112,17 @@ switch (cr->type) { case L1SCHED_CFG_PCHAN_COMB: - return trx_if_cmd_setslot(trxcon->phyif, - cr->pchan_comb.tn, - cr->pchan_comb.pchan); + { + struct trxcon_param_phy_config_req req = { + .type = TRXCON_PHY_CFGT_PCHAN_COMB, + .pchan_comb = { + .tn = cr->pchan_comb.tn, + .pchan = cr->pchan_comb.pchan, + }, + }; + + return osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_PHY_CONFIG_REQ, &req); + } default: LOGPFSML(trxcon->fi, LOGL_ERROR, "Unhandled config request (type 0x%02x)\n", cr->type); diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 911f14e..fb9bd8f 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -67,10 +67,19 @@ { const struct trxcon_param_phy_config_req *req = data; - if (trxcon->l1p.ta != req->timing_advance) - trx_if_cmd_setta(trxcon->phyif, req->timing_advance); - trxcon->l1p.tx_power = req->tx_power; - trxcon->l1p.ta = req->timing_advance; + switch (req->type) { + case TRXCON_PHY_CFGT_PCHAN_COMB: + trx_if_cmd_setslot(trxcon->phyif, + req->pchan_comb.tn, + req->pchan_comb.pchan); + break; + case TRXCON_PHY_CFGT_TX_PARAMS: + if (trxcon->l1p.ta != req->tx_params.timing_advance) + trx_if_cmd_setta(trxcon->phyif, req->tx_params.timing_advance); + trxcon->l1p.tx_power = req->tx_params.tx_power; + trxcon->l1p.ta = req->tx_params.timing_advance; + break; + } break; } default: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I44bbc695e8a406a7acb9c163bf223f4ea966ea12 Gerrit-Change-Number: 28863 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: cosmetic: rename TRXCON_EV_{L1IF->PHYIF}_FAILURE

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28860 ) Change subject: trxcon: cosmetic: rename TRXCON_EV_{L1IF->PHYIF}_FAILURE ...................................................................... trxcon: cosmetic: rename TRXCON_EV_{L1IF->PHYIF}_FAILURE Change-Id: I9159492a04bc071b7b04d9b88d4e6fd13cc3af31 --- M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/trx_if.c M src/host/trxcon/src/trxcon_fsm.c 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/60/28860/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index dadd42d..3d87bb9 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -13,7 +13,7 @@ }; enum trxcon_fsm_events { - TRXCON_EV_L1IF_FAILURE, + TRXCON_EV_PHYIF_FAILURE, TRXCON_EV_L2IF_FAILURE, TRXCON_EV_RESET_FULL_REQ, TRXCON_EV_RESET_SCHED_REQ, diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index d51c9d1..af879c1 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -712,7 +712,7 @@ } /* Allocate a new dedicated state machine */ - trx->fi = osmo_fsm_inst_alloc_child(&trx_fsm, trxcon->fi, TRXCON_EV_L1IF_FAILURE); + trx->fi = osmo_fsm_inst_alloc_child(&trx_fsm, trxcon->fi, TRXCON_EV_PHYIF_FAILURE); if (trx->fi == NULL) { LOGPFSML(trxcon->fi, LOGL_ERROR, "Failed to allocate an instance " "of FSM '%s'\n", trx_fsm.name); diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index ad86b95..3032764 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -45,7 +45,7 @@ struct trxcon_inst *trxcon = fi->priv; switch (event) { - case TRXCON_EV_L1IF_FAILURE: + case TRXCON_EV_PHYIF_FAILURE: case TRXCON_EV_L2IF_FAILURE: LOGPFSML(fi, LOGL_NOTICE, "Event %s is not handled\n", osmo_fsm_event_name(&trxcon_fsm_def, event)); @@ -439,7 +439,7 @@ }; static const struct value_string trxcon_fsm_event_names[] = { - OSMO_VALUE_STRING(TRXCON_EV_L1IF_FAILURE), + OSMO_VALUE_STRING(TRXCON_EV_PHYIF_FAILURE), OSMO_VALUE_STRING(TRXCON_EV_L2IF_FAILURE), OSMO_VALUE_STRING(TRXCON_EV_RESET_FULL_REQ), OSMO_VALUE_STRING(TRXCON_EV_RESET_SCHED_REQ), @@ -467,7 +467,7 @@ .num_states = ARRAY_SIZE(trxcon_fsm_states), .log_subsys = DAPP, .event_names = trxcon_fsm_event_names, - .allstate_event_mask = S(TRXCON_EV_L1IF_FAILURE) + .allstate_event_mask = S(TRXCON_EV_PHYIF_FAILURE) | S(TRXCON_EV_L2IF_FAILURE) | S(TRXCON_EV_RESET_FULL_REQ) | S(TRXCON_EV_RESET_SCHED_REQ) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9159492a04bc071b7b04d9b88d4e6fd13cc3af31 Gerrit-Change-Number: 28860 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: cosmetic: rename TRXCON_EV_{SET->PHY}_CONFIG_REQ

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28859 ) Change subject: trxcon: cosmetic: rename TRXCON_EV_{SET->PHY}_CONFIG_REQ ...................................................................... trxcon: cosmetic: rename TRXCON_EV_{SET->PHY}_CONFIG_REQ Change-Id: Ib70ff0352b6fcb045d0f49535dfb0d273856f3c3 --- M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/trxcon_fsm.c 3 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/59/28859/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 69ac01e..dadd42d 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -23,7 +23,7 @@ TRXCON_EV_FBSB_SEARCH_RES, TRXCON_EV_SET_CCCH_MODE_REQ, TRXCON_EV_SET_TCH_MODE_REQ, - TRXCON_EV_SET_CONFIG_REQ, + TRXCON_EV_PHY_CONFIG_REQ, TRXCON_EV_TX_ACCESS_BURST_REQ, TRXCON_EV_DEDICATED_ESTABLISH_REQ, TRXCON_EV_DEDICATED_RELEASE_REQ, @@ -60,8 +60,8 @@ bool applied; }; -/* param of TRXCON_EV_SET_CONFIG_REQ */ -struct trxcon_param_set_config_req { +/* param of TRXCON_EV_PHY_CONFIG_REQ */ +struct trxcon_param_phy_config_req { uint8_t timing_advance; uint8_t tx_power; }; diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 5f95e1c..af1ff77 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -666,12 +666,12 @@ "Received L1CTL_PARAM_REQ (ta=%d, tx_power=%u)\n", par_req->ta, par_req->tx_power); - struct trxcon_param_set_config_req req = { + struct trxcon_param_phy_config_req req = { .timing_advance = par_req->ta, .tx_power = par_req->tx_power, }; - osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_SET_CONFIG_REQ, &req); + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_PHY_CONFIG_REQ, &req); msgb_free(msg); return 0; diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 5329a92..ad86b95 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -61,9 +61,9 @@ case TRXCON_EV_RESET_SCHED_REQ: l1sched_reset(trxcon->sched, false); break; - case TRXCON_EV_SET_CONFIG_REQ: + case TRXCON_EV_PHY_CONFIG_REQ: { - const struct trxcon_param_set_config_req *req = data; + const struct trxcon_param_phy_config_req *req = data; if (trxcon->l1p.ta != req->timing_advance) trx_if_cmd_setta(trxcon->phyif, req->timing_advance); @@ -449,7 +449,7 @@ OSMO_VALUE_STRING(TRXCON_EV_FBSB_SEARCH_RES), OSMO_VALUE_STRING(TRXCON_EV_SET_CCCH_MODE_REQ), OSMO_VALUE_STRING(TRXCON_EV_SET_TCH_MODE_REQ), - OSMO_VALUE_STRING(TRXCON_EV_SET_CONFIG_REQ), + OSMO_VALUE_STRING(TRXCON_EV_PHY_CONFIG_REQ), OSMO_VALUE_STRING(TRXCON_EV_TX_ACCESS_BURST_REQ), OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_ESTABLISH_REQ), OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_RELEASE_REQ), @@ -471,7 +471,7 @@ | S(TRXCON_EV_L2IF_FAILURE) | S(TRXCON_EV_RESET_FULL_REQ) | S(TRXCON_EV_RESET_SCHED_REQ) - | S(TRXCON_EV_SET_CONFIG_REQ), + | S(TRXCON_EV_PHY_CONFIG_REQ), .allstate_action = &trxcon_allstate_action, .timer_cb = &trxcon_timer_cb, }; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib70ff0352b6fcb045d0f49535dfb0d273856f3c3 Gerrit-Change-Number: 28859 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: SMPP: clarify (re)start logic

by fixeria

Attention is currently required from: msuraev. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28843 ) Change subject: SMPP: clarify (re)start logic ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I353f5b82c9f5308d93e926538d4ef7e24d0b0339 Gerrit-Change-Number: 28843 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 19:05:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: ESME: log more connection details

by fixeria

Attention is currently required from: pespin, msuraev. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28841 ) Change subject: ESME: log more connection details ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/28841/comment/e395c631_68f234c2 PS1, Line 7: ESME: log more connection details > this title is a bit misleading with regards to the content, since you are dropping some fields in st […] Agreed with Pau. I would say "use osmo_sock_get_name() to print conn details" or so. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I34bd4c145b0f6287a323e2350808feb59f1d3187 Gerrit-Change-Number: 28841 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 19:03:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: cosmetic: use proper name for SMPP handlers

by fixeria

Attention is currently required from: pespin, msuraev. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28840 ) Change subject: cosmetic: use proper name for SMPP handlers ...................................................................... Patch Set 1: (1 comment) File src/libmsc/smpp_openbsc.c: https://gerrit.osmocom.org/c/osmo-msc/+/28840/comment/7f690f81_304e0743 PS1, Line 831: int smpp_openbsc_alloc_init(void *ctx) > you could change the function name while at it too ;) Ack, and remove 'openbsc' from the filename. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0d714e927e287a0ea9362008ed050a492510e22b Gerrit-Change-Number: 28840 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 18:59:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: SMPP: clarify (re)start logic

by pespin

Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28843 ) Change subject: SMPP: clarify (re)start logic ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I353f5b82c9f5308d93e926538d4ef7e24d0b0339 Gerrit-Change-Number: 28843 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 18:57:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: tests: use common stubs for SMS queue test

by pespin

Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28842 ) Change subject: tests: use common stubs for SMS queue test ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File tests/stubs.c: https://gerrit.osmocom.org/c/osmo-msc/+/28842/comment/09eb00a9_cafd51f2 PS1, Line 42: char *osmo_stream_srv_link_get_sockname(const struct osmo_stream_srv_link *link) { return NULL; } not sure if returning NULL instead of "" here may be an issue? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic854eb919e6fcc82bd0245f62c72985b938c6b7a Gerrit-Change-Number: 28842 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 18:57:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: ESME: log more connection details

by pespin

Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28841 ) Change subject: ESME: log more connection details ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/28841/comment/16d67305_4a036a4e PS1, Line 7: ESME: log more connection details this title is a bit misleading with regards to the content, since you are dropping some fields in structs. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I34bd4c145b0f6287a323e2350808feb59f1d3187 Gerrit-Change-Number: 28841 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 18:55:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: cosmetic: use proper name for SMPP handlers

by pespin

Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28840 ) Change subject: cosmetic: use proper name for SMPP handlers ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/libmsc/smpp_openbsc.c: https://gerrit.osmocom.org/c/osmo-msc/+/28840/comment/17e4a662_e9cacf5d PS1, Line 831: int smpp_openbsc_alloc_init(void *ctx) you could change the function name while at it too ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0d714e927e287a0ea9362008ed050a492510e22b Gerrit-Change-Number: 28840 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 18:53:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: Ignore .deb build byproducts

by pespin

Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28839 ) Change subject: Ignore .deb build byproducts ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/28839/comment/97bca28c_df7800d6 PS1, Line 9: Signed-off-by: Max <msuraev(a)sysmocom.de> BTW, no need for signed-off-by? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0ff10ef5766edf5f2aacf62acc98f25f01706ab4 Gerrit-Change-Number: 28839 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 18:52:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: Ignore .deb build byproducts

by pespin

Attention is currently required from: msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28839 ) Change subject: Ignore .deb build byproducts ...................................................................... Patch Set 1: Code-Review-1 (1 comment) File .gitignore: https://gerrit.osmocom.org/c/osmo-msc/+/28839/comment/1d7298cf_49260de5 PS1, Line 83: doc/manuals/vty/*.xml This is wrong. Why do you want to exclude msc_vty_additions.xml? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0ff10ef5766edf5f2aacf62acc98f25f01706ab4 Gerrit-Change-Number: 28839 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 18:52:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: tests: use common stubs for SMS queue test

by msuraev

msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28842 ) Change subject: tests: use common stubs for SMS queue test ...................................................................... Patch Set 1: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic854eb919e6fcc82bd0245f62c72985b938c6b7a Gerrit-Change-Number: 28842 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 29 Jul 2022 18:05:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: SMPP: clarify (re)start logic

by msuraev

msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28843 ) Change subject: SMPP: clarify (re)start logic ...................................................................... Patch Set 1: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I353f5b82c9f5308d93e926538d4ef7e24d0b0339 Gerrit-Change-Number: 28843 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 29 Jul 2022 18:05:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: ESME: log more connection details

by msuraev

msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28841 ) Change subject: ESME: log more connection details ...................................................................... Patch Set 1: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I34bd4c145b0f6287a323e2350808feb59f1d3187 Gerrit-Change-Number: 28841 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 29 Jul 2022 18:05:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: cosmetic: use proper name for SMPP handlers

by msuraev

msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28840 ) Change subject: cosmetic: use proper name for SMPP handlers ...................................................................... Patch Set 1: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0d714e927e287a0ea9362008ed050a492510e22b Gerrit-Change-Number: 28840 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 29 Jul 2022 18:04:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-msc[master]: Ignore .deb build byproducts

by msuraev

msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28839 ) Change subject: Ignore .deb build byproducts ...................................................................... Patch Set 1: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0ff10ef5766edf5f2aacf62acc98f25f01706ab4 Gerrit-Change-Number: 28839 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 29 Jul 2022 18:03:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: *_smscb_peer_fsm: Immediately NACK if Tx of msg failed

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28854 to look at the new patch set (#2). Change subject: *_smscb_peer_fsm: Immediately NACK if Tx of msg failed ...................................................................... *_smscb_peer_fsm: Immediately NACK if Tx of msg failed This makes the smscb_message_fsm receive immediate notice that this peer failed to deliver the message, avoiding need to wait for 10 seconds timeout. Change-Id: I1f3911accb327f3378d65902d53d86fb298fd528 --- M src/cbsp_smscb_peer_fsm.c M src/sbcap_smscb_peer_fsm.c M src/smscb_message_fsm.c 3 files changed, 27 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/54/28854/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I1f3911accb327f3378d65902d53d86fb298fd528 Gerrit-Change-Number: 28854 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

Change in docker-playground[master]: ttcn3-cbc: Adapt ports in osmo-cbc.git to default ttcn3 ones

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/28858 ) Change subject: ttcn3-cbc: Adapt ports in osmo-cbc.git to default ttcn3 ones ...................................................................... ttcn3-cbc: Adapt ports in osmo-cbc.git to default ttcn3 ones This is intended to ease adding new emulated MMEs and BSCs by using next available port strting from the one defined in the TTCN3 test module parameter. Requires: osmo-ttcn3-hacks.git Ib443aba9396aebe0a56b1a79719bbcf66302a1aa Change-Id: Ib1387284c8f361572057b6d036429366238382a6 --- M ttcn3-cbc-test/osmo-cbc.cfg 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/58/28858/1 diff --git a/ttcn3-cbc-test/osmo-cbc.cfg b/ttcn3-cbc-test/osmo-cbc.cfg index c2c1b7b..9d7f4a1 100644 --- a/ttcn3-cbc-test/osmo-cbc.cfg +++ b/ttcn3-cbc-test/osmo-cbc.cfg @@ -33,9 +33,9 @@ local-port 29168 peer cbsp ttcn3-bsc mode server - remote-port 9999 + remote-port 15000 remote-ip 172.18.27.100 peer sbcap ttcn3-mme mode server - remote-port 9998 + remote-port 16000 remote-ip 172.18.27.100 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib1387284c8f361572057b6d036429366238382a6 Gerrit-Change-Number: 28858 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Change default cbsp/sbcap ports to allow multiple bsc/mme

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28857 ) Change subject: cbc: Change default cbsp/sbcap ports to allow multiple bsc/mme ...................................................................... cbc: Change default cbsp/sbcap ports to allow multiple bsc/mme The BSC/MMEs ports are applied in osmo-cbc.cfg similarly in sequential order. Change-Id: Ib443aba9396aebe0a56b1a79719bbcf66302a1aa --- M cbc/CBC_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/57/28857/1 diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index 9c9c644..76fc3be 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -38,8 +38,8 @@ integer mp_cbc_cbsp_port := 48049; integer mp_cbc_sbcap_port := c_SBC_AP_PORT; integer mp_cbc_ecbe_port := 12345; - integer mp_local_cbsp_port := 9999; - integer mp_local_sbcap_port := 9998; + integer mp_local_cbsp_port := 15000; + integer mp_local_sbcap_port := 16000; }; const integer MAX_BSC := 3; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib443aba9396aebe0a56b1a79719bbcf66302a1aa Gerrit-Change-Number: 28857 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Enable MMEs and BSCs selectively

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28856 ) Change subject: cbc: Enable MMEs and BSCs selectively ...................................................................... cbc: Enable MMEs and BSCs selectively Let's only create BSC handlers (no MM handlers) in tests validating CBSP specific features. A new test is added to specifically validate scenarios with both an MME and BSC attached to the CBC. Change-Id: I79ee41f183ef49e9fd606d2a3efa2767628bf142 --- M cbc/CBC_Tests.ttcn 1 file changed, 29 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/28856/1 diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index 5240d85..9c9c644 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -135,7 +135,7 @@ g_vc_conn_MME[idx].start(f_MME_ConnHdlr_main(id, pars)); } -private function f_init(integer num_bsc := 1, integer num_mme := 1) runs on test_CT { +private function f_init(integer num_bsc := 0, integer num_mme := 0) runs on test_CT { f_http_init(mp_cbc_host, mp_cbc_ecbe_port); g_num_bsc := num_bsc; @@ -168,7 +168,7 @@ } testcase TC_rx_keepalive() runs on test_CT { - f_init(); + f_init(num_bsc := 1); g_pars_BSC[0].start_fn := refers(f_bsc_TC_rx_keepalive); f_start(); f_shutdown_helper(); @@ -191,7 +191,7 @@ CBSP[0].receive(PortEvent:{connClosed:=?}) } testcase TC_rx_keepalive_timeout() runs on test_CT { - f_init(); + f_init(num_bsc := 1); g_pars_BSC[0].start_fn := refers(f_bsc_TC_rx_keepalive_timeout); f_start(); f_shutdown_helper(); @@ -220,7 +220,7 @@ } }; - f_init(); + f_init(num_bsc := 1); g_pars_BSC[0].exp_cbs_msg := msg; g_pars_BSC[0].start_fn := refers(f_bsc_TC_write_replace); f_start(); @@ -330,7 +330,7 @@ /* specify a variety of different Cell Identifier formats to extend test coverage */ testcase TC_ecbe_create_delete_cgi() runs on test_CT { - f_init(); + f_init(num_bsc := 1); var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; var template (value) CBS_Message msg := t_CBSmsg(43, 16752); @@ -342,14 +342,12 @@ g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); g_pars_BSC[0].exp_cbs_msg := valueof(msg); g_pars_BSC[0].cell_list_success := valueof(cell_list_success); - g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); - g_pars_MME[0].exp_cbs_msg := valueof(msg); f_start(); f_create_and_delete(valueof(msg)); f_shutdown_helper(); } testcase TC_ecbe_create_delete_lac_ci() runs on test_CT { - f_init(); + f_init(num_bsc := 1); var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; var template (value) CBS_Message msg := t_CBSmsg(44, 16752); cell_list_success := ts_BSSMAP_CIL_LAC_CI({ @@ -360,14 +358,12 @@ g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); g_pars_BSC[0].exp_cbs_msg := valueof(msg); g_pars_BSC[0].cell_list_success := valueof(cell_list_success); - g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); - g_pars_MME[0].exp_cbs_msg := valueof(msg); f_start(); f_create_and_delete(valueof(msg)); f_shutdown_helper(); } testcase TC_ecbe_create_delete_lac() runs on test_CT { - f_init(); + f_init(num_bsc := 1); var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; var template (value) CBS_Message msg := t_CBSmsg(45, 16752); cell_list_success := ts_BSSMAP_CIL_LAC({ @@ -378,14 +374,12 @@ g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); g_pars_BSC[0].exp_cbs_msg := valueof(msg); g_pars_BSC[0].cell_list_success := valueof(cell_list_success); - g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); - g_pars_MME[0].exp_cbs_msg := valueof(msg); f_start(); f_create_and_delete(valueof(msg)); f_shutdown_helper(); } testcase TC_ecbe_create_delete_ci() runs on test_CT { - f_init(); + f_init(num_bsc := 1); var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; var template (value) CBS_Message msg := t_CBSmsg(46, 16752); cell_list_success := ts_BSSMAP_CIL_CI({ @@ -396,14 +390,12 @@ g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); g_pars_BSC[0].exp_cbs_msg := valueof(msg); g_pars_BSC[0].cell_list_success := valueof(cell_list_success); - g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); - g_pars_MME[0].exp_cbs_msg := valueof(msg); f_start(); f_create_and_delete(valueof(msg)); f_shutdown_helper(); } testcase TC_ecbe_create_delete_lai() runs on test_CT { - f_init(); + f_init(num_bsc := 1); var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; var template (value) CBS_Message msg := t_CBSmsg(47, 16752); cell_list_success := ts_BSSMAP_CIL_LAI({ @@ -414,6 +406,25 @@ g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); g_pars_BSC[0].exp_cbs_msg := valueof(msg); g_pars_BSC[0].cell_list_success := valueof(cell_list_success); + f_start(); + f_create_and_delete(valueof(msg)); + f_shutdown_helper(); +} + +/* Create and delete message with both BSC and MME available */ +testcase TC_ecbe_create_delete_bsc_and_mme() runs on test_CT { + f_init(num_bsc := 1, num_mme := 1); + var template (value) BSSMAP_FIELD_CellIdentificationList cell_list_success; + var template (value) CBS_Message msg := t_CBSmsg(43, 16752); + + cell_list_success := ts_BSSMAP_CIL_CGI({ + ts_BSSMAP_CI_CGI('901'H, '70'H, 23, 42), + ts_BSSMAP_CI_CGI('901'H, '70'H, 24, 42), + ts_BSSMAP_CI_CGI('901'H, '70'H, 24, 43) + }); + g_pars_BSC[0].start_fn := refers(f_bsc_create_and_delete); + g_pars_BSC[0].exp_cbs_msg := valueof(msg); + g_pars_BSC[0].cell_list_success := valueof(cell_list_success); g_pars_MME[0].start_fn := refers(f_mme_create_and_delete); g_pars_MME[0].exp_cbs_msg := valueof(msg); f_start(); @@ -429,6 +440,7 @@ execute( TC_ecbe_create_delete_lac() ); execute( TC_ecbe_create_delete_ci() ); execute( TC_ecbe_create_delete_lai() ); + execute( TC_ecbe_create_delete_bsc_and_mme() ); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I79ee41f183ef49e9fd606d2a3efa2767628bf142 Gerrit-Change-Number: 28856 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Fix use of incorrect variable in loop

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28855 ) Change subject: cbc: Fix use of incorrect variable in loop ...................................................................... cbc: Fix use of incorrect variable in loop This went unnoticed before because all tests were running with both bsc and mme set to 1. Change-Id: I978c92819cb4e218c95bc719ade71787dc474b23 --- M cbc/CBC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/55/28855/1 diff --git a/cbc/CBC_Tests.ttcn b/cbc/CBC_Tests.ttcn index 11b8e5a..5240d85 100644 --- a/cbc/CBC_Tests.ttcn +++ b/cbc/CBC_Tests.ttcn @@ -150,7 +150,7 @@ } function f_start() runs on test_CT { - for (var integer i := 0; i < g_num_mme; i := i + 1) { + for (var integer i := 0; i < g_num_bsc; i := i + 1) { f_start_bsc(i, testcasename(), g_pars_BSC[i]); } for (var integer i := 0; i < g_num_mme; i := i + 1) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I978c92819cb4e218c95bc719ade71787dc474b23 Gerrit-Change-Number: 28855 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: Propagate error to caller when tx cbsp/sbcap Write-Replace-Req fails

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28853 ) Change subject: Propagate error to caller when tx cbsp/sbcap Write-Replace-Req fails ...................................................................... Propagate error to caller when tx cbsp/sbcap Write-Replace-Req fails Change-Id: Ie40c8e41c297398bbec48f7bb2c60cfdc703fa5d --- M include/osmocom/cbc/cbsp_link.h M include/osmocom/cbc/sbcap_link.h M src/cbc_message.c M src/cbsp_link.c M src/sbcap_link.c 5 files changed, 19 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/53/28853/1 diff --git a/include/osmocom/cbc/cbsp_link.h b/include/osmocom/cbc/cbsp_link.h index a96162d..0a18d21 100644 --- a/include/osmocom/cbc/cbsp_link.h +++ b/include/osmocom/cbc/cbsp_link.h @@ -47,6 +47,6 @@ void cbc_cbsp_link_free(struct cbc_cbsp_link *link); const char *cbc_cbsp_link_name(const struct cbc_cbsp_link *link); int cbc_cbsp_link_open_cli(struct cbc_cbsp_link *link); -void cbc_cbsp_link_tx(struct cbc_cbsp_link *link, struct osmo_cbsp_decoded *cbsp); +int cbc_cbsp_link_tx(struct cbc_cbsp_link *link, struct osmo_cbsp_decoded *cbsp); void cbc_cbsp_link_close(struct cbc_cbsp_link *link); int cbc_cbsp_link_rx_cb(struct cbc_cbsp_link *link, struct osmo_cbsp_decoded *dec); diff --git a/include/osmocom/cbc/sbcap_link.h b/include/osmocom/cbc/sbcap_link.h index 0c23710..ee87be4 100644 --- a/include/osmocom/cbc/sbcap_link.h +++ b/include/osmocom/cbc/sbcap_link.h @@ -47,6 +47,6 @@ void cbc_sbcap_link_free(struct cbc_sbcap_link *link); const char *cbc_sbcap_link_name(const struct cbc_sbcap_link *link); int cbc_sbcap_link_open_cli(struct cbc_sbcap_link *link); -void cbc_sbcap_link_tx(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu); +int cbc_sbcap_link_tx(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu); void cbc_sbcap_link_close(struct cbc_sbcap_link *link); int cbc_sbcap_link_rx_cb(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu); diff --git a/src/cbc_message.c b/src/cbc_message.c index a2bf86a..f17ab75 100644 --- a/src/cbc_message.c +++ b/src/cbc_message.c @@ -70,8 +70,8 @@ peer->name); return -EINVAL; } - cbc_cbsp_link_tx(peer->link.cbsp, cbsp); - break; + return cbc_cbsp_link_tx(peer->link.cbsp, cbsp); + case CBC_PEER_PROTO_SBcAP: /* skip peers without any current SBc-AP connection */ if (!peer->link.sbcap) { @@ -84,17 +84,16 @@ peer->name); return -EINVAL; } - cbc_sbcap_link_tx(peer->link.sbcap, sbcap); - break; + return cbc_sbcap_link_tx(peer->link.sbcap, sbcap); + case CBC_PEER_PROTO_SABP: LOGP(DLGLOBAL, LOGL_ERROR, "Sending message to peer proto %s not implemented!\n", get_value_string(cbc_peer_proto_name, peer->proto)); return -1; + default: OSMO_ASSERT(0); } - - return 0; } /* receive a new CBC message from the user (REST). Allocates new memory, diff --git a/src/cbsp_link.c b/src/cbsp_link.c index 343ac26..a6462ee 100644 --- a/src/cbsp_link.c +++ b/src/cbsp_link.c @@ -318,14 +318,14 @@ return 0; } -void cbc_cbsp_link_tx(struct cbc_cbsp_link *link, struct osmo_cbsp_decoded *cbsp) +int cbc_cbsp_link_tx(struct cbc_cbsp_link *link, struct osmo_cbsp_decoded *cbsp) { struct msgb *msg; if (!link) { LOGP(DCBSP, LOGL_NOTICE, "Cannot transmit %s: no connection\n", get_value_string(cbsp_msg_type_names, cbsp->msg_type)); - return ; + return -ENOLINK; } LOGPCC(link, LOGL_INFO, "Transmitting %s\n", @@ -336,13 +336,14 @@ LOGPCC(link, LOGL_ERROR, "Failed to encode CBSP %s: %s\n", get_value_string(cbsp_msg_type_names, cbsp->msg_type), osmo_cbsp_errstr); talloc_free(cbsp); - return; + return -EINVAL; } talloc_free(cbsp); if (link->is_client) osmo_stream_cli_send(link->cli_conn, msg); else osmo_stream_srv_send(link->srv_conn, msg); + return 0; } void cbc_cbsp_link_close(struct cbc_cbsp_link *link) diff --git a/src/sbcap_link.c b/src/sbcap_link.c index 91fa75c..b2a5aa2 100644 --- a/src/sbcap_link.c +++ b/src/sbcap_link.c @@ -379,27 +379,30 @@ return 0; } -void cbc_sbcap_link_tx(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu) +int cbc_sbcap_link_tx(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu) { struct msgb *msg; + int rc = 0; if (!pdu) { LOGP(DSBcAP, LOGL_NOTICE, "Cannot transmit msg: no pdu\n"); - return; + return -ENOMSG; } if (!link) { LOGP(DSBcAP, LOGL_NOTICE, "Cannot transmit msg %s: no connection\n", sbcap_pdu_get_name(pdu)); - return; + return -ENOLINK; } LOGPSBCAPC(link, LOGL_INFO, "Tx msg %s\n", sbcap_pdu_get_name(pdu)); OSMO_ASSERT(link->conn); msg = sbcap_encode(pdu); - if (!msg) + if (!msg) { + rc = -EINVAL; goto ret_free; + } LOGPSBCAPC(link, LOGL_DEBUG, "Encoded message %s: %s\n", sbcap_pdu_get_name(pdu), msgb_hexdump(msg)); if (link->is_client) @@ -408,6 +411,7 @@ osmo_stream_srv_send(link->srv_conn, msg); ret_free: sbcap_pdu_free(pdu); + return rc; } void cbc_sbcap_link_close(struct cbc_sbcap_link *link) -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ie40c8e41c297398bbec48f7bb2c60cfdc703fa5d Gerrit-Change-Number: 28853 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: *_smscb_peer_fsm: Immediately NACK if Tx of msg failed

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28854 ) Change subject: *_smscb_peer_fsm: Immediately NACK if Tx of msg failed ...................................................................... *_smscb_peer_fsm: Immediately NACK if Tx of msg failed This makes the smscb_message_fsm receive immediate notice that this peer failed to deliver the message, avoiding need to wait for 10 seconds timeout. Change-Id: I1f3911accb327f3378d65902d53d86fb298fd528 --- M src/cbsp_smscb_peer_fsm.c M src/sbcap_smscb_peer_fsm.c M src/smscb_message_fsm.c 3 files changed, 27 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/54/28854/1 diff --git a/src/cbsp_smscb_peer_fsm.c b/src/cbsp_smscb_peer_fsm.c index 872008c..bce90df 100644 --- a/src/cbsp_smscb_peer_fsm.c +++ b/src/cbsp_smscb_peer_fsm.c @@ -266,11 +266,9 @@ case SMSCB_PEER_E_CREATE: /* send it to peer */ rc = peer_new_cbc_message(mp->peer, mp->cbcmsg); - if (rc == 0) { - /* wait for peers' response */ - osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_WRITE_ACK, 10, - T_WAIT_WRITE_ACK); - } + osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_WRITE_ACK, 10, T_WAIT_WRITE_ACK); + if (rc != 0) /* Immediatelly timeout the message */ + fi->fsm->timer_cb(fi); break; default: OSMO_ASSERT(0); @@ -309,6 +307,7 @@ { struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; struct osmo_cbsp_decoded *cbsp; + int rc; switch (event) { case SMSCB_PEER_E_REPLACE: /* send WRITE-REPLACE to BSC */ @@ -320,8 +319,10 @@ /* TODO: we assume that the replace will always affect all original cells */ cbsp_append_cell_list(&cbsp->u.write_replace.cell_list, cbsp, mp); // TODO: ALL OTHER DATA - cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); + rc = cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_REPLACE_ACK, 10, T_WAIT_REPLACE_ACK); + if (rc != 0) /* Immediatelly timeout the message */ + fi->fsm->timer_cb(fi); break; case SMSCB_PEER_E_STATUS: /* send MSG-STATUS-QUERY to BSC */ cbsp = osmo_cbsp_decoded_alloc(mp->peer, CBSP_MSGT_MSG_STATUS_QUERY); @@ -330,8 +331,10 @@ cbsp->u.msg_status_query.old_serial_nr = mp->cbcmsg->msg.serial_nr; cbsp_append_cell_list(&cbsp->u.msg_status_query.cell_list, cbsp, mp); cbsp->u.msg_status_query.channel_ind = CBSP_CHAN_IND_BASIC; - cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); + rc = cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_STATUS_ACK, 10, T_WAIT_STATUS_ACK); + if (rc != 0) /* Immediatelly timeout the message */ + fi->fsm->timer_cb(fi); break; default: OSMO_ASSERT(0); @@ -423,8 +426,6 @@ } } - - static int smscb_p_fsm_timer_cb(struct osmo_fsm_inst *fi) { switch (fi->T) { @@ -454,6 +455,7 @@ { struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; struct osmo_cbsp_decoded *cbsp; + int rc; switch (event) { case SMSCB_PEER_E_DELETE: /* send KILL to BSC */ @@ -478,8 +480,10 @@ OSMO_ASSERT(cbsp->u.kill.channel_ind); *(cbsp->u.kill.channel_ind) = CBSP_CHAN_IND_BASIC; } - cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); + rc = cbc_cbsp_link_tx(mp->peer->link.cbsp, cbsp); osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_DELETE_ACK, 10, T_WAIT_DELETE_ACK); + if (rc != 0) /* Immediatelly timeout the message */ + fi->fsm->timer_cb(fi); break; default: OSMO_ASSERT(0); @@ -497,7 +501,8 @@ [SMSCB_S_INIT] = { .name = "INIT", .in_event_mask = S(SMSCB_PEER_E_CREATE), - .out_state_mask = S(SMSCB_S_WAIT_WRITE_ACK), + .out_state_mask = S(SMSCB_S_WAIT_WRITE_ACK) | + S(SMSCB_S_ACTIVE), .action = smscb_p_fsm_init, }, [SMSCB_S_WAIT_WRITE_ACK] = { diff --git a/src/sbcap_smscb_peer_fsm.c b/src/sbcap_smscb_peer_fsm.c index 706a98f..f43b644 100644 --- a/src/sbcap_smscb_peer_fsm.c +++ b/src/sbcap_smscb_peer_fsm.c @@ -116,11 +116,9 @@ case SMSCB_PEER_E_CREATE: /* send it to peer */ rc = peer_new_cbc_message(mp->peer, mp->cbcmsg); - if (rc == 0) { - /* wait for peers' response */ - osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_WRITE_ACK, 10, - T_WAIT_WRITE_ACK); - } + osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_WRITE_ACK, 10, T_WAIT_WRITE_ACK); + if (rc != 0) /* Immediatelly timeout the message */ + fi->fsm->timer_cb(fi); break; default: OSMO_ASSERT(0); @@ -256,6 +254,7 @@ SBcAP_SBC_AP_PDU_t *sbcap; A_SEQUENCE_OF(void) *as_pdu; SBcAP_Write_Replace_Warning_Indication_IEs_t *ie; + int rc; switch (event) { case SMSCB_PEER_E_DELETE: /* send Stop-Warning to MME */ @@ -269,13 +268,16 @@ break; } if ((sbcap = sbcap_gen_stop_warning_req(mp->peer, mp->cbcmsg))) { - cbc_sbcap_link_tx(mp->peer->link.sbcap, sbcap); + rc = cbc_sbcap_link_tx(mp->peer->link.sbcap, sbcap); } else { LOGP(DSBcAP, LOGL_ERROR, "[%s] Tx SBc-AP Stop-Warning-Request: msg gen failed\n", mp->peer->name); + rc = -1; } osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_DELETE_ACK, 10, T_WAIT_DELETE_ACK); + if (rc != 0) /* Immediatelly timeout the message */ + fi->fsm->timer_cb(fi); break; case SMSCB_PEER_E_SBCAP_WRITE_IND: sbcap = (SBcAP_SBC_AP_PDU_t *)data; @@ -305,7 +307,8 @@ [SMSCB_S_INIT] = { .name = "INIT", .in_event_mask = S(SMSCB_PEER_E_CREATE), - .out_state_mask = S(SMSCB_S_WAIT_WRITE_ACK), + .out_state_mask = S(SMSCB_S_WAIT_WRITE_ACK) | + S(SMSCB_S_ACTIVE), .action = smscb_p_fsm_init, }, [SMSCB_S_WAIT_WRITE_ACK] = { diff --git a/src/smscb_message_fsm.c b/src/smscb_message_fsm.c index 9281736..e7f96c0 100644 --- a/src/smscb_message_fsm.c +++ b/src/smscb_message_fsm.c @@ -84,7 +84,7 @@ /* check if any per-peer children have not yet received the ACK or * timed out */ llist_for_each_entry(peer_fi, &fi->proc.children, proc.child) { - if (peer_fi->state == SMSCB_S_WAIT_WRITE_ACK) + if (peer_fi->state != SMSCB_S_ACTIVE) return; } rest_it_op_set_http_result(cbcmsg->it_op, 201, "Created"); // FIXME: error cases -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I1f3911accb327f3378d65902d53d86fb298fd528 Gerrit-Change-Number: 28854 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmo-cbc[master]: cbc_main: Enable logging of fsm timeouts

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28852 ) Change subject: cbc_main: Enable logging of fsm timeouts ...................................................................... cbc_main: Enable logging of fsm timeouts Change-Id: I6ffbfbc8eddb3efff0b6401223b9b5563cf83b51 --- M src/cbc_main.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/52/28852/1 diff --git a/src/cbc_main.c b/src/cbc_main.c index 7e13e52..fd8e4fe 100644 --- a/src/cbc_main.c +++ b/src/cbc_main.c @@ -35,6 +35,7 @@ #include <osmocom/core/utils.h> #include <osmocom/core/logging.h> #include <osmocom/core/application.h> +#include <osmocom/core/fsm.h> #include <osmocom/vty/vty.h> #include <osmocom/vty/stats.h> @@ -268,6 +269,7 @@ log_enable_multithread(); sbcap_set_log_area(DSBcAP, DASN1C); osmo_stats_init(tall_cbc_ctx); + osmo_fsm_log_timeouts(true); vty_init(&vty_info); g_cbc = cbc_alloc(tall_cbc_ctx); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I6ffbfbc8eddb3efff0b6401223b9b5563cf83b51 Gerrit-Change-Number: 28852 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

Change in osmo-hnbgw[master]: reduce code dup in handle_cn_data_ind()

by dexter

Attention is currently required from: neels, pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/28827 ) Change subject: reduce code dup in handle_cn_data_ind() ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File src/osmo-hnbgw/hnbgw_cn.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/28827/comment/e38e69a1_1a2cee25 PS1, Line 414: talloc_free(message); > See how it pairs up with talloc_zero() and ranap_ran_rx_co_decode() above As far as I can see ranap_ran_rx_co_free() frees the contents and the talloc_free frees the struct - so everything should be fine. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/28827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I4bca25d1643693cf3a9d3c49f35b29ff1dce0859 Gerrit-Change-Number: 28827 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 15:18:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: f_est_rll_mo(): add waiting timeout (2s)

by dexter

Attention is currently required from: fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28832 ) Change subject: BTS_Tests: f_est_rll_mo(): add waiting timeout (2s) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I71ab69d85f453964749270d970c55e6f577a73a1 Gerrit-Change-Number: 28832 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 15:08:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

2024

2023

2022

gerrit-log July 2022