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

Change in osmo-bsc[master]: paging: Rework timer lifecycle logic

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27936 ) Change subject: paging: Rework timer lifecycle logic ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: credit_timer is scheduled during paging_init(), when the BTS is started. It is also re-scheduled every time paging_update_buffer_space() is called, that is, every time a CCCH Load indication. When credit_timer triggers (paging_give_credit()), paging_handle_pending_requests() is called. However, after that, the timer is not rescheduled, so indeed in here we'd fail to continue giving credit if no CCCH Load Ind is received anymore. Thanks for raising the topic, I'll fix it. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6a0da03c408270044079e81d431f6641527c00cd Gerrit-Change-Number: 27936 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 27 Apr 2022 10:23:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in libosmocore[master]: Use internal <osmocom/core/talloc.h> everywhere

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27937 ) Change subject: Use internal <osmocom/core/talloc.h> everywhere ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27937 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If40e1eefcfa88a2b376becfe057836acdd3a1cc2 Gerrit-Change-Number: 27937 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Apr 2022 10:23:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: paging: Improve calculate_timer_3113()

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27946 ) Change subject: paging: Improve calculate_timer_3113() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id7d6bf93537bcef6658ec72e3ebedcedf64690ed Gerrit-Change-Number: 27946 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Apr 2022 10:22:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-remsim[master]: server: Log keep-alive timeout and TCP disconnects

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/27948 ) Change subject: server: Log keep-alive timeout and TCP disconnects ...................................................................... server: Log keep-alive timeout and TCP disconnects Change-Id: I9912fee7fb892c724a0277d1fa52d056c11c9b73 --- M src/server/rspro_server.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/server/rspro_server.c b/src/server/rspro_server.c index 6c01c0a..d9276a6 100644 --- a/src/server/rspro_server.c +++ b/src/server/rspro_server.c @@ -423,9 +423,11 @@ switch (event) { case CLNTC_E_TCP_DOWN: + LOGPFSML(fi, LOGL_NOTICE, "Connection lost; terminating FSM\n"); osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL); break; case CLNTC_E_KA_TIMEOUT: + LOGPFSML(fi, LOGL_NOTICE, "IPA keep-alive timeout; terminating FSM\n"); osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL); break; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/27948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I9912fee7fb892c724a0277d1fa52d056c11c9b73 Gerrit-Change-Number: 27948 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-remsim[master]: bankd: Differentiate log levels, not everything is DEBUG

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/27950 ) Change subject: bankd: Differentiate log levels, not everything is DEBUG ...................................................................... bankd: Differentiate log levels, not everything is DEBUG Change-Id: If3699642fee2d5d92fb164f7f9c41ccff02007cc --- M src/bankd/bankd_main.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 9e2d8f8..36fd651 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -170,7 +170,7 @@ struct client_slot cs; RsproPDU_t *resp; - LOGPFSM(srvc->fi, "Rx RSPRO %s\n", rspro_msgt_name(pdu)); + LOGPFSML(srvc->fi, LOGL_DEBUG, "Rx RSPRO %s\n", rspro_msgt_name(pdu)); switch (pdu->msg.present) { case RsproPDUchoice_PR_connectBankRes: @@ -206,7 +206,7 @@ resp = rspro_gen_CreateMappingRes(ResultCode_ok); goto send_resp; } else { - LOGPFSM(srvc->fi, "implicitly removing slotmap\n"); + LOGPFSML(srvc->fi, LOGL_NOTICE, "implicitly removing slotmap\n"); bankd_srvc_remove_mapping(map); } } @@ -243,10 +243,10 @@ } else { rspro2client_slot(&cs, &rreq->client); if (!client_slot_equals(&map->client, &cs)) { - LOGPFSM(srvc->fi, "ClientId in removeMappingReq != map\n"); + LOGPFSML(srvc->fi, LOGL_NOTICE, "ClientId in removeMappingReq != map\n"); resp = rspro_gen_RemoveMappingRes(ResultCode_unknownSlotmap); } else { - LOGPFSM(srvc->fi, "removing slotmap\n"); + LOGPFSML(srvc->fi, LOGL_INFO, "removing slotmap\n"); bankd_srvc_remove_mapping(map); resp = rspro_gen_RemoveMappingRes(ResultCode_ok); } -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/27950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: If3699642fee2d5d92fb164f7f9c41ccff02007cc Gerrit-Change-Number: 27950 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-remsim[master]: server: Differentiate log levels, not everything is DEBUG

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/27949 ) Change subject: server: Differentiate log levels, not everything is DEBUG ...................................................................... server: Differentiate log levels, not everything is DEBUG Change-Id: Iee1e2f66e8675146883a6f5e355460608fe6d547 --- M src/server/rspro_server.c 1 file changed, 13 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/server/rspro_server.c b/src/server/rspro_server.c index d9276a6..c003202 100644 --- a/src/server/rspro_server.c +++ b/src/server/rspro_server.c @@ -49,7 +49,7 @@ osmo_log_backtrace(DMAIN, LOGL_ERROR); return; } - LOGPFSM(conn->fi, "Tx RSPRO %s\n", rspro_msgt_name(pdu)); + LOGPFSML(conn->fi, LOGL_DEBUG, "Tx RSPRO %s\n", rspro_msgt_name(pdu)); struct msgb *msg_tx = rspro_enc_msg(pdu); if (!msg_tx) { @@ -136,7 +136,7 @@ /* save the [remote] component identity in 'conn' */ rspro_comp_id_retrieve(&conn->comp_id, &cclreq->identity); if (conn->comp_id.type != ComponentType_remsimClient) { - LOGPFSM(fi, "ConnectClientReq from identity != Client ?!?\n"); + LOGPFSML(fi, LOGL_ERROR, "ConnectClientReq from identity != Client ?!?\n"); osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); } @@ -156,7 +156,7 @@ /* FIXME: the original plan was to dynamically assign a ClientID * from server to client here. Send ConfigReq and transition to * CLNTC_ST_WAIT_CONF_RES */ - LOGPFSM(fi, "ConnectClientReq without ClientId not supported yet!\n"); + LOGPFSML(fi, LOGL_ERROR, "ConnectClientReq without ClientId not supported yet!\n"); osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); #endif } else { @@ -178,7 +178,7 @@ /* save the [remote] component identity in 'conn' */ rspro_comp_id_retrieve(&conn->comp_id, &cbreq->identity); if (conn->comp_id.type != ComponentType_remsimBankd) { - LOGPFSM(fi, "ConnectBankReq from identity != Bank ?!?\n"); + LOGPFSML(fi, LOGL_ERROR, "ConnectBankReq from identity != Bank ?!?\n"); osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); } /* FIXME: check for unique-ness */ @@ -248,13 +248,13 @@ if (!conn) LOGP(DMAIN, LOGL_DEBUG, "%s\n", __func__); else - LOGPFSM(conn->fi, "%s\n", __func__); + LOGPFSML(conn->fi, LOGL_DEBUG, "%s\n", __func__); if (!conn) return; if (!bank_slot_equals(&conn->client.bankd.slot, &map->bank)) { - LOGPFSM(conn->fi, "BankSlot has changed B%u:%u -> B%u:%u\n", + LOGPFSML(conn->fi, LOGL_NOTICE, "BankSlot has changed B%u:%u -> B%u:%u\n", conn->client.bankd.slot.bank_id, conn->client.bankd.slot.slot_nr, map->bank.bank_id, map->bank.slot_nr); conn->client.bankd.slot = map->bank; @@ -272,7 +272,7 @@ rc = osmo_sock_get_ip_and_port(bankd_conn->peer->ofd.fd, ip_str, sizeof(ip_str), port_str, sizeof(port_str), false); if (rc < 0) { - LOGPFSM(bankd_conn->fi, "Error during getpeername\n"); + LOGPFSML(bankd_conn->fi, LOGL_ERROR, "Error during getpeername\n"); return; } bankd_ip = ntohl(inet_addr(ip_str)); @@ -282,7 +282,7 @@ /* determine if IP/port of bankd have changed */ if (conn->client.bankd.port != bankd_port || conn->client.bankd.ip != bankd_ip) { struct in_addr ia = { .s_addr = bankd_ip }; - LOGPFSM(conn->fi, "Bankd IP/Port changed to %s:%u\n", inet_ntoa(ia), bankd_port); + LOGPFSML(conn->fi, LOGL_NOTICE, "Bankd IP/Port changed to %s:%u\n", inet_ntoa(ia), bankd_port); conn->client.bankd.ip = bankd_ip; conn->client.bankd.port = bankd_port; changed = true; @@ -299,7 +299,7 @@ struct slotmaps *slotmaps = conn->srv->slotmaps; struct slot_mapping *map; - LOGPFSM(fi, "%s\n", __func__); + LOGPFSML(fi, LOGL_DEBUG, "%s\n", __func__); /* check for an existing slotmap for this client/slot */ slotmaps_rdlock(slotmaps); @@ -327,7 +327,7 @@ struct slotmaps *slotmaps = conn->srv->slotmaps; struct slot_mapping *map; - LOGPFSM(fi, "Associating pre-existing slotmaps (if any)\n"); + LOGPFSML(fi, LOGL_DEBUG, "Associating pre-existing slotmaps (if any)\n"); /* Link all known mappings to this new bank */ slotmaps_wrlock(slotmaps); llist_for_each_entry(map, &slotmaps->mappings, list) { @@ -371,7 +371,7 @@ map = llist_first_entry(&conn->bank.maps_unack, struct slot_mapping, bank_list); if (!map) { slotmaps_unlock(slotmaps); - LOGPFSM(fi, "CreateMapRes but no unacknowledged map"); + LOGPFSML(fi, LOGL_NOTICE, "CreateMapRes but no unacknowledged map"); break; } _slotmap_state_change(map, SLMAP_S_ACTIVE, &conn->bank.maps_active); @@ -386,7 +386,7 @@ map = llist_first_entry(&conn->bank.maps_deleting, struct slot_mapping, bank_list); if (!map) { slotmaps_unlock(slotmaps); - LOGPFSM(fi, "RemoveMapRes but no unacknowledged map"); + LOGPFSML(fi, LOGL_NOTICE, "RemoveMapRes but no unacknowledged map"); break; } slotmaps_unlock(slotmaps); @@ -561,7 +561,7 @@ static int handle_rx_rspro(struct rspro_client_conn *conn, const RsproPDU_t *pdu) { - LOGPFSM(conn->fi, "Rx RSPRO %s\n", rspro_msgt_name(pdu)); + LOGPFSML(conn->fi, LOGL_DEBUG, "Rx RSPRO %s\n", rspro_msgt_name(pdu)); switch (pdu->msg.present) { case RsproPDUchoice_PR_connectClientReq: -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/27949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Iee1e2f66e8675146883a6f5e355460608fe6d547 Gerrit-Change-Number: 27949 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-remsim[master]: server: Log connection establishment from bankd/client; warn on local...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/27947 ) Change subject: server: Log connection establishment from bankd/client; warn on localhost ...................................................................... server: Log connection establishment from bankd/client; warn on localhost If a bankd connects to the server from 127.0.0.0/8, then clients will not be able to reach it unless they also run on localhost. Warn the user. Change-Id: I5446752961b039dad54aec981c1df4814779f765 --- M src/server/rspro_server.c 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/server/rspro_server.c b/src/server/rspro_server.c index 6514f80..6c01c0a 100644 --- a/src/server/rspro_server.c +++ b/src/server/rspro_server.c @@ -123,6 +123,12 @@ const ConnectClientReq_t *cclreq = NULL; const ConnectBankReq_t *cbreq = NULL; RsproPDU_t *resp = NULL; + char ip_str[INET6_ADDRSTRLEN]; + char port_str[6]; + + /* remote IP and port */ + osmo_sock_get_ip_and_port(conn->peer->ofd.fd, ip_str, sizeof(ip_str), + port_str, sizeof(port_str), false); switch (event) { case CLNTC_E_CLIENT_CONN: @@ -161,6 +167,7 @@ osmo_fsm_inst_update_id_f(conn->keepalive_fi, "C%u:%u", conn->client.slot.client_id, conn->client.slot.slot_nr); + LOGPFSML(fi, LOGL_INFO, "Client connected from %s:%s\n", ip_str, port_str); resp = rspro_gen_ConnectClientRes(&conn->srv->comp_id, ResultCode_ok); client_conn_send(conn, resp); osmo_fsm_inst_state_chg(fi, CLNTC_ST_CONNECTED_CLIENT, 0, 0); @@ -180,6 +187,13 @@ osmo_fsm_inst_update_id_f(fi, "B%u", conn->bank.bank_id); osmo_fsm_inst_update_id_f(conn->keepalive_fi, "B%u", conn->bank.bank_id); + LOGPFSML(fi, LOGL_INFO, "Bankd connected from %s:%s\n", ip_str, port_str); + if (!strncmp(ip_str, "127.", 4)) { + LOGPFSML(fi, LOGL_NOTICE, "Bankd connected from %s (localhost). " + "This only works if your clients also all are on localhost, " + "as they must be able to reach the bankd!\n", ip_str); + } + /* reparent us from srv->connections to srv->banks */ pthread_rwlock_wrlock(&conn->srv->rwlock); llist_del(&conn->list); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/27947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I5446752961b039dad54aec981c1df4814779f765 Gerrit-Change-Number: 27947 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmo-remsim[master]: bankd: Differentiate log levels, not everything is DEBUG

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/27950 ) Change subject: bankd: Differentiate log levels, not everything is DEBUG ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/27950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: If3699642fee2d5d92fb164f7f9c41ccff02007cc Gerrit-Change-Number: 27950 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Apr 2022 10:21:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-remsim[master]: server: Differentiate log levels, not everything is DEBUG

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/27949 ) Change subject: server: Differentiate log levels, not everything is DEBUG ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/27949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: Iee1e2f66e8675146883a6f5e355460608fe6d547 Gerrit-Change-Number: 27949 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Apr 2022 10:21:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-remsim[master]: server: Log keep-alive timeout and TCP disconnects

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/27948 ) Change subject: server: Log keep-alive timeout and TCP disconnects ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/27948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I9912fee7fb892c724a0277d1fa52d056c11c9b73 Gerrit-Change-Number: 27948 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 27 Apr 2022 10:20:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022