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

Change in osmo-cbc[master]: Rearrange cbc_message and cbsp message code

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28797 ) Change subject: Rearrange cbc_message and cbsp message code ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ie4082e40f23170cfd6c573fbbb7beb8c6226b6e6 Gerrit-Change-Number: 28797 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 26 Jul 2022 16:39:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Fix typo in comment

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28806 ) Change subject: sbcap: Fix typo in comment ...................................................................... sbcap: Fix typo in comment Change-Id: I6d519cb80a90e2a7e80e4608c713996f94043f21 --- M src/sbcap_link_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/06/28806/1 diff --git a/src/sbcap_link_fsm.c b/src/sbcap_link_fsm.c index c632a4a..01e3631 100644 --- a/src/sbcap_link_fsm.c +++ b/src/sbcap_link_fsm.c @@ -240,7 +240,7 @@ return 0; } -/* message was received from remote SBcAP peer (BSC) */ +/* message was received from remote SBc-AP peer (MME) */ int cbc_sbcap_link_rx_cb(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu) { struct cbc_message *smscb; -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I6d519cb80a90e2a7e80e4608c713996f94043f21 Gerrit-Change-Number: 28806 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: sbcap: Improve handling of rx Error Indication

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28802 to look at the new patch set (#5). Change subject: sbcap: Improve handling of rx Error Indication ...................................................................... sbcap: Improve handling of rx Error Indication Change-Id: I63871a57f219a98f8191e6ee4787fc33edb21528 --- M src/sbcap_link_fsm.c 1 file changed, 43 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/02/28802/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I63871a57f219a98f8191e6ee4787fc33edb21528 Gerrit-Change-Number: 28802 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Rename functions generating CBSP/SBc-AP Write-Replace request

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28798 ) Change subject: Rename functions generating CBSP/SBc-AP Write-Replace request ...................................................................... Patch Set 2: (1 comment) File include/osmocom/cbc/cbsp_msg.h: https://gerrit.osmocom.org/c/osmo-cbc/+/28798/comment/37d5dc1d_e5486472 PS2, Line 5: struct osmo_cbsp_decoded *cbsp_gen_write_replace_req(void *ctx, const struct cbc_message *cbcmsg); > I think it's clearer keeping it. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ib0228c64bbf104accdbbebb6076004a6a1f44c6f Gerrit-Change-Number: 28798 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 26 Jul 2022 14:41:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Move sbcap_as_find_ie() to libsbcap

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28805 ) Change subject: Move sbcap_as_find_ie() to libsbcap ...................................................................... Move sbcap_as_find_ie() to libsbcap This function is generic and can be (will be) used in more places. Change-Id: Ib0c7fa12a8f6faa4271e4132ca5a5c656e717400 --- M include/osmocom/sbcap/sbcap_common.h M src/sbcap/sbcap_common.c M src/sbcap_link_fsm.c 3 files changed, 16 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/05/28805/1 diff --git a/include/osmocom/sbcap/sbcap_common.h b/include/osmocom/sbcap/sbcap_common.h index 303cf6d..91a95eb 100644 --- a/include/osmocom/sbcap/sbcap_common.h +++ b/include/osmocom/sbcap/sbcap_common.h @@ -144,6 +144,8 @@ SBcAP_ProcedureCode_t sbcap_pdu_get_procedure_code(const SBcAP_SBC_AP_PDU_t *pdu); SBcAP_Criticality_t sbcap_pdu_get_criticality(const SBcAP_SBC_AP_PDU_t *pdu); +void *sbcap_as_find_ie(void *void_list, SBcAP_ProtocolIE_ID_t ie_id); + SBcAP_Write_Replace_Warning_Request_IEs_t *sbcap_alloc_Write_Replace_Warning_Request_IE( long id, SBcAP_Criticality_t criticality, SBcAP_Write_Replace_Warning_Request_IEs__value_PR present); diff --git a/src/sbcap/sbcap_common.c b/src/sbcap/sbcap_common.c index 86ca0b2..0596b53 100644 --- a/src/sbcap/sbcap_common.c +++ b/src/sbcap/sbcap_common.c @@ -141,6 +141,20 @@ } } +void *sbcap_as_find_ie(void *void_list, SBcAP_ProtocolIE_ID_t ie_id) +{ + A_SEQUENCE_OF(SBcAP_ProtocolIE_ID_t) *li = (void *)void_list; + int i; + for (i = 0; i < li->count; i++) { + /* "SBcAP_ProtocolIE_ID_t id" is first element in all *_IEs struct */ + SBcAP_ProtocolIE_ID_t *cur_ie_id = li->array[i]; + if (*cur_ie_id == ie_id) { + return cur_ie_id; + } + } + return NULL; +} + void sbcap_set_log_area(int log_area) { _sbcap_DSBCAP = log_area; diff --git a/src/sbcap_link_fsm.c b/src/sbcap_link_fsm.c index 1087f1f..36bb8f9 100644 --- a/src/sbcap_link_fsm.c +++ b/src/sbcap_link_fsm.c @@ -129,20 +129,6 @@ .cleanup = sbcap_link_fsm_cleanup, }; -static void *sbcap_as_find_ie(void *void_list, SBcAP_ProtocolIE_ID_t ie_id) -{ - A_SEQUENCE_OF(SBcAP_ProtocolIE_ID_t) *li = (void *)void_list; - int i; - for (i = 0; i < li->count; i++) { - /* "SBcAP_ProtocolIE_ID_t id" is first element in all *_IEs struct */ - SBcAP_ProtocolIE_ID_t *cur_ie_id = li->array[i]; - if (*cur_ie_id == ie_id) { - return cur_ie_id; - } - } - return NULL; -} - static SBcAP_Message_Identifier_t *get_msg_id_ie(struct cbc_sbcap_link *link, const SBcAP_SBC_AP_PDU_t *pdu) { -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ib0c7fa12a8f6faa4271e4132ca5a5c656e717400 Gerrit-Change-Number: 28805 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Rename functions generating CBSP/SBc-AP Write-Replace request

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28798 ) Change subject: Rename functions generating CBSP/SBc-AP Write-Replace request ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File include/osmocom/cbc/cbsp_msg.h: https://gerrit.osmocom.org/c/osmo-cbc/+/28798/comment/a0c677bf_c6796888 PS2, Line 5: struct osmo_cbsp_decoded *cbsp_gen_write_replace_req(void *ctx, const struct cbc_message *cbcmsg); > I think it's clearer keeping it. […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ib0228c64bbf104accdbbebb6076004a6a1f44c6f Gerrit-Change-Number: 28798 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 26 Jul 2022 13:27:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: support handling of multiple L1CTL client connections

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28678 ) Change subject: trxcon: support handling of multiple L1CTL client connections ...................................................................... trxcon: support handling of multiple L1CTL client connections Change-Id: Id92e5b553487e4cf10ea291b487a3ef0c65d72ae --- M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h M src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h M src/host/trxcon/src/l1ctl_server.c M src/host/trxcon/src/trx_if.c M src/host/trxcon/src/trxcon.c 5 files changed, 45 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h index f0414a1..8a7e48e 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h @@ -37,6 +37,8 @@ struct llist_head clients; /* number of connected clients */ unsigned int num_clients; + /* used for client ID generation */ + unsigned int next_client_id; /* socket on which we listen for connections */ struct osmo_fd ofd; /* server configuration */ @@ -52,6 +54,8 @@ struct osmo_wqueue wq; /* logging context (used as prefix for messages) */ const char *log_prefix; + /* unique client ID */ + unsigned int id; /* some private data */ void *priv; }; diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h index 12ad017..da47f8b 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/trxcon.h @@ -21,6 +21,7 @@ struct trxcon_inst { struct osmo_fsm_inst *fi; + unsigned int id; /* Logging context for sched and l1c */ const char *log_prefix; @@ -36,5 +37,5 @@ bool fbsb_conf_sent; }; -struct trxcon_inst *trxcon_inst_alloc(void *ctx); +struct trxcon_inst *trxcon_inst_alloc(void *ctx, unsigned int id); void trxcon_inst_free(struct trxcon_inst *trxcon); diff --git a/src/host/trxcon/src/l1ctl_server.c b/src/host/trxcon/src/l1ctl_server.c index c5c34e9..cf98c6f 100644 --- a/src/host/trxcon/src/l1ctl_server.c +++ b/src/host/trxcon/src/l1ctl_server.c @@ -51,7 +51,9 @@ /* 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\n"); + LOGP_CLI(client, DL1D, LOGL_NOTICE, + "L1CTL server has lost connection (id=%u)\n", + client->id); if (rc >= 0) rc = -EIO; l1ctl_client_conn_close(client); @@ -157,12 +159,13 @@ return rc; } - LOGP(DL1C, LOGL_NOTICE, "L1CTL server got a new connection\n"); - llist_add_tail(&client->list, &server->clients); + client->id = server->next_client_id++; client->server = server; server->num_clients++; + LOGP(DL1C, LOGL_NOTICE, "L1CTL server got a new connection (id=%u)\n", client->id); + if (client->server->cfg->conn_accept_cb != NULL) client->server->cfg->conn_accept_cb(client); @@ -194,8 +197,10 @@ void l1ctl_client_conn_close(struct l1ctl_client *client) { - if (client->server->cfg->conn_close_cb != NULL) - client->server->cfg->conn_close_cb(client); + struct l1ctl_server *server = client->server; + + if (server->cfg->conn_close_cb != NULL) + server->cfg->conn_close_cb(client); /* Close connection socket */ osmo_fd_unregister(&client->wq.bfd); @@ -208,6 +213,11 @@ client->server->num_clients--; llist_del(&client->list); talloc_free(client); + + /* If this was the last client, reset the client IDs generator to 0. + * This way avoid assigning huge unreadable client IDs like 26545. */ + if (llist_empty(&server->clients)) + server->next_client_id = 0; } struct l1ctl_server *l1ctl_server_alloc(void *ctx, const struct l1ctl_server_cfg *cfg) diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index 46f6e7e..339173f 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -697,11 +697,12 @@ const char *local_host, const char *remote_host, uint16_t base_port) { + const unsigned int offset = trxcon->id * 2; struct trx_instance *trx; int rc; LOGPFSML(trxcon->fi, LOGL_NOTICE, "Init transceiver interface " - "(%s:%u)\n", remote_host, base_port); + "(%s:%u/%u)\n", remote_host, base_port, trxcon->id); /* Try to allocate memory */ trx = talloc_zero(trxcon, struct trx_instance); @@ -723,13 +724,17 @@ INIT_LLIST_HEAD(&trx->trx_ctrl_list); /* Open sockets */ - rc = trx_udp_open(trx, &trx->trx_ofd_ctrl, local_host, - base_port + 101, remote_host, base_port + 1, trx_ctrl_read_cb); + rc = trx_udp_open(trx, &trx->trx_ofd_ctrl, /* TRXC */ + local_host, base_port + 101 + offset, + remote_host, base_port + 1 + offset, + trx_ctrl_read_cb); if (rc < 0) goto udp_error; - rc = trx_udp_open(trx, &trx->trx_ofd_data, local_host, - base_port + 102, remote_host, base_port + 2, trx_data_rx_cb); + rc = trx_udp_open(trx, &trx->trx_ofd_data, /* TRXD */ + local_host, base_port + 102 + offset, + remote_host, base_port + 2 + offset, + trx_data_rx_cb); if (rc < 0) goto udp_error; diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index f0cf703..14354d1 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -65,6 +65,7 @@ int quit; /* L1CTL specific */ + unsigned int max_clients; const char *bind_socket; /* TRX specific */ @@ -77,6 +78,7 @@ struct gsmtap_inst *gsmtap; const char *gsmtap_ip; } app_data = { + .max_clients = 1, /* only one L1CTL client by default */ .bind_socket = "/tmp/osmocom_l2", .trx_remote_ip = "127.0.0.1", .trx_bind_ip = "0.0.0.0", @@ -322,7 +324,7 @@ .event_names = trxcon_fsm_event_names, }; -struct trxcon_inst *trxcon_inst_alloc(void *ctx) +struct trxcon_inst *trxcon_inst_alloc(void *ctx, unsigned int id) { struct trxcon_inst *trxcon; @@ -333,6 +335,9 @@ trxcon, LOGL_DEBUG, NULL); OSMO_ASSERT(trxcon->fi != NULL); + osmo_fsm_inst_update_id_f(trxcon->fi, "%u", id); + trxcon->id = id; + /* Logging context to be used by both l1ctl and l1sched modules */ trxcon->log_prefix = talloc_asprintf(trxcon, "%s: ", osmo_fsm_inst_name(trxcon->fi)); @@ -383,7 +388,7 @@ { struct trxcon_inst *trxcon; - trxcon = trxcon_inst_alloc(l1c); + trxcon = trxcon_inst_alloc(l1c, l1c->id); if (trxcon == NULL) { l1ctl_client_conn_close(l1c); return; @@ -422,6 +427,7 @@ printf(" -f --trx-advance Uplink burst scheduling advance (default 3)\n"); printf(" -s --socket Listening socket for layer23 (default /tmp/osmocom_l2)\n"); printf(" -g --gsmtap-ip The destination IP used for GSMTAP (disabled by default)\n"); + printf(" -C --max-clients Maximum number of L1CTL connections (default 1)\n"); printf(" -D --daemonize Run as daemon\n"); } @@ -441,11 +447,12 @@ {"trx-port", 1, 0, 'p'}, {"trx-advance", 1, 0, 'f'}, {"gsmtap-ip", 1, 0, 'g'}, + {"max-clients", 1, 0, 'C'}, {"daemonize", 0, 0, 'D'}, {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "d:b:i:p:f:s:g:Dh", + c = getopt_long(argc, argv, "d:b:i:p:f:s:g:C:Dh", long_options, &option_index); if (c == -1) break; @@ -477,6 +484,9 @@ case 'g': app_data.gsmtap_ip = optarg; break; + case 'C': + app_data.max_clients = atoi(optarg); + break; case 'D': app_data.daemonize = 1; break; @@ -567,7 +577,7 @@ /* Start the L1CTL server */ server_cfg = (struct l1ctl_server_cfg) { .sock_path = app_data.bind_socket, - .num_clients_max = 1, /* only one connection for now */ + .num_clients_max = app_data.max_clients, .conn_read_cb = &l1ctl_rx_cb, .conn_accept_cb = &l1ctl_conn_accept_cb, .conn_close_cb = &l1ctl_conn_close_cb, -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id92e5b553487e4cf10ea291b487a3ef0c65d72ae Gerrit-Change-Number: 28678 Gerrit-PatchSet: 11 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: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: pass fn_advance param via struct l1sched_cfg

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28745 ) Change subject: trxcon: pass fn_advance param via struct l1sched_cfg ...................................................................... trxcon: pass fn_advance param via struct l1sched_cfg Change-Id: I733761e46ffe03473f03f76f7612a548c9723d99 Related: OS#5599, OS#3761 --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_trx.c M src/host/trxcon/src/trxcon.c 3 files changed, 7 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index f5c45e2..d2cc2eb 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -350,6 +350,8 @@ struct l1sched_cfg { /*! Logging context (used as prefix for messages) */ const char *log_prefix; + /*! TDMA frame-number advance */ + uint32_t fn_advance; }; /*! One scheduler instance */ @@ -384,8 +386,7 @@ /* Scheduler management functions */ void l1sched_logging_init(int log_cat_common, int log_cat_data); -struct l1sched_state *l1sched_alloc(void *ctx, const struct l1sched_cfg *cfg, - uint32_t fn_advance, void *priv); +struct l1sched_state *l1sched_alloc(void *ctx, const struct l1sched_cfg *cfg, void *priv); void l1sched_reset(struct l1sched_state *sched, bool reset_clock); void l1sched_free(struct l1sched_state *sched); diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index d44c1ba..556fe6a 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -160,8 +160,7 @@ l1sched_log_cat_data = log_cat_data; } -struct l1sched_state *l1sched_alloc(void *ctx, const struct l1sched_cfg *cfg, - uint32_t fn_advance, void *priv) +struct l1sched_state *l1sched_alloc(void *ctx, const struct l1sched_cfg *cfg, void *priv) { struct l1sched_state *sched; @@ -172,7 +171,7 @@ *sched = (struct l1sched_state) { /* .clock_timer is set up in l1sched_clck_correct() */ .clock_cb = &sched_frame_clck_cb, - .fn_counter_advance = fn_advance, + .fn_counter_advance = cfg->fn_advance, .priv = priv, }; diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 86d4c49..5740d93 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -348,10 +348,11 @@ /* Init scheduler */ const struct l1sched_cfg sched_cfg = { + .fn_advance = app_data.trx_fn_advance, .log_prefix = trxcon->log_prefix, }; - trxcon->sched = l1sched_alloc(trxcon, &sched_cfg, app_data.trx_fn_advance, trxcon); + trxcon->sched = l1sched_alloc(trxcon, &sched_cfg, trxcon); if (trxcon->sched == NULL) { trxcon_inst_free(trxcon); return NULL; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I733761e46ffe03473f03f76f7612a548c9723d99 Gerrit-Change-Number: 28745 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: use trxcon->fi as the context in L1CTL logging

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28756 ) Change subject: trxcon: use trxcon->fi as the context in L1CTL logging ...................................................................... trxcon: use trxcon->fi as the context in L1CTL logging Change-Id: I7b923cb21638e6afc38deb7766955b43e49b60bb Related: OS#5599 --- M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/l1ctl_server.c M src/host/trxcon/src/trxcon.c 4 files changed, 123 insertions(+), 87 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h index 94c0a9c..f0414a1 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h @@ -50,6 +50,8 @@ struct l1ctl_server *server; /* client's write queue */ struct osmo_wqueue wq; + /* logging context (used as prefix for messages) */ + const char *log_prefix; /* some private data */ void *priv; }; diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 6b8cec2..5e40af5 100644 --- a/src/host/trxcon/src/l1ctl.c +++ b/src/host/trxcon/src/l1ctl.c @@ -80,6 +80,7 @@ int l1ctl_tx_pm_conf(struct l1ctl_client *l1c, uint16_t band_arfcn, int dbm, int last) { + struct trxcon_inst *trxcon = l1c->priv; struct l1ctl_pm_conf *pmc; struct msgb *msg; @@ -87,9 +88,10 @@ if (!msg) return -ENOMEM; - LOGP(DL1C, LOGL_DEBUG, "Send PM Conf (%s %d = %d dBm)\n", - arfcn2band_name(band_arfcn), - band_arfcn & ~ARFCN_FLAG_MASK, dbm); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_DEBUG, + "Send PM Conf (%s %d = %d dBm)\n", + arfcn2band_name(band_arfcn), + band_arfcn & ~ARFCN_FLAG_MASK, dbm); pmc = (struct l1ctl_pm_conf *) msgb_put(msg, sizeof(*pmc)); pmc->band_arfcn = htons(band_arfcn); @@ -106,6 +108,7 @@ int l1ctl_tx_reset_ind(struct l1ctl_client *l1c, uint8_t type) { + struct trxcon_inst *trxcon = l1c->priv; struct msgb *msg; struct l1ctl_reset *res; @@ -113,7 +116,7 @@ if (!msg) return -ENOMEM; - LOGP(DL1C, LOGL_DEBUG, "Send Reset Ind (%u)\n", type); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_DEBUG, "Send Reset Ind (%u)\n", type); res = (struct l1ctl_reset *) msgb_put(msg, sizeof(*res)); res->type = type; @@ -123,6 +126,7 @@ int l1ctl_tx_reset_conf(struct l1ctl_client *l1c, uint8_t type) { + struct trxcon_inst *trxcon = l1c->priv; struct msgb *msg; struct l1ctl_reset *res; @@ -130,7 +134,7 @@ if (!msg) return -ENOMEM; - LOGP(DL1C, LOGL_DEBUG, "Send Reset Conf (%u)\n", type); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_DEBUG, "Send Reset Conf (%u)\n", type); res = (struct l1ctl_reset *) msgb_put(msg, sizeof(*res)); res->type = type; @@ -156,8 +160,6 @@ { struct l1ctl_fbsb_conf *conf = (struct l1ctl_fbsb_conf *) msgb_put(msg, sizeof(*conf)); - LOGP(DL1C, LOGL_DEBUG, "Send FBSB Conf (result=%u, bsic=%u)\n", result, bsic); - conf->result = result; conf->bsic = bsic; @@ -188,6 +190,10 @@ /* Abort FBSB expire timer */ osmo_timer_del(&trxcon->fbsb_timer); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_DEBUG, + "Send FBSB Conf (result=%u, bsic=%u)\n", + result, bsic); + return l1ctl_client_send(l1c, msg); } @@ -305,8 +311,9 @@ if (msg == NULL) return; - LOGP(DL1C, LOGL_NOTICE, "FBSB timer fired for ARFCN %u\n", - trxcon->trx->band_arfcn & ~ARFCN_FLAG_MASK); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, + "FBSB timer fired for ARFCN %u\n", + trxcon->trx->band_arfcn & ~ARFCN_FLAG_MASK); dl = put_dl_info_hdr(msg, NULL); @@ -318,6 +325,8 @@ /* Ask SCH handler not to send L1CTL_FBSB_CONF anymore */ trxcon->fbsb_conf_sent = true; + LOGPFSMSL(trxcon->fi, DL1C, LOGL_DEBUG, "Send FBSB Conf (timeout)\n"); + l1ctl_client_send(l1c, msg); } @@ -332,8 +341,9 @@ fbsb = (struct l1ctl_fbsb_req *) msg->l1h; if (msgb_l1len(msg) < sizeof(*fbsb)) { - LOGP(DL1C, LOGL_ERROR, "MSG too short FBSB Req: %u\n", - msgb_l1len(msg)); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR, + "MSG too short FBSB Req: %u\n", + msgb_l1len(msg)); rc = -EINVAL; goto exit; } @@ -342,9 +352,8 @@ band_arfcn = ntohs(fbsb->band_arfcn); timeout = ntohs(fbsb->timeout); - LOGP(DL1C, LOGL_NOTICE, "Received FBSB request (%s %d)\n", - arfcn2band_name(band_arfcn), - band_arfcn & ~ARFCN_FLAG_MASK); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, "Received FBSB request (%s %d)\n", + arfcn2band_name(band_arfcn), band_arfcn & ~ARFCN_FLAG_MASK); /* Reset scheduler and clock counter */ l1sched_reset(trxcon->sched, true); @@ -373,7 +382,8 @@ /* Start FBSB expire timer */ trxcon->fbsb_timer.data = l1c; trxcon->fbsb_timer.cb = fbsb_timer_cb; - LOGP(DL1C, LOGL_INFO, "Starting FBSB timer %u ms\n", timeout * GSM_TDMA_FN_DURATION_uS / 1000); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_INFO, "Starting FBSB timer %u ms\n", + timeout * GSM_TDMA_FN_DURATION_uS / 1000); osmo_timer_schedule(&trxcon->fbsb_timer, 0, timeout * GSM_TDMA_FN_DURATION_uS); @@ -391,8 +401,9 @@ pmr = (struct l1ctl_pm_req *) msg->l1h; if (msgb_l1len(msg) < sizeof(*pmr)) { - LOGP(DL1C, LOGL_ERROR, "MSG too short PM Req: %u\n", - msgb_l1len(msg)); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR, + "MSG too short PM Req: %u\n", + msgb_l1len(msg)); rc = -EINVAL; goto exit; } @@ -400,11 +411,11 @@ band_arfcn_start = ntohs(pmr->range.band_arfcn_from); band_arfcn_stop = ntohs(pmr->range.band_arfcn_to); - LOGP(DL1C, LOGL_NOTICE, "Received power measurement " - "request (%s: %d -> %d)\n", - arfcn2band_name(band_arfcn_start), - band_arfcn_start & ~ARFCN_FLAG_MASK, - band_arfcn_stop & ~ARFCN_FLAG_MASK); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, + "Received power measurement request (%s: %d -> %d)\n", + arfcn2band_name(band_arfcn_start), + band_arfcn_start & ~ARFCN_FLAG_MASK, + band_arfcn_stop & ~ARFCN_FLAG_MASK); /* Send measurement request to transceiver */ rc = trx_if_cmd_measure(trxcon->trx, band_arfcn_start, band_arfcn_stop); @@ -422,14 +433,15 @@ res = (struct l1ctl_reset *) msg->l1h; if (msgb_l1len(msg) < sizeof(*res)) { - LOGP(DL1C, LOGL_ERROR, "MSG too short Reset Req: %u\n", - msgb_l1len(msg)); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR, + "MSG too short Reset Req: %u\n", + msgb_l1len(msg)); rc = -EINVAL; goto exit; } - LOGP(DL1C, LOGL_NOTICE, "Received reset request (%u)\n", - res->type); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, + "Received reset request (%u)\n", res->type); switch (res->type) { case L1CTL_RES_T_FULL: @@ -442,7 +454,8 @@ l1sched_reset(trxcon->sched, true); break; default: - LOGP(DL1C, LOGL_ERROR, "Unknown L1CTL_RESET_REQ type\n"); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR, + "Unknown L1CTL_RESET_REQ type\n"); goto exit; } @@ -456,10 +469,11 @@ static int l1ctl_rx_echo_req(struct l1ctl_client *l1c, struct msgb *msg) { + struct trxcon_inst *trxcon = l1c->priv; struct l1ctl_hdr *l1h; - LOGP(DL1C, LOGL_NOTICE, "Recv Echo Req\n"); - LOGP(DL1C, LOGL_NOTICE, "Send Echo Conf\n"); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, "Recv Echo Req\n"); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, "Send Echo Conf\n"); /* Nothing to do, just send it back */ l1h = (struct l1ctl_hdr *) msg->l1h; @@ -479,19 +493,20 @@ req = (struct l1ctl_ccch_mode_req *) msg->l1h; if (msgb_l1len(msg) < sizeof(*req)) { - LOGP(DL1C, LOGL_ERROR, "MSG too short Reset Req: %u\n", - msgb_l1len(msg)); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR, + "MSG too short Reset Req: %u\n", + msgb_l1len(msg)); rc = -EINVAL; goto exit; } - LOGP(DL1C, LOGL_NOTICE, "Received CCCH mode request (%u)\n", - req->ccch_mode); /* TODO: add value-string for ccch_mode */ + LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, "Received CCCH mode request (%u)\n", + req->ccch_mode); /* TODO: add value-string for ccch_mode */ /* Make sure that TS0 is allocated and configured */ ts = trxcon->sched->ts[0]; if (ts == NULL || ts->mf_layout == NULL) { - LOGP(DL1C, LOGL_ERROR, "TS0 is not configured"); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR, "TS0 is not configured"); rc = -EINVAL; goto exit; } @@ -533,9 +548,10 @@ .offset = ntohs(req->offset), }; - LOGP(DL1C, LOGL_NOTICE, "Received extended (11-bit) RACH request " - "(offset=%u, synch_seq=%u, ra11=0x%02hx)\n", - rach.offset, rach.synch_seq, rach.ra); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, + "Received extended (11-bit) RACH request " + "(offset=%u, synch_seq=%u, ra11=0x%02hx)\n", + rach.offset, rach.synch_seq, rach.ra); } else { const struct l1ctl_rach_req *req = (void *)ul->payload; @@ -544,15 +560,16 @@ .offset = ntohs(req->offset), }; - LOGP(DL1C, LOGL_NOTICE, "Received regular (8-bit) RACH request " - "(offset=%u, ra=0x%02x)\n", rach.offset, rach.ra); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, + "Received regular (8-bit) RACH request " + "(offset=%u, ra=0x%02x)\n", rach.offset, rach.ra); } /* The controlling L1CTL side always does include the UL info header, * but may leave it empty. We assume RACH is on TS0 in this case. */ if (ul->chan_nr == 0x00) { - LOGP(DL1C, LOGL_NOTICE, "The UL info header is empty, " - "assuming RACH is on TS0\n"); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, + "The UL info header is empty, assuming RACH is on TS0\n"); ul->chan_nr = RSL_CHAN_RACH; } @@ -570,15 +587,17 @@ return rc; } -static int l1ctl_proc_est_req_h0(struct trx_instance *trx, struct l1ctl_h0 *h) +static int l1ctl_proc_est_req_h0(struct trxcon_inst *trxcon, struct l1ctl_h0 *h) { + struct trx_instance *trx = trxcon->trx; uint16_t band_arfcn; int rc = 0; band_arfcn = ntohs(h->band_arfcn); - LOGP(DL1C, LOGL_NOTICE, "L1CTL_DM_EST_REQ indicates a single " - "ARFCN=%u channel\n", band_arfcn & ~ARFCN_FLAG_MASK); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, + "L1CTL_DM_EST_REQ indicates a single ARFCN=%u\n", + band_arfcn & ~ARFCN_FLAG_MASK); /* Do we need to retune? */ if (trx->band_arfcn == band_arfcn) @@ -596,21 +615,24 @@ return 0; } -static int l1ctl_proc_est_req_h1(struct trx_instance *trx, struct l1ctl_h1 *h) +static int l1ctl_proc_est_req_h1(struct trxcon_inst *trxcon, struct l1ctl_h1 *h) { uint16_t ma[64]; int i, rc; - LOGP(DL1C, LOGL_NOTICE, "L1CTL_DM_EST_REQ indicates a Frequency " - "Hopping (hsn=%u, maio=%u, chans=%u) channel\n", - h->hsn, h->maio, h->n); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, + "L1CTL_DM_EST_REQ indicates a Frequency " + "Hopping (hsn=%u, maio=%u, chans=%u) channel\n", + h->hsn, h->maio, h->n); /* No channels?!? */ if (!h->n) { - LOGP(DL1C, LOGL_ERROR, "No channels in mobile allocation?!?\n"); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR, + "No channels in mobile allocation?!?\n"); return -EINVAL; } else if (h->n > ARRAY_SIZE(ma)) { - LOGP(DL1C, LOGL_ERROR, "More than 64 channels in mobile allocation?!?\n"); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR, + "More than 64 channels in mobile allocation?!?\n"); return -EINVAL; } @@ -619,7 +641,7 @@ ma[i] = ntohs(h->ma[i]); /* Forward hopping parameters to TRX */ - rc = trx_if_cmd_setfh(trx, h->hsn, h->maio, ma, h->n); + rc = trx_if_cmd_setfh(trxcon->trx, h->hsn, h->maio, ma, h->n); if (rc) return rc; @@ -646,23 +668,24 @@ chan_nr = ul->chan_nr; tn = chan_nr & 0x07; - LOGP(DL1C, LOGL_NOTICE, "Received L1CTL_DM_EST_REQ " - "(tn=%u, chan_nr=0x%02x, tsc=%u, tch_mode=0x%02x)\n", - tn, chan_nr, est_req->tsc, est_req->tch_mode); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, + "Received L1CTL_DM_EST_REQ " + "(tn=%u, chan_nr=0x%02x, tsc=%u, tch_mode=0x%02x)\n", + tn, chan_nr, est_req->tsc, est_req->tch_mode); /* Determine channel config */ config = l1sched_chan_nr2pchan_config(chan_nr); if (config == GSM_PCHAN_NONE) { - LOGP(DL1C, LOGL_ERROR, "Couldn't determine channel config\n"); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR, "Couldn't determine channel config\n"); rc = -EINVAL; goto exit; } /* Frequency hopping? */ if (est_req->h) - rc = l1ctl_proc_est_req_h1(trxcon->trx, &est_req->h1); + rc = l1ctl_proc_est_req_h1(trxcon, &est_req->h1); else /* Single ARFCN */ - rc = l1ctl_proc_est_req_h0(trxcon->trx, &est_req->h0); + rc = l1ctl_proc_est_req_h0(trxcon, &est_req->h0); if (rc) goto exit; @@ -680,7 +703,7 @@ /* Activate only requested lchans */ rc = l1sched_set_lchans(ts, chan_nr, 1, est_req->tch_mode, est_req->tsc); if (rc) { - LOGP(DL1C, LOGL_ERROR, "Couldn't activate requested lchans\n"); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR, "Couldn't activate requested lchans\n"); rc = -EINVAL; goto exit; } @@ -694,7 +717,8 @@ { struct trxcon_inst *trxcon = l1c->priv; - LOGP(DL1C, LOGL_NOTICE, "Received L1CTL_DM_REL_REQ, resetting scheduler\n"); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, + "Received L1CTL_DM_REL_REQ, resetting scheduler\n"); /* Reset scheduler */ l1sched_reset(trxcon->sched, false); @@ -727,9 +751,9 @@ chan_nr = ul->chan_nr; link_id = ul->link_id & 0x40; - LOGP(DL1D, LOGL_DEBUG, "Recv %s Req (chan_nr=0x%02x, " - "link_id=0x%02x, len=%zu)\n", traffic ? "TRAFFIC" : "DATA", - chan_nr, link_id, payload_len); + LOGPFSMSL(trxcon->fi, DL1D, LOGL_DEBUG, + "Recv %s Req (chan_nr=0x%02x, link_id=0x%02x, len=%zu)\n", + traffic ? "TRAFFIC" : "DATA", chan_nr, link_id, payload_len); /* Push this primitive to transmit queue */ prim = l1sched_prim_push(trxcon->sched, L1SCHED_PRIM_DATA, @@ -750,8 +774,9 @@ ul = (struct l1ctl_info_ul *) msg->l1h; par_req = (struct l1ctl_par_req *) ul->payload; - LOGP(DL1C, LOGL_NOTICE, "Received L1CTL_PARAM_REQ " - "(ta=%d, tx_power=%u)\n", par_req->ta, par_req->tx_power); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, + "Received L1CTL_PARAM_REQ (ta=%d, tx_power=%u)\n", + par_req->ta, par_req->tx_power); /* Instruct TRX to use new TA value */ if (trxcon->trx->ta != par_req->ta) { @@ -775,8 +800,9 @@ req = (struct l1ctl_tch_mode_req *) msg->l1h; - LOGP(DL1C, LOGL_NOTICE, "Received L1CTL_TCH_MODE_REQ " - "(tch_mode=%u, audio_mode=%u)\n", req->tch_mode, req->audio_mode); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, + "Received L1CTL_TCH_MODE_REQ (tch_mode=%u, audio_mode=%u)\n", + req->tch_mode, req->audio_mode); /* Iterate over timeslot list */ for (tn = 0; tn < ARRAY_SIZE(trxcon->sched->ts); tn++) { @@ -821,8 +847,9 @@ ul = (struct l1ctl_info_ul *) msg->l1h; req = (struct l1ctl_crypto_req *) ul->payload; - LOGP(DL1C, LOGL_NOTICE, "L1CTL_CRYPTO_REQ (algo=A5/%u, key_len=%u)\n", - req->algo, req->key_len); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, + "L1CTL_CRYPTO_REQ (algo=A5/%u, key_len=%u)\n", + req->algo, req->key_len); /* Determine TS index */ tn = ul->chan_nr & 0x7; @@ -830,7 +857,7 @@ /* Make sure that required TS is allocated and configured */ ts = trxcon->sched->ts[tn]; if (ts == NULL || ts->mf_layout == NULL) { - LOGP(DL1C, LOGL_ERROR, "TS %u is not configured\n", tn); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR, "TS %u is not configured\n", tn); rc = -EINVAL; goto exit; } @@ -838,7 +865,7 @@ /* Poke scheduler */ rc = l1sched_start_ciphering(ts, req->algo, req->key, req->key_len); if (rc) { - LOGP(DL1C, LOGL_ERROR, "Couldn't configure ciphering\n"); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR, "Couldn't configure ciphering\n"); rc = -EINVAL; goto exit; } @@ -850,6 +877,7 @@ int l1ctl_rx_cb(struct l1ctl_client *l1c, struct msgb *msg) { + const struct trxcon_inst *trxcon = l1c->priv; struct l1ctl_hdr *l1h; l1h = (struct l1ctl_hdr *) msg->l1h; @@ -891,13 +919,14 @@ case L1CTL_TBF_CFG_REQ: case L1CTL_DM_FREQ_REQ: case L1CTL_SIM_REQ: - LOGP(DL1C, LOGL_NOTICE, "Ignoring unsupported message " - "(type=%u)\n", l1h->msg_type); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_NOTICE, + "Ignoring unsupported message (type=%u)\n", + l1h->msg_type); msgb_free(msg); return -ENOTSUP; default: - LOGP(DL1C, LOGL_ERROR, "Unknown MSG type %u: %s\n", l1h->msg_type, - osmo_hexdump(msgb_data(msg), msgb_length(msg))); + LOGPFSMSL(trxcon->fi, DL1C, LOGL_ERROR, "Unknown MSG type %u: %s\n", + l1h->msg_type, osmo_hexdump(msgb_data(msg), msgb_length(msg))); msgb_free(msg); return -EINVAL; } diff --git a/src/host/trxcon/src/l1ctl_server.c b/src/host/trxcon/src/l1ctl_server.c index 8827900..c5c34e9 100644 --- a/src/host/trxcon/src/l1ctl_server.c +++ b/src/host/trxcon/src/l1ctl_server.c @@ -38,6 +38,9 @@ #include <osmocom/bb/trxcon/logging.h> #include <osmocom/bb/trxcon/l1ctl_server.h> +#define LOGP_CLI(cli, cat, level, fmt, args...) \ + LOGP(cat, level, "%s" fmt, (cli)->log_prefix, ## args) + static int l1ctl_client_read_cb(struct osmo_fd *ofd) { struct l1ctl_client *client = (struct l1ctl_client *)ofd->data; @@ -48,7 +51,7 @@ /* Attempt to read from socket */ rc = read(ofd->fd, &len, L1CTL_MSG_LEN_FIELD); if (rc < L1CTL_MSG_LEN_FIELD) { - LOGP(DL1D, LOGL_NOTICE, "L1CTL server has lost connection\n"); + LOGP_CLI(client, DL1D, LOGL_NOTICE, "L1CTL server has lost connection\n"); if (rc >= 0) rc = -EIO; l1ctl_client_conn_close(client); @@ -58,7 +61,7 @@ /* Check message length */ len = ntohs(len); if (len > L1CTL_LENGTH) { - LOGP(DL1D, LOGL_ERROR, "Length is too big: %u\n", len); + LOGP_CLI(client, DL1D, LOGL_ERROR, "Length is too big: %u\n", len); return -EINVAL; } @@ -66,22 +69,22 @@ msg = msgb_alloc_headroom(L1CTL_LENGTH + L1CTL_HEADROOM, L1CTL_HEADROOM, "l1ctl_rx_msg"); if (!msg) { - LOGP(DL1D, LOGL_ERROR, "Failed to allocate msg\n"); + LOGP_CLI(client, DL1D, LOGL_ERROR, "Failed to allocate msg\n"); return -ENOMEM; } msg->l1h = msgb_put(msg, len); rc = read(ofd->fd, msg->l1h, msgb_l1len(msg)); if (rc != len) { - LOGP(DL1D, LOGL_ERROR, "Can not read data: len=%d < rc=%d: " - "%s\n", len, rc, strerror(errno)); + LOGP_CLI(client, DL1D, LOGL_ERROR, + "Can not read data: len=%d < rc=%d: %s\n", + len, rc, strerror(errno)); msgb_free(msg); return rc; } /* Debug print */ - LOGP(DL1D, LOGL_DEBUG, "RX: '%s'\n", - osmo_hexdump(msg->data, msg->len)); + LOGP_CLI(client, DL1D, LOGL_DEBUG, "RX: '%s'\n", osmo_hexdump(msg->data, msg->len)); /* Call L1CTL handler */ client->server->cfg->conn_read_cb(client, msg); @@ -91,6 +94,7 @@ static int l1ctl_client_write_cb(struct osmo_fd *ofd, struct msgb *msg) { + struct l1ctl_client *client = (struct l1ctl_client *)ofd->data; int len; if (ofd->fd <= 0) @@ -98,8 +102,9 @@ len = write(ofd->fd, msg->data, msg->len); if (len != msg->len) { - LOGP(DL1D, LOGL_ERROR, "Failed to write data: " - "written (%d) < msg_len (%d)\n", len, msg->len); + LOGP_CLI(client, DL1D, LOGL_ERROR, + "Failed to write data: written (%d) < msg_len (%d)\n", + len, msg->len); return -1; } @@ -169,18 +174,17 @@ uint8_t *len; /* Debug print */ - LOGP(DL1D, LOGL_DEBUG, "TX: '%s'\n", - osmo_hexdump(msg->data, msg->len)); + LOGP_CLI(client, DL1D, LOGL_DEBUG, "TX: '%s'\n", osmo_hexdump(msg->data, msg->len)); if (msg->l1h != msg->data) - LOGP(DL1D, LOGL_INFO, "Message L1 header != Message Data\n"); + LOGP_CLI(client, DL1D, LOGL_INFO, "Message L1 header != Message Data\n"); /* Prepend 16-bit length before sending */ len = msgb_push(msg, L1CTL_MSG_LEN_FIELD); osmo_store16be(msg->len - L1CTL_MSG_LEN_FIELD, len); if (osmo_wqueue_enqueue(&client->wq, msg) != 0) { - LOGP(DL1D, LOGL_ERROR, "Failed to enqueue msg!\n"); + LOGP_CLI(client, DL1D, LOGL_ERROR, "Failed to enqueue msg!\n"); msgb_free(msg); return -EIO; } diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 5740d93..f0cf703 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -389,6 +389,7 @@ return; } + l1c->log_prefix = talloc_strdup(l1c, trxcon->log_prefix); l1c->priv = trxcon; trxcon->l1c = l1c; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7b923cb21638e6afc38deb7766955b43e49b60bb Gerrit-Change-Number: 28756 Gerrit-PatchSet: 8 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: make [l1sched_]tchh_block_dl_first_fn() static

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28789 ) Change subject: trxcon: make [l1sched_]tchh_block_dl_first_fn() static ...................................................................... trxcon: make [l1sched_]tchh_block_dl_first_fn() static Change-Id: Ic3b990aaa1a3a3e13a80a63e1933799e58e7158f --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_lchan_tchh.c 2 files changed, 3 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 3c28f45..f5c45e2 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -466,8 +466,6 @@ size_t l1sched_bad_frame_ind(uint8_t *l2, struct l1sched_lchan_state *lchan); /* Interleaved TCH/H block TDMA frame mapping */ -uint32_t l1sched_tchh_block_dl_first_fn(enum l1sched_lchan_type chan, - uint32_t last_fn, bool facch); bool l1sched_tchh_block_map_fn(enum l1sched_lchan_type chan, uint32_t fn, bool ul, bool facch, bool start); diff --git a/src/host/trxcon/src/sched_lchan_tchh.c b/src/host/trxcon/src/sched_lchan_tchh.c index b0bc566..2b4b682 100644 --- a/src/host/trxcon/src/sched_lchan_tchh.c +++ b/src/host/trxcon/src/sched_lchan_tchh.c @@ -149,8 +149,8 @@ * @return either frame number of the first burst, * or fn=last_fn if calculation failed */ -uint32_t l1sched_tchh_block_dl_first_fn(enum l1sched_lchan_type chan, - uint32_t last_fn, bool facch) +static uint32_t tchh_block_dl_first_fn(enum l1sched_lchan_type chan, + uint32_t last_fn, bool facch) { uint8_t fn_mf, fn_diff; int i = 0; @@ -331,7 +331,7 @@ /* Didn't try to decode, fake measurements */ if (n_errors < 0) { lchan->meas_avg = (struct l1sched_meas_set) { - .fn = l1sched_tchh_block_dl_first_fn(lchan->type, fn, false), + .fn = tchh_block_dl_first_fn(lchan->type, fn, false), .toa256 = 0, .rssi = -110, }; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic3b990aaa1a3a3e13a80a63e1933799e58e7158f Gerrit-Change-Number: 28789 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022