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

[M] Change in libosmo-abis[master]: Add support for sending and receiving Sa bits, as well as some line s...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/35563?usp=email ) Change subject: Add support for sending and receiving Sa bits, as well as some line signals ...................................................................... Add support for sending and receiving Sa bits, as well as some line signals The Sa bits are required for osmo-v5. V5.2 interface must alter and detect Sa7 bit on time slot 0. 'Fastlink' multiplexers do not allow to disable link check with Sa7, so that it must be supported by osmo-v5. Requires: osmo-e1d Change-Id I2608af7bbb8092fddd68d4f3bb36b10a1100ce0f Change-Id: Ie7643693c2daac99f5747591decd60e982b8052a --- M include/osmocom/abis/e1_input.h M src/e1_input.c M src/input/e1d.c 3 files changed, 97 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index 0d48333..13008f8 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -270,6 +270,8 @@ S_L_INP_LINE_SLIP_RX, S_L_INP_LINE_SLIP_TX, S_L_INP_LINE_SA_BITS, + S_L_INP_LINE_LOF, + S_L_INP_LINE_NOLOF, }; extern const struct value_string e1inp_signal_names[]; diff --git a/src/e1_input.c b/src/e1_input.c index 6fca307..d4e9e88 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -1121,6 +1121,8 @@ { S_L_INP_LINE_SLIP_RX, "LINE-SLIP-RX" }, { S_L_INP_LINE_SLIP_TX, "LINE-SLIP-TX" }, { S_L_INP_LINE_SA_BITS, "LINE-SA-BITS" }, + { S_L_INP_LINE_LOF, "LINE-LOF" }, + { S_L_INP_LINE_NOLOF, "LINE-NOLOF" }, { 0, NULL } }; diff --git a/src/input/e1d.c b/src/input/e1d.c index d55c395..dd4e9fe 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -30,6 +30,7 @@ #include <osmocom/core/bits.h> #include <osmocom/core/logging.h> #include <osmocom/core/fsm.h> +#include <osmocom/core/signal.h> #include <osmocom/vty/vty.h> @@ -75,6 +76,72 @@ { 0, NULL } }; +struct e1inp_line *e1inp_port_find(uint8_t port_nr) +{ + struct e1inp_line *e1i_line; + + /* iterate over global list of e1 lines */ + llist_for_each_entry(e1i_line, &e1inp_line_list, list) { + if (e1i_line->port_nr == port_nr) + return e1i_line; + } + return NULL; +} + +static void e1d_client_event_cb(enum osmo_e1dp_msg_type event, uint8_t intf, uint8_t line, uint8_t ts, uint8_t *data, int len) +{ + struct e1inp_line *e1_line; + struct input_signal_data isd; + int signal; + + memset(&isd, 0, sizeof(isd)); + + /* we use higher 4 bits for interface, lower 4 bits for line, + * resulting in max. 16 interfaces with 16 lines each */ + e1_line = e1inp_port_find((intf << 4) | line); + if (!e1_line) + return; + isd.line = e1_line; + + switch (event) { + case E1DP_EVT_LOS_ON: + signal = S_L_INP_LINE_LOS; + break; + case E1DP_EVT_LOS_OFF: + signal = S_L_INP_LINE_NOLOS; + break; + case E1DP_EVT_AIS_ON: + signal = S_L_INP_LINE_AIS; + break; + case E1DP_EVT_AIS_OFF: + signal = S_L_INP_LINE_NOAIS; + break; + case E1DP_EVT_RAI_ON: + signal = S_L_INP_LINE_RAI; + break; + case E1DP_EVT_RAI_OFF: + signal = S_L_INP_LINE_NORAI; + break; + case E1DP_EVT_LOF_ON: + signal = S_L_INP_LINE_LOF; + break; + case E1DP_EVT_LOF_OFF: + signal = S_L_INP_LINE_NOLOF; + break; + case E1DP_EVT_SABITS: + signal = S_L_INP_LINE_SA_BITS; + if (len < 1) + return; + isd.sa_bits = *data; + break; + default: + /* Ignore all other events. */ + return; + } + + osmo_signal_dispatch(SS_L_INPUT, signal, &isd); +} + static int fsm_e1_client_timer_cb(struct osmo_fsm_inst *fi) { osmo_fsm_inst_dispatch(g_e1d_fsm_inst, EV_CONNECT, NULL); @@ -92,6 +159,7 @@ osmo_fsm_inst_state_chg(g_e1d_fsm_inst, ST_DISCONNECTED, 1, 0); return; } + osmo_e1dp_client_event_register(g_e1d, e1d_client_event_cb); } LOGPFSML(fi, LOGL_NOTICE, "Successfully (re)connected to osmo-e1d daemon!\n"); @@ -766,9 +834,20 @@ return 0; } +static int set_sa_bits(struct e1inp_line *line, uint8_t sa_bits) +{ + /* we use higher 4 bits for interface, lower 4 bits for line, + * resulting in max. 16 interfaces with 16 lines each */ + uint8_t e1d_intf = (line->port_nr >> 4) & 0xF; + uint8_t e1d_line = line->port_nr & 0xF; + + return osmo_e1dp_client_set_sa_bits(g_e1d, e1d_intf, e1d_line, sa_bits); +} + struct e1inp_driver e1d_driver = { .name = "e1d", .want_write = e1d_want_write, + .set_sa_bits = set_sa_bits, .line_update = e1d_line_update, .line_create = e1d_line_create, }; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/35563?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie7643693c2daac99f5747591decd60e982b8052a Gerrit-Change-Number: 35563 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[M] Change in libosmo-abis[master]: Add support for sending and receiving Sa bits, as well as some line s...

by laforge

Attention is currently required from: dexter, jolly, tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/35563?usp=email ) Change subject: Add support for sending and receiving Sa bits, as well as some line signals ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/35563?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie7643693c2daac99f5747591decd60e982b8052a Gerrit-Change-Number: 35563 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 Feb 2024 18:06:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in osmo-msc[master]: pick up all *.vty in EXTRA_DIST

by laforge

Attention is currently required from: fixeria, neels, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35872?usp=email ) Change subject: pick up all *.vty in EXTRA_DIST ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35872?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id28e020fc59b83d1b4cd0e5b72314a46bea62259 Gerrit-Change-Number: 35872 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(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-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 Feb 2024 18:06:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in docker-playground[master]: fixup: ttcn3-bts-test: do not start osmo-bts-virtual / virtphy contai...

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35941?usp=email ) Change subject: fixup: ttcn3-bts-test: do not start osmo-bts-virtual / virtphy containers ...................................................................... fixup: ttcn3-bts-test: do not start osmo-bts-virtual / virtphy containers Change-Id: I9a38356be1f970a2b8f1bf51bfc220471502682f Related: OS#6352 --- M ttcn3-bts-test/jenkins.sh 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 92d83ef..f932b4a 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -193,8 +193,8 @@ # 3) OML tests require us to run without BSC docker_kill_wait ${BUILD_TAG}-bsc # switch back from virtphy + osmo-bts-virtual to osmo-bts-trx -docker_kill_wait ${BUILD_TAG}-virtphy -docker_kill_wait ${BUILD_TAG}-bts +#docker_kill_wait ${BUILD_TAG}-virtphy +#docker_kill_wait ${BUILD_TAG}-bts cp oml/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ network_replace_subnet_in_configs -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35941?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9a38356be1f970a2b8f1bf51bfc220471502682f Gerrit-Change-Number: 35941 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[S] Change in docker-playground[master]: fixup: ttcn3-bts-test: do not start osmo-bts-virtual / virtphy contai...

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35941?usp=email ) Change subject: fixup: ttcn3-bts-test: do not start osmo-bts-virtual / virtphy containers ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35941?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9a38356be1f970a2b8f1bf51bfc220471502682f Gerrit-Change-Number: 35941 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 Feb 2024 18:05:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in docker-playground[master]: fixup: ttcn3-bts-test: do not start osmo-bts-virtual / virtphy contai...

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35941?usp=email ) Change subject: fixup: ttcn3-bts-test: do not start osmo-bts-virtual / virtphy containers ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35941?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9a38356be1f970a2b8f1bf51bfc220471502682f Gerrit-Change-Number: 35941 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 12 Feb 2024 18:05:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[M] Change in pysim[master]: Add terminal_capability command to send TERMINAL CAPABILITY

by fixeria

Attention is currently required from: dexter, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35953?usp=email ) Change subject: Add terminal_capability command to send TERMINAL CAPABILITY ...................................................................... Patch Set 2: (1 comment) File pySim/ts_102_221.py: https://gerrit.osmocom.org/c/pysim/+/35953/comment/2472ab53_ea60855a PS2, Line 938: tc_power_grp These are non-optional parameters, so the user will have to supply them all. Did you think of assigning default values? Just an idea. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35953?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iaeb8b4c34524edbb93217bf401e466399626e9b0 Gerrit-Change-Number: 35953 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 12 Feb 2024 18:04:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[M] Change in pysim[master]: Add terminal_capability command to send TERMINAL CAPABILITY

by laforge

Attention is currently required from: dexter. Hello Jenkins Builder, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35953?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Add terminal_capability command to send TERMINAL CAPABILITY ...................................................................... Add terminal_capability command to send TERMINAL CAPABILITY TS 102 221 specifies a TERMINAL CAPABILITY command using which the terminal (Software + hardware talking to the card) can expose their capabilities. This is also used in the eUICC universe to let the eUICC know which features are supported. Change-Id: Iaeb8b4c34524edbb93217bf401e466399626e9b0 --- M docs/shell.rst M pySim/ts_102_221.py 2 files changed, 136 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/53/35953/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35953?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iaeb8b4c34524edbb93217bf401e466399626e9b0 Gerrit-Change-Number: 35953 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: gtp_u_tun: Fix call to gtp_u_kmod create_pdp_context

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35954?usp=email ) Change subject: gtp_u_tun: Fix call to gtp_u_kmod create_pdp_context ...................................................................... gtp_u_tun: Fix call to gtp_u_kmod create_pdp_context Change-Id: Ie3837cdcfabbfe3c21af42940a7c41a8b87cc799 --- M src/gtp_u_tun.erl 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/54/35954/1 diff --git a/src/gtp_u_tun.erl b/src/gtp_u_tun.erl index 626c9a4..d73eaad 100644 --- a/src/gtp_u_tun.erl +++ b/src/gtp_u_tun.erl @@ -65,4 +65,4 @@ PeerIP = conv:bin_to_ip(PeerAddr), % TODO: IPv6 UEIP = conv:bin_to_ip(EUA#epdg_eua.ipv4), % TODO: IPv6. ServRef = get_env_gtp_u_kmod_server_ref(), - gen_server:call(ServRef, {PeerIP, UEIP, LocalTEID, RemoteTEID}). + gen_server:call(ServRef, {create_pdp_context, PeerIP, LocalTEID, RemoteTEID, UEIP}). -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35954?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ie3837cdcfabbfe3c21af42940a7c41a8b87cc799 Gerrit-Change-Number: 35954 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[M] Change in pysim[master]: Add terminal_capability command to send TERMINAL CAPABILITY

by laforge

Attention is currently required from: dexter. Hello Jenkins Builder, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35953?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Add terminal_capability command to send TERMINAL CAPABILITY ...................................................................... Add terminal_capability command to send TERMINAL CAPABILITY TS 102 221 specifies a TERMINAL CAPABILITY command using which the terminal (Software + hardware talking to the card) can expose their capabilities. This is also used in the eUICC universe to let the eUICC know which features are supported. Change-Id: Iaeb8b4c34524edbb93217bf401e466399626e9b0 --- M docs/shell.rst M pySim/ts_102_221.py 2 files changed, 136 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/53/35953/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35953?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iaeb8b4c34524edbb93217bf401e466399626e9b0 Gerrit-Change-Number: 35953 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2024