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

Change in osmo-ttcn3-hacks[master]: BTS_Tests: f_est_rll_mo(): add waiting timeout (2s)

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28832 ) Change subject: BTS_Tests: f_est_rll_mo(): add waiting timeout (2s) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28832 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: I71ab69d85f453964749270d970c55e6f577a73a1 Gerrit-Change-Number: 28832 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 22:42:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: improve L1CTL connection related logging

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28864 ) Change subject: trxcon: improve L1CTL connection related logging ...................................................................... trxcon: improve L1CTL connection related logging * l1ctl_client_conn_close(): log "Closing L1CTL connection"; * l1ctl_client_read_cb(): more precise logging, use strerror(). Change-Id: Ie932513f93fd7f1a5f5e70f4d78235551f7599c8 Related: OS#5599 --- M src/host/trxcon/src/l1ctl_server.c 1 file changed, 14 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/64/28864/1 diff --git a/src/host/trxcon/src/l1ctl_server.c b/src/host/trxcon/src/l1ctl_server.c index cf98c6f..f9d34fa 100644 --- a/src/host/trxcon/src/l1ctl_server.c +++ b/src/host/trxcon/src/l1ctl_server.c @@ -50,12 +50,19 @@ /* Attempt to read from socket */ rc = read(ofd->fd, &len, L1CTL_MSG_LEN_FIELD); - if (rc < L1CTL_MSG_LEN_FIELD) { - LOGP_CLI(client, DL1D, LOGL_NOTICE, - "L1CTL server has lost connection (id=%u)\n", - client->id); - if (rc >= 0) + if (rc != L1CTL_MSG_LEN_FIELD) { + if (rc == 0) { + LOGP_CLI(client, DL1D, LOGL_NOTICE, + "L1CTL connection closed by remote peer\n"); + } else if (rc < 0) { + LOGP_CLI(client, DL1D, LOGL_NOTICE, + "L1CTL connection error (rc=%d): %s\n", + rc, strerror(errno)); + } else { + LOGP_CLI(client, DL1D, LOGL_NOTICE, + "L1CTL connection error: short read\n"); rc = -EIO; + } l1ctl_client_conn_close(client); return rc; } @@ -199,6 +206,8 @@ { struct l1ctl_server *server = client->server; + LOGP_CLI(client, DL1C, LOGL_NOTICE, "Closing L1CTL connection\n"); + if (server->cfg->conn_close_cb != NULL) server->cfg->conn_close_cb(client); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie932513f93fd7f1a5f5e70f4d78235551f7599c8 Gerrit-Change-Number: 28864 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rework TRXC/TRXD cleanup logic, add trx_fsm_cleanup_cb()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28861 ) Change subject: trxcon: rework TRXC/TRXD cleanup logic, add trx_fsm_cleanup_cb() ...................................................................... trxcon: rework TRXC/TRXD cleanup logic, add trx_fsm_cleanup_cb() Change-Id: Ic599b51067cb5a331fca521a5b46ab0a2804e499 Related: OS#5599 --- M src/host/trxcon/src/trx_if.c 1 file changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/61/28861/1 diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index af879c1..5e4e696 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -46,6 +46,9 @@ #define S(x) (1 << (x)) +static void trx_fsm_cleanup_cb(struct osmo_fsm_inst *fi, + enum osmo_fsm_term_cause cause); + static struct value_string trx_evt_names[] = { { 0, NULL } /* no events? */ }; @@ -82,6 +85,7 @@ .num_states = ARRAY_SIZE(trx_fsm_states), .log_subsys = DTRXC, .event_names = trx_evt_names, + .cleanup = &trx_fsm_cleanup_cb, }; static int trx_udp_open(void *priv, struct osmo_fd *ofd, const char *host_local, @@ -738,7 +742,11 @@ if (rc < 0) goto udp_error; + /* Reparent trx_instance from trxcon to trx->fi */ + talloc_reparent(trxcon, trx->fi, trx); + trx->trxcon = trxcon; + trx->fi->priv = trx; return trx; @@ -768,13 +776,22 @@ void trx_if_close(struct trx_instance *trx) { + if (trx == NULL || trx->fi == NULL) + return; + osmo_fsm_inst_term(trx->fi, OSMO_FSM_TERM_REQUEST, NULL); +} + +static void trx_fsm_cleanup_cb(struct osmo_fsm_inst *fi, + enum osmo_fsm_term_cause cause) +{ static const char cmd_poweroff[] = "CMD POWEROFF"; + struct trx_instance *trx = fi->priv; /* May be unallocated due to init error */ if (!trx) return; - LOGPFSML(trx->fi, LOGL_NOTICE, "Shutdown transceiver interface\n"); + LOGPFSML(fi, LOGL_NOTICE, "Shutdown transceiver interface\n"); /* Abort TRXC response timer (if pending) */ osmo_timer_del(&trx->trx_ctrl_timer); @@ -791,7 +808,7 @@ trx_udp_close(&trx->trx_ofd_data); /* Free memory */ - osmo_fsm_inst_free(trx->fi); + trx->fi->priv = NULL; talloc_free(trx); } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic599b51067cb5a331fca521a5b46ab0a2804e499 Gerrit-Change-Number: 28861 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rework trxcon_inst cleanup logic, add trxcon_fsm_pre_term_cb()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28862 ) Change subject: trxcon: rework trxcon_inst cleanup logic, add trxcon_fsm_pre_term_cb() ...................................................................... trxcon: rework trxcon_inst cleanup logic, add trxcon_fsm_pre_term_cb() Change-Id: I5eb8ef6f62b1dc949dc60eaa558f123b3b93819c Related: OS#5599 --- M src/host/trxcon/src/trxcon.c M src/host/trxcon/src/trxcon_fsm.c 2 files changed, 33 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/62/28862/1 diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 35687d7..539fb47 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -267,6 +267,9 @@ osmo_fsm_inst_update_id_f(trxcon->fi, "%u", id); trxcon->id = id; + /* Reparent trxcon_inst from ctx to trxcon->fi */ + talloc_reparent(ctx, trxcon->fi, trxcon); + /* Logging context to be used by both l1ctl and l1sched modules */ trxcon->log_prefix = talloc_asprintf(trxcon, "%s: ", osmo_fsm_inst_name(trxcon->fi)); @@ -297,18 +300,9 @@ void trxcon_inst_free(struct trxcon_inst *trxcon) { - /* Shutdown the scheduler */ - if (trxcon->sched != NULL) - l1sched_free(trxcon->sched); - /* Close active connections */ - if (trxcon->l2if != NULL) - l1ctl_client_conn_close(trxcon->l2if); - if (trxcon->phyif != NULL) - trx_if_close(trxcon->phyif); - - if (trxcon->fi != NULL) - osmo_fsm_inst_free(trxcon->fi); - talloc_free(trxcon); + if (trxcon == NULL || trxcon->fi == NULL) + return; + osmo_fsm_inst_term(trxcon->fi, OSMO_FSM_TERM_REQUEST, NULL); } static void l1ctl_conn_accept_cb(struct l1ctl_client *l1c) @@ -334,10 +328,6 @@ return; osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_L2IF_FAILURE, NULL); - - /* l2if is free()ed by the caller */ - trxcon->l2if = NULL; - trxcon_inst_free(trxcon); } static void print_usage(const char *app) diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 3032764..911f14e 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -46,10 +46,12 @@ switch (event) { case TRXCON_EV_PHYIF_FAILURE: + trxcon->phyif = NULL; + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); + break; case TRXCON_EV_L2IF_FAILURE: - LOGPFSML(fi, LOGL_NOTICE, "Event %s is not handled\n", - osmo_fsm_event_name(&trxcon_fsm_def, event)); - /* TODO: osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); */ + trxcon->l2if = NULL; + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); break; case TRXCON_EV_RESET_FULL_REQ: if (fi->state != TRXCON_ST_RESET) @@ -388,6 +390,27 @@ } } +static void trxcon_fsm_pre_term_cb(struct osmo_fsm_inst *fi, + enum osmo_fsm_term_cause cause) +{ + struct trxcon_inst *trxcon = fi->priv; + + if (trxcon == NULL) + return; + + /* Shutdown the scheduler */ + if (trxcon->sched != NULL) + l1sched_free(trxcon->sched); + /* Close active connections */ + if (trxcon->l2if != NULL) + l1ctl_client_conn_close(trxcon->l2if); + if (trxcon->phyif != NULL) + trx_if_close(trxcon->phyif); + + talloc_free(trxcon); + fi->priv = NULL; +} + static const struct osmo_fsm_state trxcon_fsm_states[] = { [TRXCON_ST_RESET] = { .name = "RESET", @@ -474,6 +497,7 @@ | S(TRXCON_EV_PHY_CONFIG_REQ), .allstate_action = &trxcon_allstate_action, .timer_cb = &trxcon_timer_cb, + .pre_term = &trxcon_fsm_pre_term_cb, }; static __attribute__((constructor)) void on_dso_load(void) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5eb8ef6f62b1dc949dc60eaa558f123b3b93819c Gerrit-Change-Number: 28862 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: handle l1sched_config_req via TRXCON_EV_PHY_CONFIG_REQ

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28863 ) Change subject: trxcon: handle l1sched_config_req via TRXCON_EV_PHY_CONFIG_REQ ...................................................................... trxcon: handle l1sched_config_req via TRXCON_EV_PHY_CONFIG_REQ Calling l1sched_free() from trxcon_fsm_pre_term_cb() may result in l1sched_handle_config_req() being called when trxcon->phyif is NULL. Handling l1sched_config_req via TRXCON_EV_PHY_CONFIG_REQ guards us against NULL pointer dereference during teardown of a trxcon_fsm instance, if it's caused by TRXCON_EV_PHYIF_FAILURE. Change-Id: I44bbc695e8a406a7acb9c163bf223f4ea966ea12 Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/trxcon.c M src/host/trxcon/src/trxcon_fsm.c 4 files changed, 43 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/63/28863/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 3d87bb9..6a43bcb 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -62,8 +62,20 @@ /* param of TRXCON_EV_PHY_CONFIG_REQ */ struct trxcon_param_phy_config_req { - uint8_t timing_advance; - uint8_t tx_power; + enum { + TRXCON_PHY_CFGT_PCHAN_COMB, + TRXCON_PHY_CFGT_TX_PARAMS, + } type; + union { + struct { + uint8_t tn; + uint8_t pchan; + } pchan_comb; + struct { + uint8_t timing_advance; + uint8_t tx_power; + } tx_params; + }; }; /* param of TRXCON_EV_TX_{TRAFFIC,DATA}_REQ */ diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index af1ff77..b907917 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -667,8 +667,11 @@ par_req->ta, par_req->tx_power); struct trxcon_param_phy_config_req req = { - .timing_advance = par_req->ta, - .tx_power = par_req->tx_power, + .type = TRXCON_PHY_CFGT_TX_PARAMS, + .tx_params = { + .timing_advance = par_req->ta, + .tx_power = par_req->tx_power, + } }; osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_PHY_CONFIG_REQ, &req); diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 539fb47..b3f32ab 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -112,9 +112,17 @@ switch (cr->type) { case L1SCHED_CFG_PCHAN_COMB: - return trx_if_cmd_setslot(trxcon->phyif, - cr->pchan_comb.tn, - cr->pchan_comb.pchan); + { + struct trxcon_param_phy_config_req req = { + .type = TRXCON_PHY_CFGT_PCHAN_COMB, + .pchan_comb = { + .tn = cr->pchan_comb.tn, + .pchan = cr->pchan_comb.pchan, + }, + }; + + return osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_PHY_CONFIG_REQ, &req); + } default: LOGPFSML(trxcon->fi, LOGL_ERROR, "Unhandled config request (type 0x%02x)\n", cr->type); diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 911f14e..fb9bd8f 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -67,10 +67,19 @@ { const struct trxcon_param_phy_config_req *req = data; - if (trxcon->l1p.ta != req->timing_advance) - trx_if_cmd_setta(trxcon->phyif, req->timing_advance); - trxcon->l1p.tx_power = req->tx_power; - trxcon->l1p.ta = req->timing_advance; + switch (req->type) { + case TRXCON_PHY_CFGT_PCHAN_COMB: + trx_if_cmd_setslot(trxcon->phyif, + req->pchan_comb.tn, + req->pchan_comb.pchan); + break; + case TRXCON_PHY_CFGT_TX_PARAMS: + if (trxcon->l1p.ta != req->tx_params.timing_advance) + trx_if_cmd_setta(trxcon->phyif, req->tx_params.timing_advance); + trxcon->l1p.tx_power = req->tx_params.tx_power; + trxcon->l1p.ta = req->tx_params.timing_advance; + break; + } break; } default: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I44bbc695e8a406a7acb9c163bf223f4ea966ea12 Gerrit-Change-Number: 28863 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: cosmetic: rename TRXCON_EV_{L1IF->PHYIF}_FAILURE

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28860 ) Change subject: trxcon: cosmetic: rename TRXCON_EV_{L1IF->PHYIF}_FAILURE ...................................................................... trxcon: cosmetic: rename TRXCON_EV_{L1IF->PHYIF}_FAILURE Change-Id: I9159492a04bc071b7b04d9b88d4e6fd13cc3af31 --- M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/trx_if.c M src/host/trxcon/src/trxcon_fsm.c 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/60/28860/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index dadd42d..3d87bb9 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -13,7 +13,7 @@ }; enum trxcon_fsm_events { - TRXCON_EV_L1IF_FAILURE, + TRXCON_EV_PHYIF_FAILURE, TRXCON_EV_L2IF_FAILURE, TRXCON_EV_RESET_FULL_REQ, TRXCON_EV_RESET_SCHED_REQ, diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index d51c9d1..af879c1 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -712,7 +712,7 @@ } /* Allocate a new dedicated state machine */ - trx->fi = osmo_fsm_inst_alloc_child(&trx_fsm, trxcon->fi, TRXCON_EV_L1IF_FAILURE); + trx->fi = osmo_fsm_inst_alloc_child(&trx_fsm, trxcon->fi, TRXCON_EV_PHYIF_FAILURE); if (trx->fi == NULL) { LOGPFSML(trxcon->fi, LOGL_ERROR, "Failed to allocate an instance " "of FSM '%s'\n", trx_fsm.name); diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index ad86b95..3032764 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -45,7 +45,7 @@ struct trxcon_inst *trxcon = fi->priv; switch (event) { - case TRXCON_EV_L1IF_FAILURE: + case TRXCON_EV_PHYIF_FAILURE: case TRXCON_EV_L2IF_FAILURE: LOGPFSML(fi, LOGL_NOTICE, "Event %s is not handled\n", osmo_fsm_event_name(&trxcon_fsm_def, event)); @@ -439,7 +439,7 @@ }; static const struct value_string trxcon_fsm_event_names[] = { - OSMO_VALUE_STRING(TRXCON_EV_L1IF_FAILURE), + OSMO_VALUE_STRING(TRXCON_EV_PHYIF_FAILURE), OSMO_VALUE_STRING(TRXCON_EV_L2IF_FAILURE), OSMO_VALUE_STRING(TRXCON_EV_RESET_FULL_REQ), OSMO_VALUE_STRING(TRXCON_EV_RESET_SCHED_REQ), @@ -467,7 +467,7 @@ .num_states = ARRAY_SIZE(trxcon_fsm_states), .log_subsys = DAPP, .event_names = trxcon_fsm_event_names, - .allstate_event_mask = S(TRXCON_EV_L1IF_FAILURE) + .allstate_event_mask = S(TRXCON_EV_PHYIF_FAILURE) | S(TRXCON_EV_L2IF_FAILURE) | S(TRXCON_EV_RESET_FULL_REQ) | S(TRXCON_EV_RESET_SCHED_REQ) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9159492a04bc071b7b04d9b88d4e6fd13cc3af31 Gerrit-Change-Number: 28860 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: cosmetic: rename TRXCON_EV_{SET->PHY}_CONFIG_REQ

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28859 ) Change subject: trxcon: cosmetic: rename TRXCON_EV_{SET->PHY}_CONFIG_REQ ...................................................................... trxcon: cosmetic: rename TRXCON_EV_{SET->PHY}_CONFIG_REQ Change-Id: Ib70ff0352b6fcb045d0f49535dfb0d273856f3c3 --- M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/trxcon_fsm.c 3 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/59/28859/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 69ac01e..dadd42d 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -23,7 +23,7 @@ TRXCON_EV_FBSB_SEARCH_RES, TRXCON_EV_SET_CCCH_MODE_REQ, TRXCON_EV_SET_TCH_MODE_REQ, - TRXCON_EV_SET_CONFIG_REQ, + TRXCON_EV_PHY_CONFIG_REQ, TRXCON_EV_TX_ACCESS_BURST_REQ, TRXCON_EV_DEDICATED_ESTABLISH_REQ, TRXCON_EV_DEDICATED_RELEASE_REQ, @@ -60,8 +60,8 @@ bool applied; }; -/* param of TRXCON_EV_SET_CONFIG_REQ */ -struct trxcon_param_set_config_req { +/* param of TRXCON_EV_PHY_CONFIG_REQ */ +struct trxcon_param_phy_config_req { uint8_t timing_advance; uint8_t tx_power; }; diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 5f95e1c..af1ff77 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -666,12 +666,12 @@ "Received L1CTL_PARAM_REQ (ta=%d, tx_power=%u)\n", par_req->ta, par_req->tx_power); - struct trxcon_param_set_config_req req = { + struct trxcon_param_phy_config_req req = { .timing_advance = par_req->ta, .tx_power = par_req->tx_power, }; - osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_SET_CONFIG_REQ, &req); + osmo_fsm_inst_dispatch(trxcon->fi, TRXCON_EV_PHY_CONFIG_REQ, &req); msgb_free(msg); return 0; diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 5329a92..ad86b95 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -61,9 +61,9 @@ case TRXCON_EV_RESET_SCHED_REQ: l1sched_reset(trxcon->sched, false); break; - case TRXCON_EV_SET_CONFIG_REQ: + case TRXCON_EV_PHY_CONFIG_REQ: { - const struct trxcon_param_set_config_req *req = data; + const struct trxcon_param_phy_config_req *req = data; if (trxcon->l1p.ta != req->timing_advance) trx_if_cmd_setta(trxcon->phyif, req->timing_advance); @@ -449,7 +449,7 @@ OSMO_VALUE_STRING(TRXCON_EV_FBSB_SEARCH_RES), OSMO_VALUE_STRING(TRXCON_EV_SET_CCCH_MODE_REQ), OSMO_VALUE_STRING(TRXCON_EV_SET_TCH_MODE_REQ), - OSMO_VALUE_STRING(TRXCON_EV_SET_CONFIG_REQ), + OSMO_VALUE_STRING(TRXCON_EV_PHY_CONFIG_REQ), OSMO_VALUE_STRING(TRXCON_EV_TX_ACCESS_BURST_REQ), OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_ESTABLISH_REQ), OSMO_VALUE_STRING(TRXCON_EV_DEDICATED_RELEASE_REQ), @@ -471,7 +471,7 @@ | S(TRXCON_EV_L2IF_FAILURE) | S(TRXCON_EV_RESET_FULL_REQ) | S(TRXCON_EV_RESET_SCHED_REQ) - | S(TRXCON_EV_SET_CONFIG_REQ), + | S(TRXCON_EV_PHY_CONFIG_REQ), .allstate_action = &trxcon_allstate_action, .timer_cb = &trxcon_timer_cb, }; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib70ff0352b6fcb045d0f49535dfb0d273856f3c3 Gerrit-Change-Number: 28859 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-msc[master]: SMPP: clarify (re)start logic

by fixeria

Attention is currently required from: msuraev. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28843 ) Change subject: SMPP: clarify (re)start logic ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I353f5b82c9f5308d93e926538d4ef7e24d0b0339 Gerrit-Change-Number: 28843 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 19:05:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-msc[master]: ESME: log more connection details

by fixeria

Attention is currently required from: pespin, msuraev. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28841 ) Change subject: ESME: log more connection details ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/28841/comment/e395c631_68f234c2 PS1, Line 7: ESME: log more connection details > this title is a bit misleading with regards to the content, since you are dropping some fields in st […] Agreed with Pau. I would say "use osmo_sock_get_name() to print conn details" or so. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I34bd4c145b0f6287a323e2350808feb59f1d3187 Gerrit-Change-Number: 28841 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 19:03:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-msc[master]: cosmetic: use proper name for SMPP handlers

by fixeria

Attention is currently required from: pespin, msuraev. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28840 ) Change subject: cosmetic: use proper name for SMPP handlers ...................................................................... Patch Set 1: (1 comment) File src/libmsc/smpp_openbsc.c: https://gerrit.osmocom.org/c/osmo-msc/+/28840/comment/7f690f81_304e0743 PS1, Line 831: int smpp_openbsc_alloc_init(void *ctx) > you could change the function name while at it too ;) Ack, and remove 'openbsc' from the filename. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0d714e927e287a0ea9362008ed050a492510e22b Gerrit-Change-Number: 28840 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Jul 2022 18:59:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022