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

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

by fixeria

Attention is currently required from: laforge, pespin, dexter. Hello Jenkins Builder, laforge, pespin, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28678 to look at the new patch set (#5). 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, 37 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/78/28678/5 -- 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: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

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

by fixeria

Attention is currently required from: laforge, pespin, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28678 ) Change subject: trxcon: support handling of multiple L1CTL client connections ...................................................................... Patch Set 4: (1 comment) This change is ready for review. Patchset: PS2: > There is a problem with this approach I didn't realize until now. Imagine the following scenario: […] This should not be a problem if we will be using a separate seed for client ID generation. -- 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: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 23 Jul 2022 19:33:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rename DTRX logging sub-system to DTRXC

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28758 ) Change subject: trxcon: rename DTRX logging sub-system to DTRXC ...................................................................... trxcon: rename DTRX logging sub-system to DTRXC This sub-system is used for TRXC related logging, so reflect this. Change-Id: I33c8f81e37de7ee61809610e51405a96c93536ff --- M src/host/trxcon/include/osmocom/bb/trxcon/logging.h M src/host/trxcon/src/logging.c M src/host/trxcon/src/trx_if.c 3 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/58/28758/1 diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/logging.h b/src/host/trxcon/include/osmocom/bb/trxcon/logging.h index 152c346..4259297 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/logging.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/logging.h @@ -8,7 +8,7 @@ DAPP, DL1C, DL1D, - DTRX, + DTRXC, DTRXD, DSCH, DSCHD, diff --git a/src/host/trxcon/src/logging.c b/src/host/trxcon/src/logging.c index 04f3568..5c16ac5 100644 --- a/src/host/trxcon/src/logging.c +++ b/src/host/trxcon/src/logging.c @@ -42,8 +42,8 @@ .color = "\033[1;31m", .enabled = 1, .loglevel = LOGL_NOTICE, }, - [DTRX] = { - .name = "DTRX", + [DTRXC] = { + .name = "DTRXC", .description = "Transceiver control interface", .color = "\033[1;33m", .enabled = 1, .loglevel = LOGL_NOTICE, diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index 7499740..46f6e7e 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -81,7 +81,7 @@ .name = "trx_interface", .states = trx_fsm_states, .num_states = ARRAY_SIZE(trx_fsm_states), - .log_subsys = DTRX, + .log_subsys = DTRXC, .event_names = trx_evt_names, }; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I33c8f81e37de7ee61809610e51405a96c93536ff Gerrit-Change-Number: 28758 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

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

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28756 to look at the new patch set (#3). 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, 136 insertions(+), 89 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/56/28756/3 -- 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: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: ensure TRXD logging is actually using LOGPFSMSL()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28757 ) Change subject: trxcon: ensure TRXD logging is actually using LOGPFSMSL() ...................................................................... trxcon: ensure TRXD logging is actually using LOGPFSMSL() This should have been done in [1], but somehow I forgot about TRXD. Change-Id: Ia5124061fe391644267a6117ac2627cad7adf873 Fixes: [1] Ic253903e7b8635bb13e210acfe929c73f8870632 Related: OS#5599 --- M src/host/trxcon/src/trx_if.c 1 file changed, 13 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/57/28757/1 diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index 7daedad..7499740 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -601,13 +601,13 @@ read_len = read(ofd->fd, buf, sizeof(buf)); if (read_len <= 0) { - LOGP(DTRXD, LOGL_ERROR, "read() failed with rc=%zd\n", read_len); + LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR, "read() failed with rc=%zd\n", read_len); return read_len; } if (read_len < (8 + 148)) { /* TRXDv0 header + GMSK burst */ - LOGP(DTRXD, LOGL_ERROR, "Got data message with invalid " - "length '%zd'\n", read_len); + LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR, + "Got data message with invalid length '%zd'\n", read_len); return -EINVAL; } @@ -620,17 +620,18 @@ osmo_ubit2sbit(bits, buf + 8, 148); if (tn >= 8) { - LOGP(DTRXD, LOGL_ERROR, "Illegal TS %d\n", tn); + LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR, "Illegal TS %d\n", tn); return -EINVAL; } if (fn >= 2715648) { - LOGP(DTRXD, LOGL_ERROR, "Illegal FN %u\n", fn); + LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR, "Illegal FN %u\n", fn); return -EINVAL; } - LOGP(DTRXD, LOGL_DEBUG, "RX burst tn=%u fn=%u rssi=%d toa=%d\n", - tn, fn, rssi, toa256); + LOGPFSMSL(trx->fi, DTRXD, LOGL_DEBUG, + "RX burst tn=%u fn=%u rssi=%d toa=%d\n", + tn, fn, rssi, toa256); /* Group the measurements together */ meas = (struct l1sched_meas_set) { @@ -664,14 +665,15 @@ */ #if 0 if (trx->fi->state != TRX_STATE_ACTIVE) { - LOGP(DTRXD, LOGL_ERROR, "Ignoring TX data, " - "transceiver isn't ready\n"); + LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR, + "Ignoring TX data, transceiver isn't ready\n"); return -EAGAIN; } #endif - LOGP(DTRXD, LOGL_DEBUG, "TX burst tn=%u fn=%u pwr=%u\n", - br->tn, br->fn, br->pwr); + LOGPFSMSL(trx->fi, DTRXD, LOGL_DEBUG, + "TX burst tn=%u fn=%u pwr=%u\n", + br->tn, br->fn, br->pwr); buf[0] = br->tn; osmo_store32be(br->fn, buf + 1); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia5124061fe391644267a6117ac2627cad7adf873 Gerrit-Change-Number: 28757 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

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

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28756 to look at the new patch set (#2). 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, 135 insertions(+), 87 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/56/28756/2 -- 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: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

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 uploaded this change for review. ( 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, 135 insertions(+), 87 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/56/28756/1 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..a489e04 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h @@ -30,6 +30,8 @@ l1ctl_conn_data_func *conn_read_cb; /* mandatory */ l1ctl_conn_state_func *conn_accept_cb; /* optional */ l1ctl_conn_state_func *conn_close_cb; /* optional */ + /* logging context callback (returns prefix for messages) */ + const char *(*log_ctx_cb)(const struct l1ctl_client *client); }; struct l1ctl_server { diff --git a/src/host/trxcon/src/l1ctl.c b/src/host/trxcon/src/l1ctl.c index 6b8cec2..8fa616d 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..d21c307 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)->server->cfg->log_ctx_cb(cli), ## 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; } @@ -173,14 +178,14 @@ 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; } @@ -223,6 +228,8 @@ /* conn_read_cb shall not be NULL */ OSMO_ASSERT(cfg->conn_read_cb != NULL); + /* log_ctx_cb shall not be NULL */ + OSMO_ASSERT(cfg->log_ctx_cb != NULL); /* Bind connection handler */ osmo_fd_setup(&server->ofd, -1, OSMO_FD_READ, &l1ctl_server_conn_cb, server, 0); diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index ebe997e..df2f967 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -322,9 +322,8 @@ .event_names = trxcon_fsm_event_names, }; -static const char *sched_logging_ctx_cb(const struct l1sched_state *sched) +static inline const char *_logging_ctx_cb(const struct trxcon_inst *trxcon) { - const struct trxcon_inst *trxcon = sched->priv; static char buf[128]; snprintf(&buf[0], sizeof(buf) - 1, "%s{%s}: ", @@ -334,6 +333,16 @@ return buf; } +static const char *sched_logging_ctx_cb(const struct l1sched_state *sched) +{ + return _logging_ctx_cb(sched->priv); +} + +static const char *l1ctl_logging_ctx_cb(const struct l1ctl_client *client) +{ + return _logging_ctx_cb(client->priv); +} + struct trxcon_inst *trxcon_inst_alloc(void *ctx) { struct trxcon_inst *trxcon; @@ -580,6 +589,7 @@ .conn_read_cb = &l1ctl_rx_cb, .conn_accept_cb = &l1ctl_conn_accept_cb, .conn_close_cb = &l1ctl_conn_close_cb, + .log_ctx_cb = &l1ctl_logging_ctx_cb, }; server = l1ctl_server_alloc(tall_trxcon_ctx, &server_cfg); -- 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: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-upf[master]: add osmo-pfcp-tool

by fixeria

Attention is currently required from: neels, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/28310 ) Change subject: add osmo-pfcp-tool ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File src/osmo-pfcp-tool/pfcp_tool.h: https://gerrit.osmocom.org/c/osmo-upf/+/28310/comment/e2a8567b_1af82567 PS3, Line 36: struct osmo_tdef Not sure if this one is needed, you're #including <osmocom/core/tdef.h> anyway. -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28310 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I34a80d43a14c7b68952c7d337d8042d6f28ceae7 Gerrit-Change-Number: 28310 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 23 Jul 2022 16:08:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-upf[master]: implement GTPv1-U ECHO response

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/28312 ) Change subject: implement GTPv1-U ECHO response ...................................................................... Patch Set 4: Code-Review+2 (1 comment) Patchset: PS4: apply previous votes after linter fix (whitespace) -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I135370a7723e2c667ec681f50c21107cde63ea5b Gerrit-Change-Number: 28312 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 23 Jul 2022 14:53:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-upf[master]: apply refactoring of osmo_pfcp_endpoint API

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/28755 ) Change subject: apply refactoring of osmo_pfcp_endpoint API ...................................................................... apply refactoring of osmo_pfcp_endpoint API libosmo-pfcp If80c35c6a942bf9593781b5a6bc28ba37323ce5e changes the osmo_pfcp_endpoint API, apply the necessary changes here. Related: SYS#5599 Depends: If80c35c6a942bf9593781b5a6bc28ba37323ce5e (libosmo-pfcp) Change-Id: I01deb3f347435c9fa1c49e9a0c5ef70742444ad4 --- M src/osmo-pfcp-tool/osmo_pfcp_tool_main.c M src/osmo-pfcp-tool/pfcp_tool_vty.c M src/osmo-upf/up_endpoint.c M src/osmo-upf/up_peer.c M src/osmo-upf/up_session.c 5 files changed, 44 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/55/28755/1 diff --git a/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c b/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c index 9a4de1c..43c3b45 100644 --- a/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c +++ b/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c @@ -344,8 +344,7 @@ do { if (pfcp_tool_mainloop()) break; - } while (!llist_empty(&g_pfcp_tool->ep->sent_requests) - || !llist_empty(&g_pfcp_tool->ep->sent_responses)); + } while (osmo_pfcp_endpoint_retrans_queue_is_busy(g_pfcp_tool->ep)); printf("Done\n"); } else { printf("Listening for commands on VTY...\n"); diff --git a/src/osmo-pfcp-tool/pfcp_tool_vty.c b/src/osmo-pfcp-tool/pfcp_tool_vty.c index 8593217..ece27cd 100644 --- a/src/osmo-pfcp-tool/pfcp_tool_vty.c +++ b/src/osmo-pfcp-tool/pfcp_tool_vty.c @@ -48,7 +48,7 @@ { if (g_pfcp_tool->ep != NULL) { vty_out(vty, "Already listening on %s%s", - osmo_sockaddr_to_str_c(OTC_SELECT, &g_pfcp_tool->ep->cfg.local_addr), + osmo_sockaddr_to_str_c(OTC_SELECT, &osmo_pfcp_endpoint_get_cfg(g_pfcp_tool->ep)->local_addr), VTY_NEWLINE); return CMD_WARNING; } @@ -63,38 +63,43 @@ "Bind local PFCP port and listen; see also 'local-addr'\n") { struct osmo_sockaddr_str local_addr; + struct osmo_pfcp_endpoint_cfg cfg; int rc; OSMO_ASSERT(g_pfcp_tool); if (g_pfcp_tool->ep != NULL) { vty_out(vty, "Already listening on %s%s", - osmo_sockaddr_to_str_c(OTC_SELECT, &g_pfcp_tool->ep->cfg.local_addr), + osmo_sockaddr_to_str_c(OTC_SELECT, &osmo_pfcp_endpoint_get_cfg(g_pfcp_tool->ep)->local_addr), VTY_NEWLINE); return CMD_WARNING; } - g_pfcp_tool->ep = osmo_pfcp_endpoint_create(g_pfcp_tool, g_pfcp_tool); - if (!g_pfcp_tool->ep) { - vty_out(vty, "Failed to allocate PFCP endpoint.%s", VTY_NEWLINE); - return CMD_WARNING; - } - g_pfcp_tool->ep->rx_msg = pfcp_tool_rx_msg; - g_pfcp_tool->ep->seq_nr_state = rand(); + cfg = (struct osmo_pfcp_endpoint_cfg){ + .rx_msg_cb = pfcp_tool_rx_msg, + }; /* Translate address string from VTY config to osmo_sockaddr: first read into osmo_sockaddr_str, then write to * osmo_sockaddr. */ osmo_sockaddr_str_from_str(&local_addr, g_pfcp_tool->vty_cfg.local_ip, g_pfcp_tool->vty_cfg.local_port); - osmo_sockaddr_str_to_sockaddr(&local_addr, &g_pfcp_tool->ep->cfg.local_addr.u.sas); + osmo_sockaddr_str_to_sockaddr(&local_addr, &cfg.local_addr.u.sas); - /* Store this address as the local PFCP Node Id */ - osmo_pfcp_ie_node_id_from_osmo_sockaddr(&g_pfcp_tool->ep->cfg.local_node_id, &g_pfcp_tool->ep->cfg.local_addr); + /* Also use this address as the local PFCP Node Id */ + osmo_pfcp_ie_node_id_from_osmo_sockaddr(&cfg.local_node_id, &cfg.local_addr); + + g_pfcp_tool->ep = osmo_pfcp_endpoint_create(g_pfcp_tool, &cfg); + if (!g_pfcp_tool->ep) { + vty_out(vty, "Failed to allocate PFCP endpoint.%s", VTY_NEWLINE); + return CMD_WARNING; + } + + osmo_pfcp_endpoint_set_seq_nr_state(g_pfcp_tool->ep, rand()); rc = osmo_pfcp_endpoint_bind(g_pfcp_tool->ep); if (rc) { vty_out(vty, "Failed to bind PFCP endpoint on %s: %s%s\n", - osmo_sockaddr_to_str_c(OTC_SELECT, &g_pfcp_tool->ep->cfg.local_addr), strerror(rc), - VTY_NEWLINE); + osmo_sockaddr_to_str_c(OTC_SELECT, &osmo_pfcp_endpoint_get_cfg(g_pfcp_tool->ep)->local_addr), + strerror(rc), VTY_NEWLINE); return CMD_WARNING; } return CMD_SUCCESS; @@ -194,7 +199,7 @@ } m = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, &peer->remote_addr, OSMO_PFCP_MSGT_ASSOC_SETUP_REQ); - m->ies.assoc_setup_req.recovery_time_stamp = g_pfcp_tool->ep->recovery_time_stamp; + m->ies.assoc_setup_req.recovery_time_stamp = osmo_pfcp_endpoint_get_recovery_timestamp(g_pfcp_tool->ep); m->ies.assoc_setup_req.cp_function_features_present = true; osmo_pfcp_bits_set(m->ies.assoc_setup_req.cp_function_features.bits, OSMO_PFCP_CP_FEAT_BUNDL, true); @@ -367,7 +372,7 @@ .teid = session->access.teid.local, .ip_addr = { .v4_present = true, - .v4 = g_pfcp_tool->ep->cfg.local_addr, + .v4 = osmo_pfcp_endpoint_get_cfg(g_pfcp_tool->ep)->local_addr, }, }, }; @@ -391,7 +396,7 @@ cp_f_seid = (struct osmo_pfcp_ie_f_seid){ .seid = session->cp_seid, }; - osmo_pfcp_ip_addrs_set(&cp_f_seid.ip_addr, &g_pfcp_tool->ep->cfg.local_addr); + osmo_pfcp_ip_addrs_set(&cp_f_seid.ip_addr, &osmo_pfcp_endpoint_get_cfg(g_pfcp_tool->ep)->local_addr); m = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, &peer->remote_addr, OSMO_PFCP_MSGT_SESSION_EST_REQ); m->h.seid_present = true; @@ -508,7 +513,7 @@ .teid = session->access.teid.local, .ip_addr = { .v4_present = true, - .v4 = g_pfcp_tool->ep->cfg.local_addr, + .v4 = osmo_pfcp_endpoint_get_cfg(g_pfcp_tool->ep)->local_addr, }, }, }; @@ -542,7 +547,7 @@ .teid = session->core.teid.local, .ip_addr = { .v4_present = true, - .v4 = g_pfcp_tool->ep->cfg.local_addr, + .v4 = osmo_pfcp_endpoint_get_cfg(g_pfcp_tool->ep)->local_addr, }, }, }; @@ -565,7 +570,7 @@ cp_f_seid = (struct osmo_pfcp_ie_f_seid){ .seid = session->cp_seid, }; - osmo_pfcp_ip_addrs_set(&cp_f_seid.ip_addr, &g_pfcp_tool->ep->cfg.local_addr); + osmo_pfcp_ip_addrs_set(&cp_f_seid.ip_addr, &osmo_pfcp_endpoint_get_cfg(g_pfcp_tool->ep)->local_addr); m = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, &peer->remote_addr, OSMO_PFCP_MSGT_SESSION_EST_REQ); m->h.seid_present = true; @@ -685,7 +690,7 @@ cp_f_seid = (struct osmo_pfcp_ie_f_seid){ .seid = session->cp_seid, }; - osmo_pfcp_ip_addrs_set(&cp_f_seid.ip_addr, &g_pfcp_tool->ep->cfg.local_addr); + osmo_pfcp_ip_addrs_set(&cp_f_seid.ip_addr, &osmo_pfcp_endpoint_get_cfg(g_pfcp_tool->ep)->local_addr); m = osmo_pfcp_msg_alloc_tx_req(OTC_SELECT, &peer->remote_addr, OSMO_PFCP_MSGT_SESSION_MOD_REQ); m->h.seid_present = true; diff --git a/src/osmo-upf/up_endpoint.c b/src/osmo-upf/up_endpoint.c index ef3702a..46995e6 100644 --- a/src/osmo-upf/up_endpoint.c +++ b/src/osmo-upf/up_endpoint.c @@ -30,7 +30,7 @@ static void up_endpoint_set_msg_ctx(struct osmo_pfcp_endpoint *ep, struct osmo_pfcp_msg *m, struct osmo_pfcp_msg *req) { - struct up_endpoint *up_ep = ep->priv; + struct up_endpoint *up_ep = osmo_pfcp_endpoint_get_cfg(ep)->priv; struct up_peer *peer; /* If this is a response to an earlier request, just take the msg context from the request message. */ @@ -188,7 +188,7 @@ static void up_endpoint_rx_cb(struct osmo_pfcp_endpoint *ep, struct osmo_pfcp_msg *m, struct osmo_pfcp_msg *req) { - struct up_endpoint *up_ep = ep->priv; + struct up_endpoint *up_ep = osmo_pfcp_endpoint_get_priv(ep); switch (m->h.message_type) { case OSMO_PFCP_MSGT_PFD_MGMT_REQ: @@ -230,17 +230,22 @@ struct up_endpoint *up_endpoint_init(void *ctx, const struct osmo_sockaddr *local_addr) { int rc; + struct osmo_pfcp_endpoint_cfg cfg; struct up_endpoint *up_ep; up_ep = talloc_zero(ctx, struct up_endpoint); INIT_LLIST_HEAD(&up_ep->peers); - up_ep->pfcp_ep = osmo_pfcp_endpoint_create(up_ep, up_ep); - up_ep->pfcp_ep->cfg.local_addr = *local_addr; + cfg = (struct osmo_pfcp_endpoint_cfg){ + .local_addr = *local_addr, + .set_msg_ctx_cb = up_endpoint_set_msg_ctx, + .rx_msg_cb = up_endpoint_rx_cb, + .priv = up_ep, + }; + osmo_pfcp_ie_node_id_from_osmo_sockaddr(&cfg.local_node_id, local_addr); - up_ep->pfcp_ep->set_msg_ctx = up_endpoint_set_msg_ctx; - up_ep->pfcp_ep->rx_msg = up_endpoint_rx_cb; + up_ep->pfcp_ep = osmo_pfcp_endpoint_create(up_ep, &cfg); - osmo_pfcp_ie_node_id_from_osmo_sockaddr(&up_ep->pfcp_ep->cfg.local_node_id, local_addr); + rc = osmo_pfcp_endpoint_bind(up_ep->pfcp_ep); if (rc) { diff --git a/src/osmo-upf/up_peer.c b/src/osmo-upf/up_peer.c index 633e458..2c2eda1 100644 --- a/src/osmo-upf/up_peer.c +++ b/src/osmo-upf/up_peer.c @@ -211,11 +211,10 @@ resp->ies.assoc_setup_resp = (struct osmo_pfcp_msg_assoc_setup_resp) { .cause = cause, - .recovery_time_stamp = g_upf->pfcp.ep->pfcp_ep->recovery_time_stamp, + .recovery_time_stamp = osmo_pfcp_endpoint_get_recovery_timestamp(g_upf->pfcp.ep->pfcp_ep), .up_function_features_present = true, .up_function_features = peer->local_up_features, }; - resp->ies.assoc_setup_resp.recovery_time_stamp = g_upf->pfcp.ep->pfcp_ep->recovery_time_stamp; if (osmo_pfcp_endpoint_tx(peer->up_endpoint->pfcp_ep, resp)) { OSMO_LOG_PFCP_MSG(resp, LOGL_ERROR, "Error sending response, cannot associate with peer\n"); diff --git a/src/osmo-upf/up_session.c b/src/osmo-upf/up_session.c index a2ea5e5..5934dc9 100644 --- a/src/osmo-upf/up_session.c +++ b/src/osmo-upf/up_session.c @@ -141,7 +141,8 @@ } LOGPFSML(session->fi, LOGL_INFO, "Allocated new local TEID 0x%x\n", dst->fixed.teid); - if (osmo_pfcp_ip_addrs_set(&dst->fixed.ip_addr, &up_ep->pfcp_ep->cfg.local_addr)) { + if (osmo_pfcp_ip_addrs_set(&dst->fixed.ip_addr, + &osmo_pfcp_endpoint_get_cfg(up_ep->pfcp_ep)->local_addr)) { LOGPFSML(session->fi, LOGL_ERROR, "Invalid local address in pfcp_endpoint cfg\n"); return OSMO_PFCP_CAUSE_PFCP_ENTITY_IN_CONGESTION; } @@ -550,7 +551,8 @@ goto nack_response; /* Success, send ACK */ - osmo_pfcp_ie_f_seid_set(&resp->up_f_seid, session->up_seid, &peer->up_endpoint->pfcp_ep->cfg.local_addr); + osmo_pfcp_ie_f_seid_set(&resp->up_f_seid, session->up_seid, + &osmo_pfcp_endpoint_get_cfg(peer->up_endpoint->pfcp_ep)->local_addr); resp->up_f_seid_present = true; rc = osmo_pfcp_endpoint_tx(peer->up_endpoint->pfcp_ep, tx); -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/28755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I01deb3f347435c9fa1c49e9a0c5ef70742444ad4 Gerrit-Change-Number: 28755 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022