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

Change in libosmo-abis[master]: ipa: Add ipa_client_conn_open2 with connect timeout argument

by daniel

Attention is currently required from: daniel. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/30616 to look at the new patch set (#2). Change subject: ipa: Add ipa_client_conn_open2 with connect timeout argument ...................................................................... ipa: Add ipa_client_conn_open2 with connect timeout argument Related: SYS#6237 Change-Id: Iaeb672a4c981e9769443fb0cd6c8e59cb76307bd --- M TODO-RELEASE M include/osmocom/abis/ipa.h M src/input/ipa.c 3 files changed, 38 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/16/30616/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/30616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Iaeb672a4c981e9769443fb0cd6c8e59cb76307bd Gerrit-Change-Number: 30616 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 6 months

1
0
0 0

Change in libosmo-abis[master]: ipaccess: Add connect timeout in e1inp_line

by daniel

Attention is currently required from: daniel. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/30617 to look at the new patch set (#2). Change subject: ipaccess: Add connect timeout in e1inp_line ...................................................................... ipaccess: Add connect timeout in e1inp_line * VTY command e1_line N connect-timeout T to set the connect() timeout * use ipa_client_conn_open2 to connect with timeout Related: SYS#6237 Change-Id: I7379102d19c172bed2aa00377d92bc885f54b640 --- M include/osmocom/abis/e1_input.h M src/e1_input.c M src/e1_input_vty.c M src/input/ipaccess.c 4 files changed, 29 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/17/30617/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/30617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I7379102d19c172bed2aa00377d92bc885f54b640 Gerrit-Change-Number: 30617 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 6 months

1
0
0 0

Change in osmo-bts[master]: shutdown_fsm: Only ramp down power when stopping bts through Ctrl-C

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/30615 ) Change subject: shutdown_fsm: Only ramp down power when stopping bts through Ctrl-C ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I71c46478b8f3b236dba3e959fc75e58c0409517f Gerrit-Change-Number: 30615 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Dec 2022 13:05:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmo-abis[master]: ipa: Add ipa_client_conn_open2 with connect timeout argument

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/30616 ) Change subject: ipa: Add ipa_client_conn_open2 with connect timeout argument ...................................................................... Patch Set 1: (2 comments) File src/input/ipa.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-1953): https://gerrit.osmocom.org/c/libosmo-abis/+/30616/comment/5f6554c2_2ae2b69d PS1, Line 115: static void ipa_connect_failure(struct ipa_client_conn* link) "foo* bar" should be "foo *bar" Robot Comment from checkpatch (run ID jenkins-gerrit-lint-1953): https://gerrit.osmocom.org/c/libosmo-abis/+/30616/comment/3478045b_0ba170c6 PS1, Line 161: static void ipa_connect_timeout_cb(void *data) { open brace '{' following function definitions go on the next line -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/30616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Iaeb672a4c981e9769443fb0cd6c8e59cb76307bd Gerrit-Change-Number: 30616 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 15 Dec 2022 13:04:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmo-abis[master]: ipaccess: Add connect timeout in e1inp_line

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/30617 ) Change subject: ipaccess: Add connect timeout in e1inp_line ...................................................................... Patch Set 1: (1 comment) File src/e1_input_vty.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-1952): https://gerrit.osmocom.org/c/libosmo-abis/+/30617/comment/4af1ee92_f80398da PS1, Line 400: vty_out(vty, " e1_line %u connect-timeout %i%s", line->num, line->connect_timeout, Use %d instead of %i -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/30617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I7379102d19c172bed2aa00377d92bc885f54b640 Gerrit-Change-Number: 30617 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 15 Dec 2022 13:04:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmo-abis[master]: ipa: Add ipa_client_conn_open2 with connect timeout argument

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/30616 ) Change subject: ipa: Add ipa_client_conn_open2 with connect timeout argument ...................................................................... ipa: Add ipa_client_conn_open2 with connect timeout argument Related: SYS#6237 Change-Id: Iaeb672a4c981e9769443fb0cd6c8e59cb76307bd --- M TODO-RELEASE M include/osmocom/abis/ipa.h M src/input/ipa.c 3 files changed, 37 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/16/30616/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index d0852fc..3add34e 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmo-abis API change New function ipa_client_conn_open2 diff --git a/include/osmocom/abis/ipa.h b/include/osmocom/abis/ipa.h index 7e13a6d..95e953e 100644 --- a/include/osmocom/abis/ipa.h +++ b/include/osmocom/abis/ipa.h @@ -105,6 +105,7 @@ void ipa_client_conn_destroy(struct ipa_client_conn *link); int ipa_client_conn_open(struct ipa_client_conn *link); +int ipa_client_conn_open2(struct ipa_client_conn *link, int timeout); void ipa_client_conn_close(struct ipa_client_conn *link); void ipa_client_conn_send(struct ipa_client_conn *link, struct msgb *msg); diff --git a/src/input/ipa.c b/src/input/ipa.c index c121987..fba7c7f 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -12,6 +12,7 @@ #include <arpa/inet.h> #include <osmocom/core/select.h> +#include <osmocom/core/timer.h> #include <osmocom/gsm/tlv.h> #include <osmocom/core/msgb.h> #include <osmocom/core/logging.h> @@ -37,6 +38,8 @@ void ipa_client_conn_close(struct ipa_client_conn *link) { + osmo_timer_del(&link->timer); + /* be safe against multiple calls */ if (link->ofd->fd != -1) { osmo_fd_unregister(link->ofd); @@ -109,6 +112,13 @@ return 0; } +static void ipa_connect_failure(struct ipa_client_conn* link) +{ + ipa_client_conn_close(link); + if (link->updown_cb) + link->updown_cb(link, 0); +} + static int ipa_client_fd_cb(struct osmo_fd *ofd, unsigned int what) { struct ipa_client_conn *link = ofd->data; @@ -119,11 +129,12 @@ case IPA_CLIENT_LINK_STATE_CONNECTING: ret = getsockopt(ofd->fd, SOL_SOCKET, SO_ERROR, &error, &len); if (ret >= 0 && error > 0) { - ipa_client_conn_close(link); - if (link->updown_cb) - link->updown_cb(link, 0); + ipa_connect_failure(link); return 0; } + + osmo_timer_del(&link->timer); + osmo_fd_write_disable(ofd); LOGIPA(link, LOGL_NOTICE, "connection done\n"); link->state = IPA_CLIENT_LINK_STATE_CONNECTED; @@ -143,7 +154,15 @@ default: break; } - return 0; + return 0; +} + +/* Treat the connect timeout exactly like a connect failure */ +static void ipa_connect_timeout_cb(void *data) { + struct ipa_client_conn *link = (struct ipa_client_conn *)data; + + LOGIPA(link, LOGL_NOTICE, "Connect timeout reached\n"); + ipa_connect_failure(link); } struct ipa_client_conn * @@ -197,6 +216,8 @@ ipa_link->port = rem_port; ipa_link->updown_cb = updown_cb; ipa_link->read_cb = read_cb; + osmo_timer_setup(&ipa_link->timer, ipa_connect_timeout_cb, ipa_link); + /* default to generic write callback if not set. */ if (write_cb == NULL) ipa_link->write_cb = ipa_client_write_default_cb; @@ -218,6 +239,11 @@ int ipa_client_conn_open(struct ipa_client_conn *link) { + return ipa_client_conn_open2(link, 30); +} + +int ipa_client_conn_open2(struct ipa_client_conn *link, int timeout) +{ int ret; link->state = IPA_CLIENT_LINK_STATE_CONNECTING; @@ -230,13 +256,18 @@ return ret; link->ofd->fd = ret; osmo_fd_write_enable(link->ofd); + if (osmo_fd_register(link->ofd) < 0) { close(ret); link->ofd->fd = -1; return -EIO; } + if (timeout > 0) + osmo_timer_schedule(&link->timer, timeout, 0); + return 0; + } void ipa_client_conn_send(struct ipa_client_conn *link, struct msgb *msg) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/30616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Iaeb672a4c981e9769443fb0cd6c8e59cb76307bd Gerrit-Change-Number: 30616 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in libosmo-abis[master]: ipaccess: Add connect timeout in e1inp_line

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/30617 ) Change subject: ipaccess: Add connect timeout in e1inp_line ...................................................................... ipaccess: Add connect timeout in e1inp_line * VTY command e1_line N connect-timeout T to set the connect() timeout * use ipa_client_conn_open2 to connect with timeout Related: SYS#6237 Change-Id: I7379102d19c172bed2aa00377d92bc885f54b640 --- M include/osmocom/abis/e1_input.h M src/e1_input.c M src/e1_input_vty.c M src/input/ipaccess.c 4 files changed, 29 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/17/30617/1 diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index 91a71e1..2f2d695 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -227,6 +227,8 @@ /* file name and file descriptor of pcap for this line */ char *pcap_file; int pcap_fd; + + int connect_timeout; /* secs or E1INP_USE_DEFAULT */ }; #define e1inp_line_ipa_oml_ts(line) (&line->ts[0]) #define e1inp_line_ipa_rsl_ts(line, trx_id) (((1 + (trx_id)) < NUM_E1_TS) ? (&line->ts[1 + (trx_id)]) : NULL) diff --git a/src/e1_input.c b/src/e1_input.c index ee529cc..bbcccb3 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -509,6 +509,7 @@ line->keepalive_idle_timeout = E1INP_USE_DEFAULT; line->keepalive_num_probes = E1INP_USE_DEFAULT; line->keepalive_probe_interval = E1INP_USE_DEFAULT; + line->connect_timeout = E1INP_USE_DEFAULT; line->rate_ctr = rate_ctr_group_alloc(line, &e1inp_ctr_g_d, line->num); if (!line->rate_ctr) { diff --git a/src/e1_input_vty.c b/src/e1_input_vty.c index f6781d1..16836ae 100644 --- a/src/e1_input_vty.c +++ b/src/e1_input_vty.c @@ -245,6 +245,26 @@ return CMD_SUCCESS; } +DEFUN_ATTR(cfg_e1line_connect_timeout, cfg_e1_line_connect_timeout_cmd, + "e1_line <0-255> connect-timeout <0-60>", + E1_LINE_HELP "Set connect timeout\n" "Connect timeout in seconds (0 to disable)\n", + CMD_ATTR_IMMEDIATE) +{ + struct e1inp_line *line; + int e1_nr = atoi(argv[0]); + int timeout = atoi(argv[1]); + + line = e1inp_line_find(e1_nr); + if (!line) { + vty_out(vty, "%% Line %d doesn't exist%s", e1_nr, VTY_NEWLINE); + return CMD_WARNING; + } + line->connect_timeout = timeout; + + return CMD_SUCCESS; +} + + DEFUN_ATTR(cfg_e1line_pcap, cfg_e1line_pcap_cmd, "e1_line <0-255> pcap .FILE", E1_LINE_HELP "Setup a pcap recording of E1 traffic for line\n" @@ -376,6 +396,9 @@ if (line->name) vty_out(vty, " e1_line %u name %s%s", line->num, line->name, VTY_NEWLINE); + if (line->connect_timeout != E1INP_USE_DEFAULT) + vty_out(vty, " e1_line %u connect-timeout %i%s", line->num, line->connect_timeout, + VTY_NEWLINE); if (!line->keepalive_num_probes) vty_out(vty, " no e1_line %u keepalive%s", line->num, VTY_NEWLINE); @@ -563,6 +586,7 @@ install_lib_element(L_E1INP_NODE, &cfg_e1_line_port_cmd); install_lib_element(L_E1INP_NODE, &cfg_e1_line_socket_cmd); install_lib_element(L_E1INP_NODE, &cfg_e1_line_name_cmd); + install_lib_element(L_E1INP_NODE, &cfg_e1_line_connect_timeout_cmd); install_lib_element(L_E1INP_NODE, &cfg_e1_line_keepalive_cmd); install_lib_element(L_E1INP_NODE, &cfg_e1_line_keepalive_params_cmd); install_lib_element(L_E1INP_NODE, &cfg_e1_line_no_keepalive_cmd); diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 44c1b78..8a52591 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -1124,7 +1124,7 @@ } link->dscp = g_e1inp_ipaccess_pars.oml.dscp; link->priority = g_e1inp_ipaccess_pars.oml.priority; - if (ipa_client_conn_open(link) < 0) { + if (ipa_client_conn_open2(link, line->connect_timeout) < 0) { LOGP(DLINP, LOGL_ERROR, "cannot open OML BTS link: %s\n", strerror(errno)); ipa_client_conn_close(link); @@ -1191,7 +1191,7 @@ } rsl_link->dscp = g_e1inp_ipaccess_pars.rsl.dscp; rsl_link->priority = g_e1inp_ipaccess_pars.rsl.priority; - if (ipa_client_conn_open(rsl_link) < 0) { + if (ipa_client_conn_open2(rsl_link, line->connect_timeout) < 0) { LOGP(DLINP, LOGL_ERROR, "cannot open RSL BTS link: %s\n", strerror(errno)); ipa_client_conn_close(rsl_link); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/30617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I7379102d19c172bed2aa00377d92bc885f54b640 Gerrit-Change-Number: 30617 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in osmo-bsc[master]: WIP: vty: Add check against sensible default value for ny1

by pespin

Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30602 ) Change subject: WIP: vty: Add check against sensible default value for ny1 ...................................................................... Patch Set 3: (2 comments) File src/osmo-bsc/bts.c: https://gerrit.osmocom.org/c/osmo-bsc/+/30602/comment/e7c228ae_3f297887 PS1, Line 535: unsigned long ny1; > I didn't want to move those lines into the function, because @bts. […] It's totally fine to include logging in bts.c :) File src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/30602/comment/c6ec3efa_fa01d039 PS1, Line 96: unsigned long ny1; > I thought reconfiguration of Ny1 during runtime might be a scenario which is why I added both checks […] ACK, feel free to leave it there then. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If3f96a6bd4f9ae32b6421de43c1c5a5d64482089 Gerrit-Change-Number: 30602 Gerrit-PatchSet: 3 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Dec 2022 13:01:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmocore[master]: logging: rework the macros

by Hoernchen

Hoernchen has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30610 ) Change subject: logging: rework the macros ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I03efa954cb9e991d2c3da4b61b12aac651e0efa2 Gerrit-Change-Number: 30610 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(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, 6 months

1
0
0 0

Change in libosmocore[master]: logging: do not expose internal data structures

by Hoernchen

Hoernchen has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30609 ) Change subject: logging: do not expose internal data structures ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2ba3506233ff485f3935b2f46c94d8351b5d283c Gerrit-Change-Number: 30609 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: abandon

2 years, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2022