- gerrit-log - lists.osmocom.org

Change in libosmocore[master]: core/utils.h: add OSMO_LIKELY / OSMO_UNLIKELY macros

by pespin

Attention is currently required from: osmith, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27046 ) Change subject: core/utils.h: add OSMO_LIKELY / OSMO_UNLIKELY macros ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0b029654ba050f079eed4a0574a3fa8019677067 Gerrit-Change-Number: 27046 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 10:55:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: bssmap_reset: make T4 user configurable

by dexter

Attention is currently required from: dexter. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27090 to look at the new patch set (#2). Change subject: bssmap_reset: make T4 user configurable ...................................................................... bssmap_reset: make T4 user configurable The timer (T4) that controls the re-sending of the BSSMAP RESET can not be changed via the VTY, althrough it is defined via a tdef struct. Lets add a description along with default values to make it configurable via the VTY. Change-Id: I1fb5699220ab8a643a168567a89c6f381fe433a7 Related: SYS#5796 --- M src/osmo-bsc/bssmap_reset.c M src/osmo-bsc/net_init.c M tests/timer.vty 3 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/90/27090/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1fb5699220ab8a643a168567a89c6f381fe433a7 Gerrit-Change-Number: 27090 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc vamos: ensure lchan state in some places

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27087 ) Change subject: bsc vamos: ensure lchan state in some places ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27087 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: I5979516cf2b2e1adf5269acd0b8e7adb5e6a1ac5 Gerrit-Change-Number: 27087 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 10:46:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_h_tch_h_tch_h_tch_h

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27086 ) Change subject: BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_h_tch_h_tch_h_tch_h ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27086 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: I3b1dfc3b11e990893cbf182fb9f8840e198eb8aa Gerrit-Change-Number: 27086 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 10:46:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: bssmap_reset: make T4 user configurable

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27090 ) Change subject: bssmap_reset: make T4 user configurable ...................................................................... bssmap_reset: make T4 user configurable The timer (T4) that controls the re-sending of the BSSMAP RESET can not be changed via the VTY, althrough it is defined via a tdef struct. Lets add a description along with default values to make it configurable via the VTY. Change-Id: I1fb5699220ab8a643a168567a89c6f381fe433a7 Related: SYS#5796 --- M src/osmo-bsc/bssmap_reset.c M src/osmo-bsc/net_init.c 2 files changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/90/27090/1 diff --git a/src/osmo-bsc/bssmap_reset.c b/src/osmo-bsc/bssmap_reset.c index beb8968..4d24c01 100644 --- a/src/osmo-bsc/bssmap_reset.c +++ b/src/osmo-bsc/bssmap_reset.c @@ -47,7 +47,7 @@ osmo_tdef_fsm_inst_state_chg(FI, STATE, \ bssmap_reset_timeouts, \ (bsc_gsmnet)->T_defs, \ - 5) + -1) struct bssmap_reset *bssmap_reset_alloc(void *ctx, const char *label, const struct bssmap_reset_cfg *cfg) { diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c index ec2f881..adcffc7 100644 --- a/src/osmo-bsc/net_init.c +++ b/src/osmo-bsc/net_init.c @@ -27,6 +27,7 @@ #include <osmocom/bsc/neighbor_ident.h> static struct osmo_tdef gsm_network_T_defs[] = { + { .T=4, .default_val=5, .desc="Timeout to receive BSSMAP RESET ACKNOWLEDGE from the MSC" }, { .T=7, .default_val=10, .desc="inter-BSC/MSC Handover outgoing, BSSMAP HO Required to HO Command timeout" }, { .T=8, .default_val=10, .desc="inter-BSC/MSC Handover outgoing, BSSMAP HO Command to final Clear timeout" }, { .T=10, .default_val=6, .desc="RR Assignment" }, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27090 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1fb5699220ab8a643a168567a89c6f381fe433a7 Gerrit-Change-Number: 27090 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_f_tch_f

by pespin

Attention is currently required from: neels, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27080 ) Change subject: BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_f_tch_f ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27080 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: I82b7eccd2ae30fdc3794ea9dad5d2d8f875d702d Gerrit-Change-Number: 27080 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 10:45:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: follow-up to osmo_sockaddr_from/to_octets()

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27085 ) Change subject: follow-up to osmo_sockaddr_from/to_octets() ...................................................................... Patch Set 1: (1 comment) File src/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/27085/comment/04321114_283f779e PS1, Line 1779: os->u.sa.sa_family = AF_INET; This should have been kept as os->u.sin.sin_family, since here you already know you are using the struct sockaddr_in of the union. In the case above which I asked you change, it's more conceptually correct to check the generic struct sockaddr (os->u.sa) field instead of the struct sockaddr_in one (os->u.sin), since you still don't know at that point whether the osmo_sockaddr is from type sockaddr_in. In practice of course it doesn't matter since the os->u.sa.sa_family and os->u.sin.sin_family field point to same place in memory, but conceptually it makes sense to do it the way I say. Otherwise it's like accessing a subclass field without knowing whether the abstract class/interface is actually an instance of that subclass. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id202f3fda51bea9149ab3462a2efe35cf08d8030 Gerrit-Change-Number: 27085 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 10:43:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates/osmo-bsc-nat.cfg: add addressbooks

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27031 ) Change subject: net/templates/osmo-bsc-nat.cfg: add addressbooks ...................................................................... net/templates/osmo-bsc-nat.cfg: add addressbooks Add MSC and BSC point-codes, as it is currently needed in the initial message forwarding implementation. Related: SYS#5560 Related: osmo-bsc-nat I4af398bb433341a98f818822e6c3af28b6d9dacd Change-Id: Ia396cc677ceffa3fa86da5460f6c890b5f714059 --- M net/templates/osmo-bsc-nat.cfg 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: neels: Looks good to me, approved fixeria: Looks good to me, but someone else must approve osmith: Verified diff --git a/net/templates/osmo-bsc-nat.cfg b/net/templates/osmo-bsc-nat.cfg index c9a71da..f049d7b 100644 --- a/net/templates/osmo-bsc-nat.cfg +++ b/net/templates/osmo-bsc-nat.cfg @@ -4,12 +4,20 @@ asp asp-clnt-OsmoBSCNAT-CN 2905 0 m3ua remote-ip ${STP_CN_IP} local-ip ${BSCNAT_CN_IP} + sccp-address msc + routing-indicator PC + point-code ${MSC_PC} + subsystem-number 254 cs7 instance 1 point-code ${BSCNAT_RAN_PC} asp asp-clnt-OsmoBSCNAT-RAN 2905 0 m3ua remote-ip ${STP_RAN_IP} local-ip ${BSCNAT_RAN_IP} + sccp-address bsc + routing-indicator PC + point-code ${BSC_PC} + subsystem-number 254 bsc-nat cs7-instance-cn 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ia396cc677ceffa3fa86da5460f6c890b5f714059 Gerrit-Change-Number: 27031 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates/.editorconfig: new file

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27032 ) Change subject: net/templates/.editorconfig: new file ...................................................................... net/templates/.editorconfig: new file Change-Id: Ieeb67a10c7b7c27a5e0e9dbc8399fe2add9f34d4 --- A net/templates/.editorconfig 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: neels: Looks good to me, approved fixeria: Looks good to me, but someone else must approve osmith: Verified diff --git a/net/templates/.editorconfig b/net/templates/.editorconfig new file mode 100644 index 0000000..71944b2 --- /dev/null +++ b/net/templates/.editorconfig @@ -0,0 +1,7 @@ +[run.sh] +charset = utf-8 +end_of_line = lf +indent_size = 2 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ieeb67a10c7b7c27a5e0e9dbc8399fe2add9f34d4 Gerrit-Change-Number: 27032 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates/.editorconfig: new file

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27032 ) Change subject: net/templates/.editorconfig: new file ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ieeb67a10c7b7c27a5e0e9dbc8399fe2add9f34d4 Gerrit-Change-Number: 27032 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 10:05:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates/osmo-bsc-nat.cfg: add addressbooks

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27031 ) Change subject: net/templates/osmo-bsc-nat.cfg: add addressbooks ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ia396cc677ceffa3fa86da5460f6c890b5f714059 Gerrit-Change-Number: 27031 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 10:05:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bts[master]: logging: use generic DBTS category where applicable

by fixeria

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16146 ) Change subject: logging: use generic DBTS category where applicable ...................................................................... Abandoned See Ia9db783bc92b23ba87b4fdf1e4ed07d59ea6bbce. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16146 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I15023436e81d5bdb51930912b221a23c69437847 Gerrit-Change-Number: 16146 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

2 years, 3 months

1
0
0 0

Change in osmo-bts[master]: logging: get rid of logging category DSUM

by fixeria

Attention is currently required from: osmith, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/16145 ) Change subject: logging: get rid of logging category DSUM ...................................................................... Patch Set 3: (5 comments) This change is ready for review. Patchset: PS3: > I wonder if we can completely remove that category. Agree, removed in the new patchset. File src/common/bts.c: https://gerrit.osmocom.org/c/osmo-bts/+/16145/comment/d885e0fb_6beebce5 PS1, Line 309: LOGP(DBTS, LOGL_INFO, "Main link established, sending Status'.\n"); > Could be oml Done https://gerrit.osmocom.org/c/osmo-bts/+/16145/comment/2fc0d35d_ecc7dbf1 PS1, Line 345: LOGP(DBTS, LOGL_INFO, "RSL link (TRX %02x) state changed to %s, sending Status'.\n", > Could be rsl Done https://gerrit.osmocom.org/c/osmo-bts/+/16145/comment/1bd5d075_c0616413 PS1, Line 369: LOGP(DBTS, LOGL_INFO, "TRX(%d): Setting available = %d\n", > OML too Done https://gerrit.osmocom.org/c/osmo-bts/+/16145/comment/c3bc06ef_8b6ba0cc PS1, Line 635: LOGP(DBTS, LOGL_ERROR, > RR? Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/16145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia9db783bc92b23ba87b4fdf1e4ed07d59ea6bbce Gerrit-Change-Number: 16145 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 08:33:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: gsm_network_T_defs: add T4, so it becomes configurable

by fixeria

Attention is currently required from: pespin, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27084 ) Change subject: gsm_network_T_defs: add T4, so it becomes configurable ...................................................................... Patch Set 3: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/27084/comment/8ba95768_6bd79e86 PS3, Line 12: 5 seconds (see bssmap_reset_fsm_state_chg()). > Then, since it's now available, it probably makes sense to default to -1 since it should always find […] https://gerrit.osmocom.org/c/osmo-bsc/+/27089 bssmap_reset: pass -1 to osmo_tdef_fsm_inst_state_chg() -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id844dab1abffd6efbe7767585f127b29c0ee710c Gerrit-Change-Number: 27084 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 07:57:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: bssmap_reset: pass -1 to osmo_tdef_fsm_inst_state_chg()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27089 ) Change subject: bssmap_reset: pass -1 to osmo_tdef_fsm_inst_state_chg() ...................................................................... bssmap_reset: pass -1 to osmo_tdef_fsm_inst_state_chg() Since timer T4 is now defined in gsm_network_T_defs[], we can pass -1 to osmo_tdef_fsm_inst_state_chg(), so that it abort()s if the respective timer is not found. Change-Id: I2533dc73ddb9498f09824d59f5d189517f30abc0 Related: SYS#5796 --- M src/osmo-bsc/bssmap_reset.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/89/27089/1 diff --git a/src/osmo-bsc/bssmap_reset.c b/src/osmo-bsc/bssmap_reset.c index beb8968..4d24c01 100644 --- a/src/osmo-bsc/bssmap_reset.c +++ b/src/osmo-bsc/bssmap_reset.c @@ -47,7 +47,7 @@ osmo_tdef_fsm_inst_state_chg(FI, STATE, \ bssmap_reset_timeouts, \ (bsc_gsmnet)->T_defs, \ - 5) + -1) struct bssmap_reset *bssmap_reset_alloc(void *ctx, const char *label, const struct bssmap_reset_cfg *cfg) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27089 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2533dc73ddb9498f09824d59f5d189517f30abc0 Gerrit-Change-Number: 27089 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-hlr[master]: debian: add new 'osmo-mslookup-utils' package

by fixeria

Attention is currently required from: osmith, neels, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/27075 ) Change subject: debian: add new 'osmo-mslookup-utils' package ...................................................................... Patch Set 3: (1 comment) File debian/control: https://gerrit.osmocom.org/c/osmo-hlr/+/27075/comment/36b9f253_c235757b PS2, Line 83: Package: libosmo-mslookup-utils > Right, these are the utils for libsomo-mslookup... but I don't have a strong opinion either. […] Renamed. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/27075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I9dbe00187678a5032fb4ae32b496892fdc86ddb7 Gerrit-Change-Number: 27075 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 07:52:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-hlr[master]: debian: add new 'osmo-mslookup-utils' package

by fixeria

Attention is currently required from: neels, laforge, fixeria, pespin. Hello osmith, Jenkins Builder, neels, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/27075 to look at the new patch set (#3). Change subject: debian: add new 'osmo-mslookup-utils' package ...................................................................... debian: add new 'osmo-mslookup-utils' package Change-Id: I9dbe00187678a5032fb4ae32b496892fdc86ddb7 Related: OS#4706 --- M debian/control A debian/osmo-mslookup-utils.install 2 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/75/27075/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/27075 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I9dbe00187678a5032fb4ae32b496892fdc86ddb7 Gerrit-Change-Number: 27075 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: core/utils.h: wrap OSMO_ASSERT() with do { ... } while (0)

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27088 ) Change subject: core/utils.h: wrap OSMO_ASSERT() with do { ... } while (0) ...................................................................... core/utils.h: wrap OSMO_ASSERT() with do { ... } while (0) Using do-while is a common practice for complex macros. This allows invoking OSMO_ASSERT in simple if-else statements without braces. Change-Id: I42d9c315c9c30bce828564a63c496ee62e5c1431 --- M include/osmocom/core/utils.h 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/88/27088/1 diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index 7625da1..182da08 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -111,9 +111,11 @@ * the predicate evaluates to false (0). */ #define OSMO_ASSERT(exp) \ +do { \ if (!(exp)) { \ osmo_panic("Assert failed %s %s:%d\n", #exp, __FILE__, __LINE__); \ - } + } \ +} while (0); /* some code invokes OSMO_ASSERT() without the semicolon */ /*! duplicate a string using talloc and release its prior content (if any) * \param[in] ctx Talloc context to use for allocation -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27088 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I42d9c315c9c30bce828564a63c496ee62e5c1431 Gerrit-Change-Number: 27088 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT

by fixeria

Attention is currently required from: osmith. Hello osmith, Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/27047 to look at the new patch set (#3). Change subject: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT ...................................................................... core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT Theoretically, this should improve performance of the code where we frequently invoke OSMO_ASSERT(), like osmo-msc and osmo-bsc. Change-Id: I29b32a2477ec92762f8f0ce5e5c5a30810f6abbe --- M include/osmocom/core/utils.h 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/47/27047/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I29b32a2477ec92762f8f0ce5e5c5a30810f6abbe Gerrit-Change-Number: 27047 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(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-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: core/utils.h: add OSMO_LIKELY / OSMO_UNLIKELY macros

by fixeria

Attention is currently required from: osmith, fixeria, pespin. Hello osmith, Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/27046 to look at the new patch set (#3). Change subject: core/utils.h: add OSMO_LIKELY / OSMO_UNLIKELY macros ...................................................................... core/utils.h: add OSMO_LIKELY / OSMO_UNLIKELY macros These macros are built on top of the __builtin_expect() function [1], which provides the compiler with branch prediction information. Similar macros exist in the Linux kernel: likely() / unlikely(). [1] https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html Change-Id: I0b029654ba050f079eed4a0574a3fa8019677067 --- M include/osmocom/core/utils.h 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/46/27046/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0b029654ba050f079eed4a0574a3fa8019677067 Gerrit-Change-Number: 27046 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27047 ) Change subject: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > I guess you could use the do - while loop, and add a semicolon at the end for compatibility: […] Thanks for your suggestion, Oliver! Indeed, having the semicolon in the definition of OSMO_ASSERT does the trick. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I29b32a2477ec92762f8f0ce5e5c5a30810f6abbe Gerrit-Change-Number: 27047 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 06:37:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net: run.sh: support tmux as terminal

by fixeria

Attention is currently required from: osmith, neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27036 ) Change subject: net: run.sh: support tmux as terminal ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-dev/+/27036/comment/5975fec5_af049127 PS1, Line 12: automatically scroll to the bottom > really? not my terminal I am also observing this behavior with xterm v370. > i remember tmux doing this weird jumping to the bottom very occasionally Also experiencing this weird jumping since I migrated from ancient Ubintu to Arch. Looks like this is a regression in the new tmux? I couldn't really correlate this behavior to any events like new logging or buttons pressed. It just happens for no reason. -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27036 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Iaef08fb3cb3c6f58cd8490a631e177a03af9c974 Gerrit-Change-Number: 27036 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 06:26:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc vamos: ensure lchan state in some places

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27087 ) Change subject: bsc vamos: ensure lchan state in some places ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27087 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: I5979516cf2b2e1adf5269acd0b8e7adb5e6a1ac5 Gerrit-Change-Number: 27087 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 05:38:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_h_tch_h_tch_h_tch_h

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27086 ) Change subject: BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_h_tch_h_tch_h_tch_h ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27086 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: I3b1dfc3b11e990893cbf182fb9f8840e198eb8aa Gerrit-Change-Number: 27086 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 05:37:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_f_tch_f

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27080 ) Change subject: BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_f_tch_f ...................................................................... Patch Set 3: Code-Review+1 (1 comment) Patchset: PS3: Thanks for taking this over! Your solution looks better to me. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27080 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: I82b7eccd2ae30fdc3794ea9dad5d2d8f875d702d Gerrit-Change-Number: 27080 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 05:36:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_h_tch_h_tch_h_tch_h

by neels

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27086 to look at the new patch set (#2). Change subject: BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_h_tch_h_tch_h_tch_h ...................................................................... BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_h_tch_h_tch_h_tch_h Properly clean up conns in the end. Use COORD and new COORD2 ports to daisy-chain coordination between the four components. Related: OS#5444 Change-Id: I3b1dfc3b11e990893cbf182fb9f8840e198eb8aa --- M bsc/BSC_Tests_VAMOS.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 45 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/27086/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27086 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: I3b1dfc3b11e990893cbf182fb9f8840e198eb8aa Gerrit-Change-Number: 27086 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_f_tch_f

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27080 ) Change subject: BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_f_tch_f ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27080 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: I82b7eccd2ae30fdc3794ea9dad5d2d8f875d702d Gerrit-Change-Number: 27080 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 08 Feb 2022 00:19:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_h_tch_h_tch_h_tch_h

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27086 ) Change subject: BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_h_tch_h_tch_h_tch_h ...................................................................... BSC_Tests_VAMOS: fix TC_vamos_multiplex_tch_h_tch_h_tch_h_tch_h Properly clean up conns in the end. Use COORD and new COORD2 ports to daisy-chain coordination between the four components. Related: OS#5444 Change-Id: I3b1dfc3b11e990893cbf182fb9f8840e198eb8aa --- M bsc/BSC_Tests_VAMOS.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 48 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/27086/1 diff --git a/bsc/BSC_Tests_VAMOS.ttcn b/bsc/BSC_Tests_VAMOS.ttcn index 9a53200..6266634 100644 --- a/bsc/BSC_Tests_VAMOS.ttcn +++ b/bsc/BSC_Tests_VAMOS.ttcn @@ -677,19 +677,55 @@ f_shutdown_helper(); } +const charstring DONE1 := "DONE1"; +const charstring DONE2 := "DONE2"; +const charstring DONE3 := "DONE3"; +const charstring DONE4 := "DONE4"; + +/* + * f1 f2 f3 f4 + * COORD <--> COORD | COORD2 <--> COORD | COORD2 <--> COORD + * ---DONE1----> ---DONE2----> ---DONE3----> + * <----DONE4--- <----DONE4--- <----DONE4--- + */ + /* First, primary lchan of TC_vamos_multiplex_tch_h_tch_h_tch_h_tch_h() */ private function f_TC_vamos_multiplex_tch_h_tch_h1(charstring id) runs on MSC_ConnHdlr { f_est_lchan_and_mode_modify_to_vamos(); f_logp(BSCVTY, "f_est_lchan_and_mode_modify_to_vamos done"); + COORD.send(DONE1); + COORD.receive(DONE4); + f_perform_clear(RSL); } /* Second, VAMOS shadow lchan of TC_vamos_multiplex_tch_h_tch_h_tch_h_tch_h() */ private function f_TC_vamos_multiplex_tch_h_tch_h2(charstring id) runs on MSC_ConnHdlr { + f_sleep(1.0); + COORD.receive(DONE1); f_est_and_reassign_to_secondary_lchan(valueof(t_RslChanNr_Osmo_VAMOS_Lm(5, 0))); + COORD2.send(DONE2); + COORD2.receive(DONE4) + COORD.send(DONE4); + f_perform_clear(RSL); +} + +private function f_TC_vamos_multiplex_tch_h_tch_h3(charstring id) runs on MSC_ConnHdlr { + f_sleep(1.0); + COORD.receive(DONE2); + f_est_lchan_and_mode_modify_to_vamos(); + f_logp(BSCVTY, "f_est_lchan_and_mode_modify_to_vamos done"); + COORD2.send(DONE3); + COORD2.receive(DONE4); + COORD.send(DONE4); + f_perform_clear(RSL); } private function f_TC_vamos_multiplex_tch_h_tch_h4(charstring id) runs on MSC_ConnHdlr { + f_sleep(1.0); + COORD.receive(DONE3); f_est_and_reassign_to_secondary_lchan(valueof(t_RslChanNr_Osmo_VAMOS_Lm(5, 1))); + COORD.send(DONE4); + f_perform_clear(RSL); } /* Establish a primary lchan and modify it to VAMOS speech mode. Then establish @@ -725,17 +761,22 @@ pars4.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR})); vc_conn1 := f_start_handler(refers(f_TC_vamos_multiplex_tch_h_tch_h1), pars1); - vc_conn1.done; - vc_conn2 := f_start_handler(refers(f_TC_vamos_multiplex_tch_h_tch_h2), pars2); - vc_conn2.done; /* Also fill up the second subslot of the TCH/H timeslot */ - vc_conn3 := f_start_handler(refers(f_TC_vamos_multiplex_tch_h_tch_h1), pars3); - vc_conn3.done; - + vc_conn3 := f_start_handler(refers(f_TC_vamos_multiplex_tch_h_tch_h3), pars3); vc_conn4 := f_start_handler(refers(f_TC_vamos_multiplex_tch_h_tch_h4), pars4); + + /* see diagram above (search for "---DONE") */ + connect(vc_conn1:COORD, vc_conn2:COORD); + connect(vc_conn2:COORD2, vc_conn3:COORD); + connect(vc_conn3:COORD2, vc_conn4:COORD); + + vc_conn1.done; + vc_conn2.done; + vc_conn3.done; vc_conn4.done; + f_shutdown_helper(); } diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 4aeb539..109194b 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -447,6 +447,7 @@ port RAN_PROC_PT RAN; port TELNETasp_PT BSCVTY; port Coord_PT COORD; + port Coord_PT COORD2; /* Proxy MGCP-over-IPA and MGCP-over-UDP */ port IPA_MGCP_PT MGCP_MSC_CLIENT; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27086 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: I3b1dfc3b11e990893cbf182fb9f8840e198eb8aa Gerrit-Change-Number: 27086 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc vamos: ensure lchan state in some places

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27087 ) Change subject: bsc vamos: ensure lchan state in some places ...................................................................... bsc vamos: ensure lchan state in some places Change-Id: I5979516cf2b2e1adf5269acd0b8e7adb5e6a1ac5 --- M bsc/BSC_Tests_VAMOS.ttcn 1 file changed, 16 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/87/27087/1 diff --git a/bsc/BSC_Tests_VAMOS.ttcn b/bsc/BSC_Tests_VAMOS.ttcn index 6266634..ec74be2 100644 --- a/bsc/BSC_Tests_VAMOS.ttcn +++ b/bsc/BSC_Tests_VAMOS.ttcn @@ -83,7 +83,7 @@ const integer NUM_BTS := 3; const integer NUM_MSC := 3; -private function f_rsl_chan_nr_to_subslot(RslChannelNr chan_nr) +private function f_rsl_chan_nr_to_subslot(RslChannelNr chan_nr, boolean use_vamos_subslot_nr := false) return integer { var integer subslot; @@ -97,12 +97,19 @@ subslot := chan_nr.u.lm.sub_chan; } case (t_RslChanNr_Osmo_VAMOS_Bm(?)) { - /* TCH/F, always subslot 0 */ - subslot := 0; + /* TCH/F shadow */ + if (use_vamos_subslot_nr) { + subslot := 1; + } else { + subslot := 0; + } } case (t_RslChanNr_Osmo_VAMOS_Lm(?, ?)) { - /* TCH/H */ + /* TCH/H shadow */ subslot := chan_nr.u.lm.sub_chan; + if (use_vamos_subslot_nr) { + subslot := subslot + 2; + } } case else { setverdict(fail, "unsupported RslChannelNr type in f_rsl_chan_nr_to_subslot()"); @@ -201,10 +208,10 @@ } } -private function f_lchan_str(integer bts_nr, integer trx_nr, RslChannelNr chan_nr) +private function f_lchan_str(integer bts_nr, integer trx_nr, RslChannelNr chan_nr, boolean use_vamos_subslot_nr := false) return charstring { - var integer subslot := f_rsl_chan_nr_to_subslot(chan_nr); + var integer subslot := f_rsl_chan_nr_to_subslot(chan_nr, use_vamos_subslot_nr := use_vamos_subslot_nr); return "lchan " & int2str(bts_nr) & " " & int2str(trx_nr) & " " & int2str(chan_nr.tn) & " " & int2str(subslot); } @@ -217,7 +224,7 @@ private function f_lchan_ensure_established(TELNETasp_PT vty, integer bts_nr, integer trx_nr, RslChannelNr chan_nr) { - var charstring lchan_str := f_lchan_str(bts_nr, trx_nr, chan_nr); + var charstring lchan_str := f_lchan_str(bts_nr, trx_nr, chan_nr, use_vamos_subslot_nr := true); var charstring lchan_info := f_vty_transceive_ret(vty, "show " & lchan_str); if (f_strstr(lchan_info, "State: ESTABLISHED") < 0) { log("'show lchan' replied: ", lchan_info); @@ -465,7 +472,7 @@ setverdict(pass); f_sleep(1.0); - f_vty_transceive(BSCVTY, "show lchan summary"); + f_lchan_ensure_established(BSCVTY, 0, 0, g_chan_nr); f_verify_dtap(); } @@ -575,8 +582,7 @@ setverdict(pass); f_sleep(1.0); - f_vty_transceive(BSCVTY, "show lchan summary"); - + f_lchan_ensure_established(BSCVTY, 0, 0, g_chan_nr); f_verify_dtap(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27087 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: I5979516cf2b2e1adf5269acd0b8e7adb5e6a1ac5 Gerrit-Change-Number: 27087 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in libosmo-sccp[master]: fixup for 'Introduce SS7 IPv6 support'

by neels

neels has abandoned this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/19855 ) Change subject: fixup for 'Introduce SS7 IPv6 support' ...................................................................... Abandoned now there is osmo_ss7_asp_set_default_peer_hosts() -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia41c66665614436ded879c935755993bfeb259a0 Gerrit-Change-Number: 19855 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: abandon

2 years, 3 months

1
0
0 0

Change in osmo-gsm-tester[master]: wait_no_raise(): set default args

by neels

neels has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21508 ) Change subject: wait_no_raise(): set default args ...................................................................... Abandoned timeout -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21508 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I225a175b25c5c148ef5e23d2184f5d1aa2f4188a Gerrit-Change-Number: 21508 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

2 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: msc: introduce f_logp()

by neels

neels has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16562 ) Change subject: msc: introduce f_logp() ...................................................................... Abandoned timeout -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16562 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: Iddcda7f0f9940cc21f89d52962707667fe844010 Gerrit-Change-Number: 16562 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: abandon

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: fix entries in TODO-RELEASE, s/>1.5.1/>=1.6

by neels

neels has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26260 ) Change subject: fix entries in TODO-RELEASE, s/>1.5.1/>=1.6 ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id3c51c144cf31a002eb0ef9ba9326d1ab45fbd60 Gerrit-Change-Number: 26260 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: follow-up to osmo_sockaddr_from/to_octets()

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27085 ) Change subject: follow-up to osmo_sockaddr_from/to_octets() ...................................................................... follow-up to osmo_sockaddr_from/to_octets() Forgot to apply one code review change before merge. Related: OS#5599 Change-Id: Id202f3fda51bea9149ab3462a2efe35cf08d8030 --- M src/socket.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/src/socket.c b/src/socket.c index 6e5bb46..80cba17 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1744,7 +1744,7 @@ { const void *addr; size_t len; - switch (os->u.sin.sin_family) { + switch (os->u.sa.sa_family) { case AF_INET: addr = &os->u.sin.sin_addr; len = sizeof(os->u.sin.sin_addr); @@ -1776,7 +1776,7 @@ *os = (struct osmo_sockaddr){0}; switch (src_len) { case sizeof(os->u.sin.sin_addr): - os->u.sin.sin_family = AF_INET; + os->u.sa.sa_family = AF_INET; addr = &os->u.sin.sin_addr; len = sizeof(os->u.sin.sin_addr); break; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id202f3fda51bea9149ab3462a2efe35cf08d8030 Gerrit-Change-Number: 27085 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: follow-up to osmo_sockaddr_from/to_octets()

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27085 ) Change subject: follow-up to osmo_sockaddr_from/to_octets() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id202f3fda51bea9149ab3462a2efe35cf08d8030 Gerrit-Change-Number: 27085 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 21:23:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libgtpnl[master]: fix some cases of rc == 0 on error

by neels

Attention is currently required from: Pablo Neira Ayuso, laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/26990 ) Change subject: fix some cases of rc == 0 on error ...................................................................... Patch Set 1: (3 comments) Patchset: PS1: > it might be worth looking at how other code using libmnl is doing this. […] it is clear that checking errno works well. just seems weird to me to return zero on some errors while others return nonzero. PS1: I'm not sure that it is the right thing to submit this patch. I think it makes better code, but maybe not worthwhile to change a running system. I submitted this patch mainly to let review decide whether it is any good. File src/gtp-genl.c: https://gerrit.osmocom.org/c/libgtpnl/+/26990/comment/e3535927_d8978396 PS1, Line 82: return -2; > or perhaps: […] just above this bit of code, the code returns -1. I thought, return -1 as well vs return a different constant. So, arbitrarily, I picked the different constant, next after -1 is -2. I'd also just return rc, but that seems not to be intended? -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/26990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I22fd69709e023572c6c616a4184340a554456faf Gerrit-Change-Number: 26990 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pablo Neira Ayuso <pablo(a)gnumonks.org> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Pablo Neira Ayuso <pablo(a)gnumonks.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 21:23:25 +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> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: follow-up to osmo_sockaddr_from/to_octets()

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27085 ) Change subject: follow-up to osmo_sockaddr_from/to_octets() ...................................................................... follow-up to osmo_sockaddr_from/to_octets() Forgot to apply one code review change before merge. Related: OS#5599 Change-Id: Id202f3fda51bea9149ab3462a2efe35cf08d8030 --- M src/socket.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/27085/1 diff --git a/src/socket.c b/src/socket.c index 6e5bb46..80cba17 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1744,7 +1744,7 @@ { const void *addr; size_t len; - switch (os->u.sin.sin_family) { + switch (os->u.sa.sa_family) { case AF_INET: addr = &os->u.sin.sin_addr; len = sizeof(os->u.sin.sin_addr); @@ -1776,7 +1776,7 @@ *os = (struct osmo_sockaddr){0}; switch (src_len) { case sizeof(os->u.sin.sin_addr): - os->u.sin.sin_family = AF_INET; + os->u.sa.sa_family = AF_INET; addr = &os->u.sin.sin_addr; len = sizeof(os->u.sin.sin_addr); break; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27085 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id202f3fda51bea9149ab3462a2efe35cf08d8030 Gerrit-Change-Number: 27085 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: add osmo_sockaddr_from/to_octets()

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27050 ) Change subject: add osmo_sockaddr_from/to_octets() ...................................................................... Patch Set 1: (2 comments) File src/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/27050/comment/6219a76d_73d46bb7 PS1, Line 1746: size_t l; > use len if possible, my eyes hurt seeing number ones everywhere due to l and 1 looking similar :P lol, right =) https://gerrit.osmocom.org/c/libosmocore/+/27050/comment/2a9ad3b4_40990b28 PS1, Line 1747: switch (os->u.sin.sin_family) { > os->u.sa. […] i'm still confused with all the different sockaddrs, thx -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie9e33bfac525c59c30714663d2bfcc62ec9eeb81 Gerrit-Change-Number: 27050 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 21:14:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: add osmo_quote_str_buf3, osmo_escape_str_buf3

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27025 ) Change subject: add osmo_quote_str_buf3, osmo_escape_str_buf3 ...................................................................... add osmo_quote_str_buf3, osmo_escape_str_buf3 There already are osmo_quote_str_buf() and osmo_quote_str_buf2(), same for _escape_, but none of them return the snprintf() like string length. A private function does, publish this in the API. The returned chars_needed is required to accurately allocate sufficient size in string functions that call osmo_quote_str/osmo_escape_str. I am adding such in osmo-upf.git. Related: SYS#5599 Change-Id: I05d75a40599e3133da099a11e8babaaad0e9493a --- M include/osmocom/core/utils.h M src/utils.c 2 files changed, 29 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index 327aa3d..eda0e39 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -157,10 +157,12 @@ char *osmo_quote_cstr_c(void *ctx, const char *str, int in_len); const char *osmo_escape_str(const char *str, int len); +int osmo_escape_str_buf3(char *buf, size_t bufsize, const char *str, int in_len); char *osmo_escape_str_buf2(char *buf, size_t bufsize, const char *str, int in_len); const char *osmo_escape_str_buf(const char *str, int in_len, char *buf, size_t bufsize); char *osmo_escape_str_c(const void *ctx, const char *str, int in_len); const char *osmo_quote_str(const char *str, int in_len); +int osmo_quote_str_buf3(char *buf, size_t bufsize, const char *str, int in_len); char *osmo_quote_str_buf2(char *buf, size_t bufsize, const char *str, int in_len); const char *osmo_quote_str_buf(const char *str, int in_len, char *buf, size_t bufsize); char *osmo_quote_str_c(const void *ctx, const char *str, int in_len); diff --git a/src/utils.c b/src/utils.c index 357ed53..2012b74 100644 --- a/src/utils.c +++ b/src/utils.c @@ -754,7 +754,7 @@ * the non-legacy format also escapes those as "\xNN" sequences. * \return Number of characters that would be written if bufsize were large enough excluding '\0' (like snprintf()). */ -static size_t _osmo_escape_str_buf(char *buf, size_t bufsize, const char *str, int in_len, bool legacy_format) +static int _osmo_escape_str_buf(char *buf, size_t bufsize, const char *str, int in_len, bool legacy_format) { struct osmo_strbuf sb = { .buf = buf, .len = bufsize }; int in_pos = 0; @@ -826,6 +826,18 @@ * \param[in] bufsize sizeof(buf). * \param[in] str A string that may contain any characters. * \param[in] in_len Pass -1 to print until nul char, or >= 0 to force a length (also past nul chars). + * \return Number of characters that would be written if bufsize were large enough excluding '\0' (like snprintf()). + */ +int osmo_escape_str_buf3(char *buf, size_t bufsize, const char *str, int in_len) +{ + return _osmo_escape_str_buf(buf, bufsize, str, in_len, false); +} + +/*! Return the string with all non-printable characters escaped. + * \param[out] buf string buffer to write escaped characters to. + * \param[in] bufsize sizeof(buf). + * \param[in] str A string that may contain any characters. + * \param[in] in_len Pass -1 to print until nul char, or >= 0 to force a length (also past nul chars). * \return The output buffer (buf). */ char *osmo_escape_str_buf2(char *buf, size_t bufsize, const char *str, int in_len) @@ -883,6 +895,20 @@ return sb.chars_needed; } +/*! Like osmo_escape_str_buf3(), but returns double-quotes around a string, or "NULL" for a NULL string. + * This allows passing any char* value and get its C representation as string. + * The function signature is suitable for OSMO_STRBUF_APPEND_NOLEN(). + * \param[out] buf string buffer to write escaped characters to. + * \param[in] bufsize sizeof(buf). + * \param[in] str A string that may contain any characters. + * \param[in] in_len Pass -1 to print until nul char, or >= 0 to force a length. + * \return Number of characters that would be written if bufsize were large enough excluding '\0' (like snprintf()). + */ +int osmo_quote_str_buf3(char *buf, size_t bufsize, const char *str, int in_len) +{ + return _osmo_quote_str_buf(buf, bufsize, str, in_len, false); +} + /*! Like osmo_escape_str_buf2(), but returns double-quotes around a string, or "NULL" for a NULL string. * This allows passing any char* value and get its C representation as string. * The function signature is suitable for OSMO_STRBUF_APPEND_NOLEN(). null-- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27025 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I05d75a40599e3133da099a11e8babaaad0e9493a Gerrit-Change-Number: 27025 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(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

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: log: socket.c: rather use the osmo_sockaddr_str _FMT

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27024 ) Change subject: log: socket.c: rather use the osmo_sockaddr_str _FMT ...................................................................... log: socket.c: rather use the osmo_sockaddr_str _FMT The OSMO_SOCKADDR_STR_FMT() and _ARGS() macros properly place square braces around IPv6 addresses, so that the port nr is clearly distinguishable. before: 1:2::3:4:5 after: [1:2::3:4]:5 When using a struct reference, the macro resolves to '(&sastr) ? .. : ..', which the compiler complains about as "condition is always true". Shim around that error with a pointer variable. I considered using osmo_sockaddr_to_str_c() instead, but here in socket.c we cannot assume that osmo_select_main_ctx() is being used and hence can't just use OTC_SELECT for log string composition. The struct osmo_sockaddr_str is a string representation in a local variable, and hence doesn't need talloc for log strings. I considered adding log_check_level() around the log string conversion, but since all of these instances are on LOGL_ERROR, I didn't bother. Related: SYS#5599 Change-Id: Idbe7582b2b7f14540919e911dad08af6d491f68f --- M src/socket.c 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/socket.c b/src/socket.c index 0ffa11d..2d19fdf 100644 --- a/src/socket.c +++ b/src/socket.c @@ -484,8 +484,8 @@ } #define _SOCKADDR_TO_STR(dest, sockaddr) do { \ - if (osmo_sockaddr_str_from_sockaddr(&dest, &sockaddr->u.sas)) \ - osmo_strlcpy(dest.ip, "Invalid IP", 11); \ + if (osmo_sockaddr_str_from_sockaddr(dest, &sockaddr->u.sas)) \ + osmo_strlcpy((dest)->ip, "Invalid IP", 11); \ } while (0) /*! Initialize a socket (including bind and/or connect) @@ -520,7 +520,8 @@ unsigned int flags) { int sfd = -1, rc, on = 1; - struct osmo_sockaddr_str sastr = {}; + struct osmo_sockaddr_str _sastr = {}; + struct osmo_sockaddr_str *sastr = &_sastr; if ((flags & (OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT)) == 0) { LOGP(DLGLOBAL, LOGL_ERROR, "invalid: you have to specify either " @@ -551,8 +552,8 @@ sfd = socket_helper_osa(local, type, proto, flags); if (sfd < 0) { _SOCKADDR_TO_STR(sastr, local); - LOGP(DLGLOBAL, LOGL_ERROR, "no suitable local addr found for: %s:%u\n", - sastr.ip, sastr.port); + LOGP(DLGLOBAL, LOGL_ERROR, "no suitable local addr found for: " OSMO_SOCKADDR_STR_FMT "\n", + OSMO_SOCKADDR_STR_FMT_ARGS(sastr)); return -ENODEV; } @@ -562,10 +563,8 @@ if (rc < 0) { _SOCKADDR_TO_STR(sastr, local); LOGP(DLGLOBAL, LOGL_ERROR, - "cannot setsockopt socket:" - " %s:%u: %s\n", - sastr.ip, sastr.port, - strerror(errno)); + "cannot setsockopt socket: " OSMO_SOCKADDR_STR_FMT ": %s\n", + OSMO_SOCKADDR_STR_FMT_ARGS(sastr), strerror(errno)); close(sfd); return rc; } @@ -573,8 +572,8 @@ if (bind(sfd, &local->u.sa, sizeof(struct osmo_sockaddr)) == -1) { _SOCKADDR_TO_STR(sastr, local); - LOGP(DLGLOBAL, LOGL_ERROR, "unable to bind socket: %s:%u: %s\n", - sastr.ip, sastr.port, strerror(errno)); + LOGP(DLGLOBAL, LOGL_ERROR, "unable to bind socket: " OSMO_SOCKADDR_STR_FMT ": %s\n", + OSMO_SOCKADDR_STR_FMT_ARGS(sastr), strerror(errno)); close(sfd); return -1; } @@ -596,8 +595,8 @@ rc = connect(sfd, &remote->u.sa, sizeof(struct osmo_sockaddr)); if (rc != 0 && errno != EINPROGRESS) { _SOCKADDR_TO_STR(sastr, remote); - LOGP(DLGLOBAL, LOGL_ERROR, "unable to connect socket: %s:%u: %s\n", - sastr.ip, sastr.port, strerror(errno)); + LOGP(DLGLOBAL, LOGL_ERROR, "unable to connect socket: " OSMO_SOCKADDR_STR_FMT ": %s\n", + OSMO_SOCKADDR_STR_FMT_ARGS(sastr), strerror(errno)); close(sfd); return rc; } null-- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idbe7582b2b7f14540919e911dad08af6d491f68f Gerrit-Change-Number: 27024 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: add osmo_sockaddr_from/to_octets()

by neels

Hello Jenkins Builder, laforge, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/27050 to look at the new patch set (#2). Change subject: add osmo_sockaddr_from/to_octets() ...................................................................... add osmo_sockaddr_from/to_octets() Shorthand for the INET/INET6 switch() to get/put the addr part, useful for encoding and decoding message buffers. Related: OS#5599 Change-Id: Ie9e33bfac525c59c30714663d2bfcc62ec9eeb81 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 62 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/50/27050/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie9e33bfac525c59c30714663d2bfcc62ec9eeb81 Gerrit-Change-Number: 27050 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in libosmocore[master]: log: socket.c: rather use the osmo_sockaddr_str _FMT

by neels

Attention is currently required from: laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27024 ) Change subject: log: socket.c: rather use the osmo_sockaddr_str _FMT ...................................................................... Patch Set 2: (1 comment) File src/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/27024/comment/82f1caca_fe5571ff PS1, Line 488: osmo_strlcpy(dest->ip, "Invalid IP", 11); \ > yes, this is criticial to fix before merge. i think not critical at all, since the use of this macro is limited to this c file, and before this patch the macro also had no such parens. but ok -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idbe7582b2b7f14540919e911dad08af6d491f68f Gerrit-Change-Number: 27024 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 21:10:06 +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> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: gsm_network_T_defs: add T4, so it becomes configurable

by pespin

Attention is currently required from: fixeria, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27084 ) Change subject: gsm_network_T_defs: add T4, so it becomes configurable ...................................................................... Patch Set 3: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/27084/comment/0620c922_76309421 PS3, Line 12: 5 seconds (see bssmap_reset_fsm_state_chg()). Then, since it's now available, it probably makes sense to default to -1 since it should always find it, correct? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id844dab1abffd6efbe7767585f127b29c0ee710c Gerrit-Change-Number: 27084 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 18:31:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: gsm_network_T_defs: add T4, so it becomes configurable

by fixeria

Attention is currently required from: pespin, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27084 ) Change subject: gsm_network_T_defs: add T4, so it becomes configurable ...................................................................... Patch Set 3: (1 comment) Patchset: PS2: > I don't see this newly added timer being user anywhere in the patch? Answering in the commit message. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id844dab1abffd6efbe7767585f127b29c0ee710c Gerrit-Change-Number: 27084 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 18:23:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: gsm_network_T_defs: add T4, so it becomes configurable

by fixeria

Attention is currently required from: fixeria, dexter. Hello Jenkins Builder, laforge, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27084 to look at the new patch set (#3). Change subject: gsm_network_T_defs: add T4, so it becomes configurable ...................................................................... gsm_network_T_defs: add T4, so it becomes configurable This timer is referenced in 'src/osmo-bsc/bssmap_reset.c', see bssmap_reset_timeouts[]. However, it is not present in the gsm_network_T_defs[], so we fall-back to hard-coded value of 5 seconds (see bssmap_reset_fsm_state_chg()). Change-Id: Id844dab1abffd6efbe7767585f127b29c0ee710c Related: SYS#5796 --- M src/osmo-bsc/net_init.c M tests/timer.vty 2 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/84/27084/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id844dab1abffd6efbe7767585f127b29c0ee710c Gerrit-Change-Number: 27084 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: gsm_network_T_defs: add T4, so it becomes configurable

by pespin

Attention is currently required from: fixeria, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27084 ) Change subject: gsm_network_T_defs: add T4, so it becomes configurable ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: I don't see this newly added timer being user anywhere in the patch? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27084 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id844dab1abffd6efbe7767585f127b29c0ee710c Gerrit-Change-Number: 27084 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 17:56:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-mgw[master]: WIP: Initial IuUP support using proper FSMs

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/26823 ) Change subject: WIP: Initial IuUP support using proper FSMs ...................................................................... WIP: Initial IuUP support using proper FSMs Related: OS#1937 Depends: libosmocore Change-Id I63ee780b4aa162ea097410b234e73984000c0965 Change-Id: I6694a21480b25ab8f35d375295be6601ce38e31d --- M include/osmocom/mgcp/Makefile.am M include/osmocom/mgcp/mgcp_conn.h A include/osmocom/mgcp/mgcp_iuup.h M include/osmocom/mgcp/mgcp_network.h M src/libosmo-mgcp/Makefile.am M src/libosmo-mgcp/mgcp_conn.c A src/libosmo-mgcp/mgcp_iuup.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_protocol.c 9 files changed, 671 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/23/26823/1 diff --git a/include/osmocom/mgcp/Makefile.am b/include/osmocom/mgcp/Makefile.am index b94cdcd..60f29c6 100644 --- a/include/osmocom/mgcp/Makefile.am +++ b/include/osmocom/mgcp/Makefile.am @@ -13,4 +13,5 @@ mgcp_e1.h \ mgcp_network.h \ mgcp_protocol.h \ + mgcp_iuup.h \ $(NULL) diff --git a/include/osmocom/mgcp/mgcp_conn.h b/include/osmocom/mgcp/mgcp_conn.h index 4f882e9..22e4d52 100644 --- a/include/osmocom/mgcp/mgcp_conn.h +++ b/include/osmocom/mgcp/mgcp_conn.h @@ -28,6 +28,7 @@ #include <osmocom/mgcp/osmux.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/rate_ctr.h> +#include <osmocom/gsm/iuup.h> #include <inttypes.h> #define LOGPCONN(conn, cat, level, fmt, args...) \ @@ -47,6 +48,7 @@ MGCP_RTP_DEFAULT = 0, MGCP_OSMUX_BSC, MGCP_OSMUX_BSC_NAT, + MGCP_RTP_IUUP, }; /*! Connection type, specifies which member of the union "u" in mgcp_conn @@ -93,6 +95,14 @@ } stats; } osmux; + struct { + struct osmo_iuup_instance *iui; + bool active_init; /* true: Send IuUP Init */ + int rfci_idx_no_data; /* Index for RFCI NO_DATA (-1 if not available) */ + bool configured; + struct osmo_iuup_rnl_prim *init_ind; + } iuup; + struct rate_ctr_group *rate_ctr_group; }; @@ -176,6 +186,11 @@ return conn->type == MGCP_OSMUX_BSC || conn->type == MGCP_OSMUX_BSC_NAT; } +/* Was conn configured to handle Osmux? */ +static inline bool mgcp_conn_rtp_is_iuup(const struct mgcp_conn_rtp *conn) { + return conn->type == MGCP_RTP_IUUP; +} + struct mgcp_conn *mgcp_conn_alloc(void *ctx, struct mgcp_endpoint *endp, enum mgcp_conn_type type, char *name); struct mgcp_conn *mgcp_conn_get(struct mgcp_endpoint *endp, const char *id); diff --git a/include/osmocom/mgcp/mgcp_iuup.h b/include/osmocom/mgcp/mgcp_iuup.h new file mode 100644 index 0000000..e0708f5 --- /dev/null +++ b/include/osmocom/mgcp/mgcp_iuup.h @@ -0,0 +1,33 @@ +/* Message connection list handling */ + +/* + * (C) 2021 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * + * Author: Pau Espin Pedrol + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +#pragma once + +#include <osmocom/core/msgb.h> + +struct mgcp_conn_rtp; + +int mgcp_conn_iuup_init(struct mgcp_conn_rtp *conn_rtp); +void mgcp_conn_iuup_cleanup(struct mgcp_conn_rtp *conn_rtp); +int mgcp_conn_iuup_dispatch_rtp(struct msgb *msg); +int mgcp_conn_iuup_send_rtp(struct mgcp_conn_rtp *conn_src_rtp, struct mgcp_conn_rtp *conn_dest_rtp, struct msgb *msg); +int mgcp_conn_iuup_send_dummy(struct mgcp_conn_rtp *conn_rtp); diff --git a/include/osmocom/mgcp/mgcp_network.h b/include/osmocom/mgcp/mgcp_network.h index e3fa3b1..fa1c3e8 100644 --- a/include/osmocom/mgcp/mgcp_network.h +++ b/include/osmocom/mgcp/mgcp_network.h @@ -70,8 +70,6 @@ * data is just re-used) */ uint16_t alt_rtp_tx_sequence; uint32_t alt_rtp_tx_ssrc; - - bool patched_first_rtp_payload; /* FIXME: drop this, see OS#2459 */ }; struct mgcp_rtp_codec { diff --git a/src/libosmo-mgcp/Makefile.am b/src/libosmo-mgcp/Makefile.am index 91b2bf6..de42c0e 100644 --- a/src/libosmo-mgcp/Makefile.am +++ b/src/libosmo-mgcp/Makefile.am @@ -48,4 +48,5 @@ mgcp_ctrl.c \ mgcp_ratectr.c \ mgcp_e1.c \ + mgcp_iuup.c \ $(NULL) diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c index 9c2fb0f..6dc0199 100644 --- a/src/libosmo-mgcp/mgcp_conn.c +++ b/src/libosmo-mgcp/mgcp_conn.c @@ -30,6 +30,8 @@ #include <osmocom/mgcp/mgcp_trunk.h> #include <osmocom/mgcp/mgcp_sdp.h> #include <osmocom/mgcp/mgcp_codec.h> +#include <osmocom/mgcp/mgcp_iuup.h> + #include <osmocom/gsm/gsm_utils.h> #include <osmocom/core/rate_ctr.h> #include <osmocom/core/timer.h> @@ -129,6 +131,8 @@ { if (mgcp_conn_rtp_is_osmux(conn_rtp)) conn_osmux_disable(conn_rtp); + if (mgcp_conn_rtp_is_iuup(conn_rtp)) + mgcp_conn_iuup_cleanup(conn_rtp); mgcp_free_rtp_port(&conn_rtp->end); rate_ctr_group_free(conn_rtp->rate_ctr_group); mgcp_codec_reset_all(conn_rtp); diff --git a/src/libosmo-mgcp/mgcp_iuup.c b/src/libosmo-mgcp/mgcp_iuup.c new file mode 100644 index 0000000..ab83f08 --- /dev/null +++ b/src/libosmo-mgcp/mgcp_iuup.c @@ -0,0 +1,584 @@ +/* + * (C) 2021 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> + * All rights not specifically granted under this license are reserved. + * + * Author: Pau Espin Pedrol + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Affero General Public License as published by the + * Free Software Foundation; either version 3 of the License, or (at your + * option) any later version. + */ + +#include <stdint.h> + +#include <osmocom/gsm/iuup.h> + +#include <osmocom/netif/rtp.h> +#include <osmocom/netif/amr.h> + +#include <osmocom/mgcp/mgcp_conn.h> +#include <osmocom/mgcp/mgcp_iuup.h> +#include <osmocom/mgcp/mgcp_endp.h> +#include <osmocom/mgcp/mgcp_codec.h> +#include <osmocom/mgcp/debug.h> + +#define MGW_IUUP_MSGB_SIZE 4096 + +static struct osmo_iuup_rnl_config def_configure_req = { + .transparent = false, + .active = true, + .supported_versions_mask = 0x0003, + .num_rfci = 0, + .num_subflows = 0, + /* .delivery_err_sdu = All set to 0 (YES) by default, */ + .IPTIs_present = false, + .t_init = { .t_ms = IUUP_TIMER_INIT_T_DEFAULT, .n_max = IUUP_TIMER_INIT_N_DEFAULT }, + .t_ta = { .t_ms = IUUP_TIMER_TA_T_DEFAULT, .n_max = IUUP_TIMER_TA_N_DEFAULT }, + .t_rc = { .t_ms = IUUP_TIMER_RC_T_DEFAULT, .n_max = IUUP_TIMER_RC_N_DEFAULT }, +}; + +static struct mgcp_conn *_find_dst_conn(struct mgcp_conn *conn) +{ + /* Find a destination connection. */ + /* NOTE: This code path runs every time an RTP packet is received. The + * function mgcp_find_dst_conn() we use to determine the detination + * connection will iterate the connection list inside the endpoint. + * Since list iterations are quite costly, we will figure out the + * destination only once and use the optional private data pointer of + * the connection to cache the destination connection pointer. */ + + struct mgcp_conn *conn_dst; + if (!conn->priv) { + conn_dst = mgcp_find_dst_conn(conn); + conn->priv = conn_dst; + } else { + conn_dst = (struct mgcp_conn *)conn->priv; + } + return conn_dst; +} + +/* Find RFCI containing all 0 sizes, -1 if not found. irp is an Initialization.ind prim */ +static int _find_rfci_no_data(struct osmo_iuup_rnl_prim *irp) +{ + int i; + /* Find RFCI containing NO_DATA: */ + for (i = 0; i < irp->u.status.u.initialization.num_rfci; i++) { + int j; + bool is_no_data = true; + for (j = 0; j < irp->u.status.u.initialization.num_subflows; j++) { + if (irp->u.status.u.initialization.subflow_sizes[i][j]) { + is_no_data = false; + break; + } + } + if (is_no_data) { + return i; + } + } + return -1; +} + +/* -1 if none found */ +static int8_t _conn_iuup_amr_ft_2_rfci(struct mgcp_conn_rtp *conn_rtp, uint8_t ft) +{ + int8_t i; + unsigned match_bytes = (unsigned)osmo_amr_bytes(ft); + struct osmo_iuup_rnl_prim *irp = conn_rtp->iuup.init_ind; + OSMO_ASSERT(irp); + + /* TODO: cache this somehow */ + for (i = 0; i < irp->u.status.u.initialization.num_rfci; i++) { + int j; + unsigned num_bits = 0; + for (j = 0; j < irp->u.status.u.initialization.num_subflows; j++) + num_bits += irp->u.status.u.initialization.subflow_sizes[i][j]; + if (match_bytes == (num_bits + 7)/8) + return i; + } + + return -1; +} + +static int _conn_iuup_configure_as_passive(struct mgcp_conn_rtp *conn_rtp, struct msgb *msg) +{ + struct osmo_iuup_rnl_prim *irp; + int rc; + + conn_rtp->iuup.active_init = false; + + /* Tx CONFIG.req */ + irp = osmo_iuup_rnl_prim_alloc(conn_rtp->conn, OSMO_IUUP_RNL_CONFIG, PRIM_OP_REQUEST, MGW_IUUP_MSGB_SIZE); + irp->u.config = def_configure_req; + irp->u.config.active = conn_rtp->iuup.active_init; + if ((rc = osmo_iuup_rnl_prim_down(conn_rtp->iuup.iui, irp)) == 0) + conn_rtp->iuup.configured = true; + else + LOG_CONN_RTP(conn_rtp, LOGL_ERROR, "Failed configuring IuUP layer\n"); + return rc; +} + +static int _conn_iuup_configure_as_active(struct mgcp_conn_rtp *conn_rtp, struct osmo_iuup_rnl_prim *init_ind) +{ + struct osmo_iuup_rnl_prim *irp = init_ind; + struct osmo_iuup_rnl_prim *irp2; + struct msgb *msg; + bool prev_output_enabled; + int rc; + + conn_rtp->iuup.active_init = true; + + /* Find RFCI containing NO_DATA: */ + conn_rtp->iuup.rfci_idx_no_data = _find_rfci_no_data(init_ind); + + /* Copy over the rfci_idx_no_data, since we reuse the same subflow set: */ + msg = msgb_copy_c(conn_rtp->conn, irp->oph.msg, "iuup-init-copy"); + conn_rtp->iuup.init_ind = (struct osmo_iuup_rnl_prim *)msgb_data(msg); + conn_rtp->iuup.init_ind->oph.msg = msg; + + /* Tx CONFIG.req */ + irp2 = osmo_iuup_rnl_prim_alloc(conn_rtp->conn, OSMO_IUUP_RNL_CONFIG, PRIM_OP_REQUEST, MGW_IUUP_MSGB_SIZE); + irp2->u.config.transparent = false; + irp2->u.config.active = conn_rtp->iuup.active_init; + irp2->u.config.data_pdu_type = irp->u.status.u.initialization.data_pdu_type; + irp2->u.config.supported_versions_mask = def_configure_req.supported_versions_mask; + irp2->u.config.num_rfci = irp->u.status.u.initialization.num_rfci; + irp2->u.config.num_subflows = irp->u.status.u.initialization.num_subflows; + memcpy(irp2->u.config.subflow_sizes, irp->u.status.u.initialization.subflow_sizes, + IUUP_MAX_RFCIS * IUUP_MAX_SUBFLOWS * sizeof(irp2->u.config.subflow_sizes[0][0])); + irp2->u.config.IPTIs_present = irp->u.status.u.initialization.IPTIs_present; + if (irp->u.status.u.initialization.IPTIs_present) + memcpy(irp2->u.config.IPTIs, irp->u.status.u.initialization.IPTIs, + IUUP_MAX_RFCIS * sizeof(irp2->u.config.IPTIs[0])); + irp2->u.config.t_init = def_configure_req.t_init; + irp2->u.config.t_ta = def_configure_req.t_ta; + irp2->u.config.t_rc = def_configure_req.t_rc; + + /* We need to force allowance of RTP containing Init-ACK back: */ + prev_output_enabled = conn_rtp->end.output_enabled; + conn_rtp->end.output_enabled = true; + + if ((rc = osmo_iuup_rnl_prim_down(conn_rtp->iuup.iui, irp2)) == 0) + conn_rtp->iuup.configured = true; + else + LOG_CONN_RTP(conn_rtp, LOGL_ERROR, "Failed configuring IuUP layer\n"); + + conn_rtp->end.output_enabled = prev_output_enabled; + return rc; +} + +static int _conn_iuup_rtp_pl_up(struct mgcp_conn_rtp *conn_rtp, struct msgb *msg) +{ + /* Send RTP payload (IuUP) up the stack: */ + struct osmo_iuup_tnl_prim *itp; + int rc; + + msg->l2h = msgb_data(msg) + sizeof(struct rtp_hdr); + + itp = osmo_iuup_tnl_prim_alloc(conn_rtp->conn, OSMO_IUUP_TNL_UNITDATA, PRIM_OP_INDICATION, MGW_IUUP_MSGB_SIZE); + itp->oph.msg->l2h = msgb_put(itp->oph.msg, msgb_l2len(msg)); + memcpy(itp->oph.msg->l2h, msgb_l2(msg), msgb_l2len(msg)); + if ((rc = osmo_iuup_tnl_prim_up(conn_rtp->iuup.iui, itp)) != 0) { + LOG_CONN_RTP(conn_rtp, LOGL_ERROR, "Failed passing IuUP-Init to IuUP layer\n"); + } + return rc; +} + +static int check_rtp_iuup(const struct mgcp_conn_rtp *conn_rtp, struct msgb *msg) +{ + size_t min_size = sizeof(struct rtp_hdr); + /* Check there's at least 2 bytes of RTP payload (IuUP header). This is + ** mainly to avoid 0-byte payload copy cases */ + if (msgb_length(msg) < sizeof(struct rtp_hdr) + 2) { + LOG_CONN_RTP(conn_rtp, LOGL_ERROR, "RTP-IuUP packet too short (%u < %zu)\n", + msgb_length(msg), min_size); + return -1; + } + return 0; +} + +/* owns the irp */ +static int bridge_iuup_to_iuup_peer(struct mgcp_conn_rtp *conn_rtp_src, struct mgcp_conn_rtp *conn_rtp_dst, struct osmo_iuup_rnl_prim *irp) +{ + int rc; + + /* If we are not configured and we received bridged data, it means + * conn_rtp_src is already configured and INITed, and we can infer + * conn_rtp_src is Init-passive (RNC side), so conn_rtp_dst needs to be + * configured as INIT-active: */ + if (!conn_rtp_dst->iuup.configured) { + OSMO_ASSERT(conn_rtp_src->iuup.init_ind); + rc = _conn_iuup_configure_as_active(conn_rtp_dst, conn_rtp_src->iuup.init_ind); + if (rc < 0) { + msgb_free(irp->oph.msg); + return rc; + } + } + + /* We simply forward the msg, without freeing it: */ + talloc_steal(conn_rtp_dst->conn, irp->oph.msg); + irp->oph.operation = PRIM_OP_REQUEST; + if ((rc = osmo_iuup_rnl_prim_down(conn_rtp_dst->iuup.iui, irp)) != 0) + LOG_CONN_RTP(conn_rtp_dst, LOGL_ERROR, "Failed Tx data down to IuUP layer\n"); + return rc; +} + +/* Owns the irp */ +static int bridge_iuup_to_rtp_peer(struct mgcp_conn_rtp *conn_rtp_src, struct mgcp_conn_rtp *conn_rtp_dst, struct osmo_iuup_rnl_prim *irp) +{ + /* FIXME: We probably need transcoding here?! Or at least look up AMR modes and translate to related RFCI */ + uint8_t frame_nr = irp->u.data.frame_nr; + uint8_t fqc = irp->u.data.fqc; + struct msgb *msg = irp->oph.msg; + ssize_t amr_length = 0; + int ft; + uint8_t *amr_data; + struct rtp_hdr *rtp_hdr; + struct amr_hdr *amr_hdr; + int rc; + + ft = osmo_amr_bytes_to_ft(msgb_l3len(msg)); + if (ft < 0) { + LOGPCONN(conn_rtp_src->conn, DRTP, LOGL_ERROR, + "Unknown AMR format for size %u\n", msgb_l3len(msg)); + msgb_free(msg); + return ft; + } + msgb_pull_to_l3(msg); + LOGP(DLMGCP, LOGL_DEBUG, "Convert Iuup -> AMR: ft %d, len %d\n", ft, msgb_l3len(msg)); + + if (mgcp_codec_amr_is_octet_aligned(conn_rtp_dst->end.codec)) { + amr_hdr = (struct amr_hdr *) msgb_push(msg, sizeof(struct amr_hdr)); + amr_hdr->cmr = 15; /* no change */ + amr_hdr->f = 0; + amr_hdr->q = !fqc; + amr_hdr->ft = ft & 0xff; + amr_hdr->pad1 = 0; + amr_hdr->pad2 = 0; + } else { + OSMO_ASSERT(msgb_tailroom(msg) >= 2); + msgb_put(msg, 2); + osmo_amr_iuup_to_bwe(msgb_data(msg), msgb_length(msg) - 2, msgb_length(msg) + 2); + /* fill bwe header */ + amr_data = msgb_data(msg); + /* CMR no change | follow bit | ft (3 of 4 bits) */ + amr_data[0] = 15 << 4 | (0 << 3) | (ft >> 1); + amr_data[1] |= ((ft & 0x1) << 7) | (((!fqc) & 0x1) << 6); + amr_length = (osmo_amr_bits(ft) + 10 + 7) / 8; + msgb_trim(msg, amr_length); + } + rtp_hdr = (struct rtp_hdr *) msgb_push(msg, sizeof(*rtp_hdr)); + *rtp_hdr = (struct rtp_hdr){ + .csrc_count = 0, + .extension = 0, + .padding = 0, + .version = 0, + .payload_type = conn_rtp_dst->end.codec->payload_type, + .marker = 0, + .sequence = frame_nr, + .timestamp = 0, + .ssrc = 0 + }; + + rc = mgcp_send(conn_rtp_dst->conn->endp, true, NULL, msg, conn_rtp_src, conn_rtp_dst); + msgb_free(msg); + return rc; +} + +static int _conn_iuup_rx_rnl_data(struct mgcp_conn_rtp *conn_rtp_src, struct osmo_iuup_rnl_prim *irp) +{ + struct mgcp_conn *conn_dst; + struct mgcp_conn_rtp *conn_rtp_dst; + int rc; + + conn_dst = _find_dst_conn(conn_rtp_src->conn); + + /* There is no destination conn, stop here */ + if (!conn_dst) { + LOGPCONN(conn_rtp_src->conn, DRTP, LOGL_DEBUG, + "no connection to forward an incoming IuUP payload to\n"); + rc= -1; + goto free_ret; + } + + /* The destination conn is not an RTP/IuUP connection */ + if (conn_dst->type != MGCP_CONN_TYPE_RTP) { + LOGPCONN(conn_rtp_src->conn, DRTP, LOGL_ERROR, + "unable to find suitable destination conn\n"); + rc= -1; + goto free_ret; + } + conn_rtp_dst = &conn_dst->u.rtp; + + switch (conn_rtp_dst->type) { + case MGCP_RTP_IUUP: + return bridge_iuup_to_iuup_peer(conn_rtp_src, conn_rtp_dst, irp); + case MGCP_RTP_DEFAULT: + return bridge_iuup_to_rtp_peer(conn_rtp_src, conn_rtp_dst, irp); + case MGCP_OSMUX_BSC: + case MGCP_OSMUX_BSC_NAT: + default: + LOGPCONN(conn_rtp_src->conn, DRTP, LOGL_ERROR, + "Forward of IuUP payload to RTP connection type %u not supported!\n", + conn_rtp_dst->type); + rc = 0; + } + +free_ret: + msgb_free(irp->oph.msg); + return rc; +} + +static int _conn_iuup_rx_rnl_status_init(struct mgcp_conn_rtp *conn_rtp_src, struct osmo_iuup_rnl_prim *irp) +{ + struct mgcp_conn *conn_dst; + struct mgcp_conn_rtp *conn_rtp_dst; + int rc = 0; + struct msgb *msg; + + /* Find RFCI containing NO_DATA: */ + conn_rtp_src->iuup.rfci_idx_no_data = _find_rfci_no_data(irp); + + msg = msgb_copy_c(conn_rtp_src->conn, irp->oph.msg, "iuup-init-copy"); + conn_rtp_src->iuup.init_ind = (struct osmo_iuup_rnl_prim *)msgb_data(msg); + conn_rtp_src->iuup.init_ind->oph.msg = msg; + + conn_dst = _find_dst_conn(conn_rtp_src->conn); + if (!conn_dst) + return 0; /* FIXME: that probably means we potentially need to Init the peer dst later! */ + conn_rtp_dst = &conn_dst->u.rtp; + if (!mgcp_conn_rtp_is_iuup(conn_rtp_dst)) + return 0; /* Nothing to do */ + + /* We received IuUP parameters on the peer (RNC), Init actively this conn (against CN): */ + if (!conn_rtp_dst->iuup.configured) + rc = _conn_iuup_configure_as_active(conn_rtp_dst, irp); + + return rc; +} + +static int _conn_iuup_rx_rnl_status(struct mgcp_conn_rtp *conn_rtp_src, struct osmo_iuup_rnl_prim *irp) +{ + int rc; + + switch (irp->u.status.procedure) { + case IUUP_PROC_INIT: + rc = _conn_iuup_rx_rnl_status_init(conn_rtp_src, irp); + break; + case IUUP_PROC_RATE_CTRL: + case IUUP_PROC_TIME_ALIGN: + case IUUP_PROC_ERR_EVENT: + default: + LOG_CONN_RTP(conn_rtp_src, LOGL_ERROR, + "Received IuUP RNL STATUS procedure type %u not handled\n", + irp->u.status.procedure); + rc = 0; + } + + return rc; +} +static int _conn_iuup_user_prim_cb(struct osmo_prim_hdr *oph, void *ctx) +{ + struct mgcp_conn_rtp *conn_rtp_src = ctx; + struct osmo_iuup_rnl_prim *irp = (struct osmo_iuup_rnl_prim *)oph; + struct msgb *msg = oph->msg; + int rc; + + switch (OSMO_PRIM_HDR(&irp->oph)) { + case OSMO_PRIM(OSMO_IUUP_RNL_DATA, PRIM_OP_INDICATION): + /* we pass ownsership of msg here: */ + rc = _conn_iuup_rx_rnl_data(conn_rtp_src, irp); + break; + case OSMO_PRIM(OSMO_IUUP_RNL_STATUS, PRIM_OP_INDICATION): + rc = _conn_iuup_rx_rnl_status(conn_rtp_src, irp); + msgb_free(msg); + break; + default: + msgb_free(msg); + OSMO_ASSERT(false); + } + + return rc; +} + +static int _conn_iuup_transport_prim_cb(struct osmo_prim_hdr *oph, void *ctx) +{ + struct mgcp_conn_rtp *conn_rtp_dst = ctx; + struct mgcp_conn *conn_dst = conn_rtp_dst->conn; + struct osmo_iuup_tnl_prim *itp = (struct osmo_iuup_tnl_prim *)oph; + struct mgcp_conn *conn_src; + struct msgb *msg; + struct rtp_hdr *rtph; + struct osmo_sockaddr from_addr = {0}; /* FIXME: what to do with this one? */ + + OSMO_ASSERT(OSMO_PRIM_HDR(&itp->oph) == OSMO_PRIM(OSMO_IUUP_TNL_UNITDATA, PRIM_OP_REQUEST)); + + msg = oph->msg; + talloc_steal(conn_rtp_dst->conn, msg); + + msgb_pull_to_l2(msg); + rtph = (struct rtp_hdr *)msgb_push(msg, sizeof(*rtph)); + /* TODO: fill rtph properly: */ + *rtph = (struct rtp_hdr){ + .csrc_count = 0, + .extension = 0, + .padding = 0, + .version = 0, + .payload_type = conn_rtp_dst->end.codec->payload_type, + .marker = 0, + .sequence = 0, + .timestamp = 0, + .ssrc = 0 + }; + + /* The destination of the destination conn is the source conn, right? */ + conn_src = _find_dst_conn(conn_dst); + if (!conn_src) { + LOG_CONN_RTP(conn_rtp_dst, LOGL_NOTICE, + "Couldn't find source conn for IuUP dst conn\n"); + //msgb_free(msg); + //return -ENOTCONN; + conn_src = conn_dst; + } + + /* FIXME: set from_addr = NULL */ + return mgcp_send(conn_dst->endp, 1, + &from_addr, msg, &conn_src->u.rtp, conn_rtp_dst); +} + +int mgcp_conn_iuup_init(struct mgcp_conn_rtp *conn_rtp) +{ + conn_rtp->type = MGCP_RTP_IUUP; + conn_rtp->iuup.iui = osmo_iuup_instance_alloc(conn_rtp->conn, conn_rtp->conn->id); + OSMO_ASSERT(conn_rtp->iuup.iui); + osmo_iuup_instance_set_user_prim_cb(conn_rtp->iuup.iui, _conn_iuup_user_prim_cb, conn_rtp); + osmo_iuup_instance_set_transport_prim_cb(conn_rtp->iuup.iui, _conn_iuup_transport_prim_cb, conn_rtp); + conn_rtp->iuup.rfci_idx_no_data = -1; + return 0; +} + +void mgcp_conn_iuup_cleanup(struct mgcp_conn_rtp *conn_rtp) +{ + osmo_iuup_instance_free(conn_rtp->iuup.iui); + conn_rtp->iuup.iui = NULL; +} + +int mgcp_conn_iuup_dispatch_rtp(struct msgb *msg) +{ + struct osmo_rtp_msg_ctx *mc = OSMO_RTP_MSG_CTX(msg); + struct mgcp_conn_rtp *conn_rtp_src = mc->conn_src; + int rc = 0; + bool force_output_enabled = false; + bool prev_output_enabled; + struct osmo_sockaddr prev_rem_addr; + uint16_t prev_rem_rtp_port; + + OSMO_ASSERT(mgcp_conn_rtp_is_iuup(conn_rtp_src)); + + if ((rc = check_rtp_iuup(conn_rtp_src, msg)) < 0) + goto free_ret; + + if (!conn_rtp_src->iuup.configured) { + /* We received the first message without sending any, the peer is the active side (RNC). */ + rc = _conn_iuup_configure_as_passive(conn_rtp_src, msg); + if (rc < 0) + goto free_ret; + /* We need to force allowance of RTP containing Init-ACK back: */ + prev_output_enabled = conn_rtp_src->end.output_enabled; + conn_rtp_src->end.output_enabled = true; + force_output_enabled = true; + /* Fill in the peer address so that we can send Init-ACK back: */ + prev_rem_addr = conn_rtp_src->end.addr; + prev_rem_rtp_port = conn_rtp_src->end.rtp_port; + conn_rtp_src->end.addr = *mc->from_addr; + conn_rtp_src->end.rtp_port = htons(osmo_sockaddr_port(&mc->from_addr->u.sa)); + } + + rc = _conn_iuup_rtp_pl_up(conn_rtp_src, msg); + + if (force_output_enabled) { + conn_rtp_src->end.output_enabled = prev_output_enabled; + conn_rtp_src->end.addr = prev_rem_addr; + conn_rtp_src->end.rtp_port = prev_rem_rtp_port; + } + + return rc; +free_ret: + msgb_free(msg); + return rc; +} + +/* Build IuUP RNL Data primitive from msg containing an incoming RTP pkt from + * peer and send it down the IuUP layer towards the destination as IuUP/RTP: */ +int mgcp_conn_iuup_send_rtp(struct mgcp_conn_rtp *conn_src_rtp, struct mgcp_conn_rtp *conn_dest_rtp, struct msgb *msg) +{ + struct osmo_iuup_rnl_prim *irp; + struct rtp_hdr *rtph; + struct amr_hdr *amr_hdr; + int rc = -1; + int iuup_length = 0; + + /* Tx RNL-DATA.req */ + rtph = (struct rtp_hdr *)msgb_data(msg); + msgb_pull(msg, sizeof(*rtph)); + + /* FIXME: validate amr packets */ + irp = osmo_iuup_rnl_prim_alloc(conn_dest_rtp->conn, OSMO_IUUP_RNL_DATA, PRIM_OP_REQUEST, MGW_IUUP_MSGB_SIZE); + irp->u.data.frame_nr = htons(rtph->sequence) % 16; + + /* FIXME: We probably need transcoding here?! Or at least look up AMR modes and translate to related RFCI */ + if (msgb_length(msg) < (sizeof(*amr_hdr))) { + return -1; + } + + amr_hdr = (struct amr_hdr *) msgb_data(msg); + if (mgcp_codec_amr_is_octet_aligned(conn_src_rtp->end.codec)) { + /* FIXME: CMR handling & multiple frames handling */ + irp->u.data.fqc = IUUP_FQC_FRAME_GOOD; + irp->u.data.rfci = _conn_iuup_amr_ft_2_rfci(conn_dest_rtp, amr_hdr->ft); + msgb_pull(msg, 2); + } else { + irp->u.data.fqc = amr_hdr->q; + irp->u.data.rfci = _conn_iuup_amr_ft_2_rfci(conn_dest_rtp, amr_hdr->ft); + rc = iuup_length = osmo_amr_bwe_to_iuup(msgb_data(msg), msgb_length(msg)); + if (rc < 0) { + LOG_CONN_RTP(conn_dest_rtp, LOGL_ERROR, "Failed convert the RTP/AMR to IuUP payload\n"); + return rc; + } + msgb_trim(msg, iuup_length); + } + + irp->oph.msg->l3h = msgb_put(irp->oph.msg, msgb_length(msg)); + memcpy(irp->oph.msg->l3h, msgb_data(msg), msgb_length(msg)); + if ((rc = osmo_iuup_rnl_prim_down(conn_dest_rtp->iuup.iui, irp)) != 0) { + LOG_CONN_RTP(conn_dest_rtp, LOGL_ERROR, "Failed Tx RTP payload down the IuUP layer\n"); + return rc; + } + + return rc; +} + +/* Build IuUP RNL Data primitive from msg containing dummy content and send it + * down the IuUP layer towards the destination as IuUP/RTP: */ +int mgcp_conn_iuup_send_dummy(struct mgcp_conn_rtp *conn_rtp) +{ + struct osmo_iuup_rnl_prim *irp; + int rc; + + if (conn_rtp->iuup.rfci_idx_no_data == -1) { + LOG_CONN_RTP(conn_rtp, LOGL_NOTICE, "No RFCI NO_DATA found, unable to send dummy packet\n"); + return -ENOTSUP; + } + + irp = osmo_iuup_rnl_prim_alloc(conn_rtp->conn, OSMO_IUUP_RNL_DATA, PRIM_OP_REQUEST, MGW_IUUP_MSGB_SIZE); + irp->u.data.frame_nr = 0; + irp->u.data.fqc = IUUP_FQC_FRAME_GOOD; + irp->u.data.rfci = conn_rtp->iuup.rfci_idx_no_data; + irp->oph.msg->l3h = irp->oph.msg->tail; + if ((rc = osmo_iuup_rnl_prim_down(conn_rtp->iuup.iui, irp)) != 0) { + LOG_CONN_RTP(conn_rtp, LOGL_ERROR, "Failed Tx RTP dummy payload down the IuUP layer\n"); + return -EINVAL; + } + + return 0; +} diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c index f865dfe..ea57b26 100644 --- a/src/libosmo-mgcp/mgcp_network.c +++ b/src/libosmo-mgcp/mgcp_network.c @@ -48,7 +48,7 @@ #include <osmocom/mgcp/debug.h> #include <osmocom/codec/codec.h> #include <osmocom/mgcp/mgcp_e1.h> - +#include <osmocom/mgcp/mgcp_iuup.h> #define RTP_SEQ_MOD (1 << 16) #define RTP_MAX_DROPOUT 3000 @@ -975,7 +975,8 @@ * the length is because we currently handle IUUP packets as RTP * packets, so they must pass this check, if we weould be more * strict here, we would possibly break 3G. (see also FIXME note - * below */ + * below. */ + /* FIXME UPDATE: we can now apply more checks based on mgcp_conn_rtp_is_iuup(conn_src) */ return 0; } @@ -1013,6 +1014,11 @@ "endpoint type is MGCP_OSMUX_BSC_NAT, " "using osmux_xfrm_to_osmux() to forward data through OSMUX\n"); return osmux_xfrm_to_osmux((char*)msgb_data(msg), msgb_length(msg), conn_dst); + case MGCP_RTP_IUUP: + LOGPENDP(endp, DRTP, LOGL_DEBUG, + "endpoint type is MGCP_RTP_IUUP, " + "using mgcp_conn_iuup_send_rtp() to forward data over IuUP\n"); + return mgcp_conn_iuup_send_rtp(conn_src, conn_dst, msg); } /* If the data has not been handled/forwarded until here, it will @@ -1073,8 +1079,11 @@ if (check_rtp_destin(conn) != 0) goto failed; - rc = mgcp_udp_send(conn->end.rtp.fd, &conn->end.addr, - conn->end.rtp_port, rtp_dummy_payload, sizeof(rtp_dummy_payload)); + if (mgcp_conn_rtp_is_iuup(conn)) + rc = mgcp_conn_iuup_send_dummy(conn); + else + rc = mgcp_udp_send(conn->end.rtp.fd, &conn->end.addr, conn->end.rtp_port, + rtp_dummy_payload, sizeof(rtp_dummy_payload)); if (rc == -1) goto failed; @@ -1138,7 +1147,7 @@ * course unable to patch the payload type. A situation like this * should not occur if transcoding is consequently avoided. Until * we have transcoding support in osmo-mgw we can not resolve this. */ - if (is_rtp) { + if (is_rtp && conn_dst->type != MGCP_RTP_IUUP) { rc = mgcp_patch_pt(conn_src, conn_dst, msg); if (rc < 0) { LOGPENDP(endp, DRTP, LOGL_DEBUG, @@ -1185,7 +1194,9 @@ mgcp_patch_and_count(endp, rtp_state, rtp_end, addr, msg); - if (amr_oa_bwe_convert_indicated(conn_dst->end.codec)) { + if (mgcp_conn_rtp_is_iuup(conn_dst) || mgcp_conn_rtp_is_iuup(conn_src)) { + /* the iuup code will correctly transform to the correct AMR mode */ + } else if (amr_oa_bwe_convert_indicated(conn_dst->end.codec)) { rc = amr_oa_bwe_convert(endp, msg, conn_dst->end.codec->param.amr_octet_aligned); if (rc < 0) { @@ -1214,25 +1225,6 @@ forward_data(rtp_end->rtp.fd, &conn_src->tap_out, msg); - /* FIXME: HACK HACK HACK. See OS#2459. - * The ip.access nano3G needs the first RTP payload's first two bytes to read hex - * 'e400', or it will reject the RAB assignment. It seems to not harm other femto - * cells (as long as we patch only the first RTP payload in each stream). - */ - if (!rtp_state->patched_first_rtp_payload - && conn_src->conn->mode == MGCP_CONN_LOOPBACK) { - uint8_t *data = msgb_data(msg) + 12; - if (data[0] == 0xe0) { - data[0] = 0xe4; - data[1] = 0x00; - data[2] = (0x09 << 2); /* Patch CRC Header to adapt to new header above */ - rtp_state->patched_first_rtp_payload = true; - LOGPENDP(endp, DRTP, LOGL_DEBUG, - "Patching over first two bytes" - " to fake an IuUP Initialization Ack\n"); - } - } - len = mgcp_udp_send(rtp_end->rtp.fd, &rtp_end->addr, rtp_end->rtp_port, (char *)msgb_data(msg), msgb_length(msg)); @@ -1292,6 +1284,9 @@ * destination connection is known the RTP packet is sent via * the destination connection. */ + /* If source is IuUP, we need to handle state, forward it through specific bridge: */ + if (mgcp_conn_rtp_is_iuup(conn_src)) + return mgcp_conn_iuup_dispatch_rtp(msg); /* Check if the connection is in loopback mode, if yes, just send the * incoming data back to the origin */ diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c index 5b88c7a..b5a0c58 100644 --- a/src/libosmo-mgcp/mgcp_protocol.c +++ b/src/libosmo-mgcp/mgcp_protocol.c @@ -46,6 +46,7 @@ #include <osmocom/mgcp/mgcp_sdp.h> #include <osmocom/mgcp/mgcp_codec.h> #include <osmocom/mgcp/mgcp_conn.h> +#include <osmocom/mgcp/mgcp_iuup.h> /* Contains the last successfully resolved endpoint name. This variable is used * for the unit-tests to verify that the endpoint was correctly resolved. */ @@ -147,7 +148,13 @@ struct mgcp_conn_rtp *conn_dst = conn; struct mgcp_conn *_conn; - if (conn->type != MGCP_RTP_DEFAULT && !mgcp_conn_rtp_is_osmux(conn)) { + switch (conn->type) { + case MGCP_RTP_DEFAULT: + case MGCP_OSMUX_BSC: + case MGCP_OSMUX_BSC_NAT: + case MGCP_RTP_IUUP: + break; + default: LOGPENDP(endp, DLMGCP, LOGL_NOTICE, "RTP-setup: Endpoint is not configured as RTP default, stopping here!\n"); return 0; @@ -1028,6 +1035,11 @@ rate_ctr_inc(rate_ctr_group_get_ctr(rate_ctrs, MGCP_CRCX_FAIL_CODEC_NEGOTIATION)); goto error2; } + /* Upgrade the conn type RTP_DEFAULT->RTP_IUUP if needed based on requested codec: */ + /* TODO: "codec" probably needs to be moved from endp to conn */ + if (conn->type == MGCP_RTP_DEFAULT && strcmp(conn->end.codec->subtype_name, "VND.3GPP.IUFP") == 0) { + rc = mgcp_conn_iuup_init(conn); + } conn->end.fmtp_extra = talloc_strdup(trunk->endpoints, trunk->audio_fmtp_extra); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/26823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6694a21480b25ab8f35d375295be6601ce38e31d Gerrit-Change-Number: 26823 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 3 months

3
16
0 0

Change in osmo-dev[master]: net: make terminal configurable in config file

by neels

Attention is currently required from: osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27033 ) Change subject: net: make terminal configurable in config file ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I0afb6b0242c399334a2c37f18a5d26d5beeabedc Gerrit-Change-Number: 27033 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 17:48:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates/.editorconfig: new file

by neels

Attention is currently required from: osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27032 ) Change subject: net/templates/.editorconfig: new file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ieeb67a10c7b7c27a5e0e9dbc8399fe2add9f34d4 Gerrit-Change-Number: 27032 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 17:48:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

Change in osmo-dev[master]: net/templates/osmo-bsc-nat.cfg: add addressbooks

by neels

Attention is currently required from: osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/27031 ) Change subject: net/templates/osmo-bsc-nat.cfg: add addressbooks ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/27031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ia396cc677ceffa3fa86da5460f6c890b5f714059 Gerrit-Change-Number: 27031 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Feb 2022 17:48:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 3 months

1
0
0 0

2024

2023

2022

gerrit-log