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: pespin, fixeria. Hello Jenkins Builder, pespin, fixeria, 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 (#4). 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, 43 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/16/30616/4 -- 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: 4 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(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: pespin, fixeria. daniel 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 4: (1 comment) File include/osmocom/abis/e1_input.h: https://gerrit.osmocom.org/c/libosmo-abis/+/30617/comment/81924433_814bc2d7 PS3, Line 231: int connect_timeout; /* secs or E1INP_USE_DEFAULT */ > no need for it to be an int, it can be an unsigned int (0 means disabled). […] As far as I can see that doesn't work with the VTY configuration because there's no way to access the driver data? ipaccess_line is allocated by the driver line_update() which in turn already tries to open/connect so it's not something you can just call. -- 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: 4 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Dec 2022 13:52:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> 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

Attention is currently required from: fixeria, daniel. daniel 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 3: (1 comment) File include/osmocom/abis/ipa.h: https://gerrit.osmocom.org/c/libosmo-abis/+/30616/comment/98cfb424_d64911e9 PS3, Line 73: struct osmo_timer_list timer; I'm reusing this member which I haven't seen used anywhere, even outside libosmo-abis -- 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: 3 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Dec 2022 13:36:32 +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 pespin

Attention is currently required from: fixeria, daniel. pespin 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 3: (2 comments) File include/osmocom/abis/ipa.h: https://gerrit.osmocom.org/c/libosmo-abis/+/30616/comment/f6f6a7d0_185d2d35 PS3, Line 108: int ipa_client_conn_open2(struct ipa_client_conn *link, int connect_timeout); unsigned int connect_timeout File src/input/ipa.c: https://gerrit.osmocom.org/c/libosmo-abis/+/30616/comment/6eee0b64_ea82f987 PS2, Line 136: osmo_timer_del(&link->timer); > That's also called in ipa_conn_client_close() which is called from ipa_connect_failure() […] Ah I see, better add a comment innside the if block above, soemthing like "/* link->timer is deleted when closing the conn) */" -- 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: 3 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Dec 2022 13:31:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

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

by pespin

Attention is currently required from: fixeria, daniel. pespin 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 4: (1 comment) File include/osmocom/abis/e1_input.h: https://gerrit.osmocom.org/c/libosmo-abis/+/30617/comment/8436f61f_8ca62d2b PS3, Line 231: int connect_timeout; /* secs or E1INP_USE_DEFAULT */ no need for it to be an int, it can be an unsigned int (0 means disabled). BTW, this is quite ipaccess specific, so IMHO this should go into struct ipaccess_line (aka line->driver_data) AFAIU this "connect-timeout" has no meaning in E1 lines. -- 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: 4 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Dec 2022 13:28:26 +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

Attention is currently required from: pespin, fixeria. daniel 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 3: (5 comments) File TODO-RELEASE: https://gerrit.osmocom.org/c/libosmo-abis/+/30616/comment/28f125ce_22d8f945 PS2, Line 10: libosmo-abis API change New function ipa_client_conn_open2 > better s/API change/new API/g, it helps me quickly understanding how to bump the libversion stuff. Ack File include/osmocom/abis/ipa.h: https://gerrit.osmocom.org/c/libosmo-abis/+/30616/comment/7f45fd8d_3f2cb563 PS2, Line 108: int ipa_client_conn_open2(struct ipa_client_conn *link, int timeout); > connect_timeout? Ack File src/input/ipa.c: https://gerrit.osmocom.org/c/libosmo-abis/+/30616/comment/22fbfecf_8efba762 PS2, Line 41: osmo_timer_del(&link->timer); Here https://gerrit.osmocom.org/c/libosmo-abis/+/30616/comment/7d366c24_8c16f5c1 PS2, Line 136: osmo_timer_del(&link->timer); > you should delete the timer before returning above, otherwise you leave it set if the socket returne […] That's also called in ipa_conn_client_close() which is called from ipa_connect_failure() This here is just the happy path deleting the timer on successful connect. Do you want me to add comments somewhere? https://gerrit.osmocom.org/c/libosmo-abis/+/30616/comment/631aae25_7dce5149 PS2, Line 246: int ipa_client_conn_open2(struct ipa_client_conn *link, int timeout) > connect_tmeout Ack -- 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: 3 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Dec 2022 13:27:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> 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

Attention is currently required from: pespin, fixeria. Hello Jenkins Builder, pespin, fixeria, 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 (#3). 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/3 -- 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: 3 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(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 daniel

daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/30615 ) Change subject: shutdown_fsm: Only ramp down power when stopping bts through Ctrl-C ...................................................................... shutdown_fsm: Only ramp down power when stopping bts through Ctrl-C For the other shutdown causes power ramping doesn't make sense. Instead shutdown quickly so we can reconnect faster Change-Id: I71c46478b8f3b236dba3e959fc75e58c0409517f Related: SYS#6237 --- M include/osmo-bts/bts.h M src/common/bts_shutdown_fsm.c M src/common/main.c M src/osmo-bts-trx/l1_if.c 4 files changed, 9 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index b1a594c..bd66443 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -396,7 +396,7 @@ int bts_init(struct gsm_bts *bts); void bts_shutdown(struct gsm_bts *bts, const char *reason); -void bts_shutdown_ext(struct gsm_bts *bts, const char *reason, bool exit_proc); +void bts_shutdown_ext(struct gsm_bts *bts, const char *reason, bool exit_proc, bool do_power_ramp); int bts_link_estab(struct gsm_bts *bts); diff --git a/src/common/bts_shutdown_fsm.c b/src/common/bts_shutdown_fsm.c index 0c6d80c..f7a38d6 100644 --- a/src/common/bts_shutdown_fsm.c +++ b/src/common/bts_shutdown_fsm.c @@ -56,6 +56,7 @@ static void st_none(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gsm_bts *bts = (struct gsm_bts *)fi->priv; + bool do_power_ramping = *(bool *)data; unsigned int count; switch(event) { case BTS_SHUTDOWN_EV_START: @@ -63,10 +64,10 @@ osmo_fsm_inst_dispatch(bts->site_mgr.mo.fi, NM_EV_SHUTDOWN_START, NULL); count = count_trx_operational(bts); - if (count) { + if (count && do_power_ramping) { bts_shutdown_fsm_state_chg(fi, BTS_SHUTDOWN_ST_WAIT_RAMP_DOWN_COMPL); } else { - /* we can skip ramp down since no TRX is running anyway. + /* we can skip ramp down if it was requested or no TRX is running anyway. * Let's jump into WAIT_TRX_CLOSED to make sure we * tell lower layer to close all TRX in case there's some * open() WIP */ @@ -250,7 +251,7 @@ return fi->state != BTS_SHUTDOWN_ST_NONE; } -void bts_shutdown_ext(struct gsm_bts *bts, const char *reason, bool exit_proc) +void bts_shutdown_ext(struct gsm_bts *bts, const char *reason, bool exit_proc, bool do_power_ramp) { struct osmo_fsm_inst *fi = bts->shutdown_fi; if (bts_shutdown_in_progress(bts)) { @@ -262,12 +263,12 @@ bts->shutdown_fi_exit_proc = exit_proc; LOGPFSML(fi, LOGL_NOTICE, "Shutting down BTS, exit %u, reason: %s\n", exit_proc, reason); - osmo_fsm_inst_dispatch(fi, BTS_SHUTDOWN_EV_START, NULL); + osmo_fsm_inst_dispatch(fi, BTS_SHUTDOWN_EV_START, &do_power_ramp); } void bts_shutdown(struct gsm_bts *bts, const char *reason) { - bts_shutdown_ext(bts, reason, true); + bts_shutdown_ext(bts, reason, true, false); } void bts_model_trx_close_cb(struct gsm_bts_trx *trx, int rc) diff --git a/src/common/main.c b/src/common/main.c index 954cc34..ea6c61e 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -233,7 +233,7 @@ oml_tx_failure_event_rep(&g_bts->mo, NM_SEVER_CRITICAL, OSMO_EVT_CRIT_PROC_STOP, "BTS: SIGINT received -> shutdown"); - bts_shutdown(g_bts, "SIGINT"); + bts_shutdown_ext(g_bts, "SIGINT", true, false); } quit++; break; diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 8c364c3..dc90bf9 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -195,7 +195,7 @@ { /* Go into shutdown state deactivating transceivers until Abis link * becomes up again */ - bts_shutdown_ext(bts, "Abis close", false); + bts_shutdown_ext(bts, "Abis close", false, false); } int bts_model_adjst_ms_pwr(struct gsm_lchan *lchan) -- 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: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

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

by pespin

Attention is currently required from: fixeria, daniel. pespin 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 2: Code-Review-1 (4 comments) File TODO-RELEASE: https://gerrit.osmocom.org/c/libosmo-abis/+/30616/comment/eaee12b9_c649f521 PS2, Line 10: libosmo-abis API change New function ipa_client_conn_open2 better s/API change/new API/g, it helps me quickly understanding how to bump the libversion stuff. File include/osmocom/abis/ipa.h: https://gerrit.osmocom.org/c/libosmo-abis/+/30616/comment/0fa3006e_ed0ccbbd PS2, Line 108: int ipa_client_conn_open2(struct ipa_client_conn *link, int timeout); connect_timeout? File src/input/ipa.c: https://gerrit.osmocom.org/c/libosmo-abis/+/30616/comment/f177ff73_dd4c9cc1 PS2, Line 136: osmo_timer_del(&link->timer); you should delete the timer before returning above, otherwise you leave it set if the socket returned an error before timeout. https://gerrit.osmocom.org/c/libosmo-abis/+/30616/comment/9207107e_524632ea PS2, Line 246: int ipa_client_conn_open2(struct ipa_client_conn *link, int timeout) connect_tmeout -- 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-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Dec 2022 13:19:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-bts[master]: l1sap: Accept RFC5993 and TS 101.318 HR GSM payload

by dexter

dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/30523 ) Change subject: l1sap: Accept RFC5993 and TS 101.318 HR GSM payload ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30523 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17f0b546042fa333780fd2f5c315898ab0df574c Gerrit-Change-Number: 30523 Gerrit-PatchSet: 6 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Dec 2022 13:10:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2022