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

Change in pysim[master]: README: Mention the manual can also be built from the source

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28680 ) Change subject: README: Mention the manual can also be built from the source ...................................................................... README: Mention the manual can also be built from the source Change-Id: Ic73a9ebaecab1b14668aaffe4cd39b3749a19fc7 --- M README.md 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/80/28680/1 diff --git a/README.md b/README.md index 5e1937e..2be2fa9 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ Homepage and Manual ------------------- - -Please visit the [official homepage](https://osmocom.org/projects/pysim/wiki) for usage instructions, manual and examples. +w +Please visit the [official homepage](https://osmocom.org/projects/pysim/wiki) for usage instructions, manual and examples. The user manual can also be built locally from this source code by ``cd docs && make html latexpdf`` for HTML and PDF format, respectively. Git Repository -------------- -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic73a9ebaecab1b14668aaffe4cd39b3749a19fc7 Gerrit-Change-Number: 28680 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in pysim[master]: tlv: Make NotImplementedError more verbose

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28681 ) Change subject: tlv: Make NotImplementedError more verbose ...................................................................... tlv: Make NotImplementedError more verbose This helps to understand immediately _what_ is not implemented for which type. Change-Id: I017eb4828e9deee80338024c41c93c0f78db3f3b --- M pySim/tlv.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/81/28681/1 diff --git a/pySim/tlv.py b/pySim/tlv.py index 4de5046..5acc781 100644 --- a/pySim/tlv.py +++ b/pySim/tlv.py @@ -100,7 +100,7 @@ # not an abstractmethod, as it is only required if no _construct exists def _to_bytes(self): - raise NotImplementedError + raise NotImplementedError('%s._to_bytes' % type(self).__name__) def from_bytes(self, do: bytes): """Convert from binary bytes to internal representation. Store the decoded result @@ -118,7 +118,7 @@ # not an abstractmethod, as it is only required if no _construct exists def _from_bytes(self, do: bytes): - raise NotImplementedError + raise NotImplementedError('%s._from_bytes' % type(self).__name__) class IE(Transcodable, metaclass=TlvMeta): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I017eb4828e9deee80338024c41c93c0f78db3f3b Gerrit-Change-Number: 28681 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in pysim[master]: EF.AD: Avoid NotImplementedErrror regarding network names

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28682 ) Change subject: EF.AD: Avoid NotImplementedErrror regarding network names ...................................................................... EF.AD: Avoid NotImplementedErrror regarding network names Even while we don't yet have a proper decoder, let's at least represent the network name as hex-string Change-Id: I4ed626699d1e4e484d4ffd04349676dadff626a0 --- M pySim/ts_51_011.py 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/82/28682/1 diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 0927c9f..7e7020b 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -878,11 +878,13 @@ class EF_PNN(LinFixedEF): class FullNameForNetwork(BER_TLV_IE, tag=0x43): # TS 24.008 10.5.3.5a - pass + # TODO: proper decode + _construct = HexAdapter(GreedyBytes) class ShortNameForNetwork(BER_TLV_IE, tag=0x45): # TS 24.008 10.5.3.5a - pass + # TODO: proper decode + _construct = HexAdapter(GreedyBytes) class NetworkNameCollection(TLV_IE_Collection, nested=[FullNameForNetwork, ShortNameForNetwork]): pass -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4ed626699d1e4e484d4ffd04349676dadff626a0 Gerrit-Change-Number: 28682 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Build failure of network:osmocom:nightly/libosmo-netif in xUbuntu_20.04/x86_64

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/l… Package network:osmocom:nightly/libosmo-netif failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-netif Last lines of build log: [ 201s] | #define HAVE_INTTYPES_H 1 [ 201s] | #define HAVE_STDINT_H 1 [ 201s] | #define HAVE_UNISTD_H 1 [ 201s] | #define HAVE_DLFCN_H 1 [ 201s] | #define LT_OBJDIR ".libs/" [ 201s] | #define STDC_HEADERS 1 [ 201s] | #define HAVE_EXECINFO_H 1 [ 201s] | #define HAVE_SYS_SELECT_H 1 [ 201s] | #define HAVE_SYS_SOCKET_H 1 [ 201s] | #define HAVE_SYSLOG_H 1 [ 201s] | #define HAVE_CTYPE_H 1 [ 201s] | #define HAVE_NETINET_SCTP_H 1 [ 201s] | #define HAVE_LIBOSMOCORE 1 [ 201s] | #define HAVE_LIBSCTP 1 [ 201s] | #define HAVE_PCAP_H 1 [ 201s] | [ 201s] | configure: exit 0 [ 201s] [ 201s] make[1]: *** [debian/rules:27: override_dh_auto_test] Error 1 [ 201s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 201s] make: *** [debian/rules:13: build] Error 2 [ 201s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 201s] ### VM INTERACTION START ### [ 201s] [ 167.984392][ T1] sysrq: Power Off [ 201s] [ 168.005646][ T16] reboot: Power down [ 201s] ### VM INTERACTION END ### [ 201s] [ 201s] lamb23 failed "build libosmo-netif_1.2.0.4.dcae.202207200052.dsc" at Wed Jul 20 01:59:45 UTC 2022. [ 201s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: tune hard-coded logging parameters (filename)

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28679 ) Change subject: trxcon: tune hard-coded logging parameters (filename) ...................................................................... trxcon: tune hard-coded logging parameters (filename) Change-Id: I241cff113a513799d3da0c9991354ea9ea889bb6 --- M src/host/trxcon/src/trxcon.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/79/28679/1 diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 2c9318a..4a5ad47 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -540,6 +540,9 @@ log_set_print_category(osmo_stderr_target, 1); log_set_print_level(osmo_stderr_target, 1); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_BASENAME); + log_set_print_filename_pos(osmo_stderr_target, LOG_FILENAME_POS_LINE_END); + /* Optional GSMTAP */ if (app_data.gsmtap_ip != NULL) { app_data.gsmtap = gsmtap_source_init(app_data.gsmtap_ip, GSMTAP_UDP_PORT, 1); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I241cff113a513799d3da0c9991354ea9ea889bb6 Gerrit-Change-Number: 28679 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: ensure are TRXC/TRXD logging is using LOGPFSML()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28676 ) Change subject: trxcon: ensure are TRXC/TRXD logging is using LOGPFSML() ...................................................................... trxcon: ensure are TRXC/TRXD logging is using LOGPFSML() Change-Id: Ic253903e7b8635bb13e210acfe929c73f8870632 --- M src/host/trxcon/src/trx_if.c 1 file changed, 23 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/76/28676/1 diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index bc2557c..c3dee24 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -145,7 +145,7 @@ tcm = llist_entry(trx->trx_ctrl_list.next, struct trx_ctrl_msg, list); /* Send command */ - LOGP(DTRX, LOGL_DEBUG, "Sending control '%s'\n", tcm->cmd); + LOGPFSML(trx->fi, LOGL_DEBUG, "Sending control '%s'\n", tcm->cmd); send(trx->trx_ofd_ctrl.fd, tcm->cmd, strlen(tcm->cmd) + 1, 0); /* Trigger state machine */ @@ -170,11 +170,11 @@ if (llist_empty(&trx->trx_ctrl_list)) return; - LOGP(DTRX, LOGL_NOTICE, "No response from transceiver...\n"); + LOGPFSML(trx->fi, LOGL_NOTICE, "No response from transceiver...\n"); tcm = llist_entry(trx->trx_ctrl_list.next, struct trx_ctrl_msg, list); if (++tcm->retry_cnt > 3) { - LOGP(DTRX, LOGL_NOTICE, "Transceiver offline\n"); + LOGPFSML(trx->fi, LOGL_NOTICE, "Transceiver offline\n"); osmo_fsm_inst_state_chg(trx->fi, TRX_STATE_OFFLINE, 0, 0); osmo_fsm_inst_dispatch(trxcon->fi, TRX_EVENT_OFFLINE, trx); return; @@ -215,7 +215,7 @@ tcm->cmd_len = strlen(cmd); tcm->critical = critical; llist_add_tail(&tcm->list, &trx->trx_ctrl_list); - LOGP(DTRX, LOGL_INFO, "Adding new control '%s'\n", tcm->cmd); + LOGPFSML(trx->fi, LOGL_INFO, "Adding new control '%s'\n", tcm->cmd); /* Send message, if no pending messages */ if (!pending) @@ -259,7 +259,7 @@ { if (trx->powered_up) { /* FIXME: this should be handled by the FSM, not here! */ - LOGP(DTRX, LOGL_ERROR, "Suppressing POWERON as we're already powered up\n"); + LOGPFSML(trx->fi, LOGL_ERROR, "Suppressing POWERON as we're already powered up\n"); return -EAGAIN; } return trx_ctrl_cmd(trx, 1, "POWERON", ""); @@ -315,7 +315,7 @@ /* RX is downlink on MS side */ freq10 = gsm_arfcn2freq10(band_arfcn, 0); if (freq10 == 0xffff) { - LOGP(DTRX, LOGL_ERROR, "ARFCN %d not defined\n", band_arfcn); + LOGPFSML(trx->fi, LOGL_ERROR, "ARFCN %d not defined\n", band_arfcn); return -ENOTSUP; } @@ -329,7 +329,7 @@ /* TX is uplink on MS side */ freq10 = gsm_arfcn2freq10(band_arfcn, 1); if (freq10 == 0xffff) { - LOGP(DTRX, LOGL_ERROR, "ARFCN %d not defined\n", band_arfcn); + LOGPFSML(trx->fi, LOGL_ERROR, "ARFCN %d not defined\n", band_arfcn); return -ENOTSUP; } @@ -360,7 +360,7 @@ /* Calculate a frequency for current ARFCN (DL) */ freq10 = gsm_arfcn2freq10(band_arfcn_start, 0); if (freq10 == 0xffff) { - LOGP(DTRX, LOGL_ERROR, "ARFCN %d not defined\n", band_arfcn_start); + LOGPFSML(trx->fi, LOGL_ERROR, "ARFCN %d not defined\n", band_arfcn_start); return -ENOTSUP; } @@ -381,7 +381,7 @@ /* Check received ARFCN against expected */ band_arfcn = gsm_freq102arfcn((uint16_t) freq10, 0); if (band_arfcn != trx->pm_band_arfcn_start) { - LOGP(DTRX, LOGL_ERROR, "Power measurement error: " + LOGPFSML(trx->fi, LOGL_ERROR, "Power measurement error: " "response ARFCN=%u doesn't match expected ARFCN=%u\n", band_arfcn & ~ARFCN_FLAG_MASK, trx->pm_band_arfcn_start & ~ARFCN_FLAG_MASK); @@ -440,7 +440,7 @@ /* Make sure that Mobile Allocation has at least one ARFCN */ if (!ma_len || ma == NULL) { - LOGP(DTRX, LOGL_ERROR, "Mobile Allocation is empty?!?\n"); + LOGPFSML(trx->fi, LOGL_ERROR, "Mobile Allocation is empty?!?\n"); return -EINVAL; } @@ -450,7 +450,7 @@ rx_freq = gsm_arfcn2freq10(ma[i], 0); /* Rx: Downlink */ tx_freq = gsm_arfcn2freq10(ma[i], 1); /* Tx: Uplink */ if (rx_freq == 0xffff || tx_freq == 0xffff) { - LOGP(DTRX, LOGL_ERROR, "Failed to convert ARFCN %u " + LOGPFSML(trx->fi, LOGL_ERROR, "Failed to convert ARFCN %u " "to a pair of Rx/Tx frequencies\n", ma[i] & ~ARFCN_FLAG_MASK); return -EINVAL; @@ -459,7 +459,7 @@ /* Append a pair of Rx/Tx frequencies (in kHz) to the buffer */ rc = snprintf(ptr, ma_buf_len, "%u %u ", rx_freq * 100, tx_freq * 100); if (rc < 0 || rc > ma_buf_len) { /* Prevent buffer overflow */ - LOGP(DTRX, LOGL_ERROR, "Not enough room to encode " + LOGPFSML(trx->fi, LOGL_ERROR, "Not enough room to encode " "Mobile Allocation (N=%zu)\n", ma_len); return -ENOSPC; } @@ -487,13 +487,13 @@ read_len = read(ofd->fd, buf, sizeof(buf) - 1); if (read_len <= 0) { - LOGP(DTRX, LOGL_ERROR, "read() failed with rc=%zd\n", read_len); + LOGPFSML(trx->fi, LOGL_ERROR, "read() failed with rc=%zd\n", read_len); return read_len; } buf[read_len] = '\0'; if (!!strncmp(buf, "RSP ", 4)) { - LOGP(DTRX, LOGL_NOTICE, "Unknown message on CTRL port: %s\n", buf); + LOGPFSML(trx->fi, LOGL_NOTICE, "Unknown message on CTRL port: %s\n", buf); return 0; } @@ -501,7 +501,7 @@ p = strchr(buf + 4, ' '); rsp_len = p ? p - buf - 4 : strlen(buf) - 4; - LOGP(DTRX, LOGL_INFO, "Response message: '%s'\n", buf); + LOGPFSML(trx->fi, LOGL_INFO, "Response message: '%s'\n", buf); /* Abort expire timer */ if (osmo_timer_pending(&trx->trx_ctrl_timer)) @@ -509,7 +509,7 @@ /* Get command for response message */ if (llist_empty(&trx->trx_ctrl_list)) { - LOGP(DTRX, LOGL_NOTICE, "Response message without command\n"); + LOGPFSML(trx->fi, LOGL_NOTICE, "Response message without command\n"); return -EINVAL; } @@ -518,7 +518,7 @@ /* Check if response matches command */ if (!!strncmp(buf + 4, tcm->cmd + 4, rsp_len)) { - LOGP(DTRX, (tcm->critical) ? LOGL_FATAL : LOGL_ERROR, + LOGPFSML(trx->fi, (tcm->critical) ? LOGL_FATAL : LOGL_ERROR, "Response message '%s' does not match command " "message '%s'\n", buf, tcm->cmd); goto rsp_error; @@ -527,7 +527,7 @@ /* Check for response code */ sscanf(p + 1, "%d", &resp); if (resp) { - LOGP(DTRX, (tcm->critical) ? LOGL_FATAL : LOGL_ERROR, + LOGPFSML(trx->fi, (tcm->critical) ? LOGL_FATAL : LOGL_ERROR, "Transceiver rejected TRX command with " "response: '%s'\n", buf); @@ -699,20 +699,20 @@ struct trx_instance *trx; int rc; - LOGP(DTRX, LOGL_NOTICE, "Init transceiver interface " + LOGPFSML(trxcon->fi, LOGL_NOTICE, "Init transceiver interface " "(%s:%u)\n", remote_host, base_port); /* Try to allocate memory */ trx = talloc_zero(trxcon, struct trx_instance); if (!trx) { - LOGP(DTRX, LOGL_ERROR, "Failed to allocate memory\n"); + LOGPFSML(trx->fi, LOGL_ERROR, "Failed to allocate memory\n"); return NULL; } /* Allocate a new dedicated state machine */ trx->fi = osmo_fsm_inst_alloc_child(&trx_fsm, trxcon->fi, TRX_EVENT_OFFLINE); if (trx->fi == NULL) { - LOGP(DTRX, LOGL_ERROR, "Failed to allocate an instance " + LOGPFSML(trx->fi, LOGL_ERROR, "Failed to allocate an instance " "of FSM '%s'\n", trx_fsm.name); talloc_free(trx); return NULL; @@ -737,7 +737,7 @@ return trx; udp_error: - LOGP(DTRX, LOGL_ERROR, "Couldn't establish UDP connection\n"); + LOGPFSML(trx->fi, LOGL_ERROR, "Couldn't establish UDP connection\n"); osmo_fsm_inst_free(trx->fi); talloc_free(trx); return NULL; @@ -766,7 +766,7 @@ if (!trx) return; - LOGP(DTRX, LOGL_NOTICE, "Shutdown transceiver interface\n"); + LOGPFSML(trx->fi, LOGL_NOTICE, "Shutdown transceiver interface\n"); /* Flush CTRL message list */ trx_if_flush_ctrl(trx); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic253903e7b8635bb13e210acfe929c73f8870632 Gerrit-Change-Number: 28676 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: fix trx_if_close(): delete TRXC timer if it's pending

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28677 ) Change subject: trxcon: fix trx_if_close(): delete TRXC timer if it's pending ...................................................................... trxcon: fix trx_if_close(): delete TRXC timer if it's pending Change-Id: I669355ec03f67de437df2d3b822ed0a728b405d5 --- M src/host/trxcon/src/trx_if.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/77/28677/1 diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index c3dee24..e7327c9 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -768,6 +768,9 @@ LOGPFSML(trx->fi, LOGL_NOTICE, "Shutdown transceiver interface\n"); + if (osmo_timer_pending(&trx->trx_ctrl_timer)) + osmo_timer_del(&trx->trx_ctrl_timer); + /* Flush CTRL message list */ trx_if_flush_ctrl(trx); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I669355ec03f67de437df2d3b822ed0a728b405d5 Gerrit-Change-Number: 28677 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: support handling of multiple L1CTL client connections

by fixeria

fixeria has uploaded this change for review. ( 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, 21 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/78/28678/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 d16ca5c..22bf368 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h @@ -23,6 +23,7 @@ struct l1ctl_server { struct llist_head clients; + unsigned int num_clients; struct osmo_fd ofd; void *talloc_ctx; @@ -35,6 +36,7 @@ struct llist_head list; struct l1ctl_server *server; struct osmo_wqueue wq; + unsigned int index; 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 2c28f80..dc2fc33 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 index; /* The L1 scheduler */ struct l1sched_state *sched; @@ -33,5 +34,5 @@ bool fbsb_conf_sent; }; -struct trxcon_inst *trxcon_inst_alloc(void *ctx); +struct trxcon_inst *trxcon_inst_alloc(void *ctx, unsigned int idx); 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 7152a53..44cccdf 100644 --- a/src/host/trxcon/src/l1ctl_server.c +++ b/src/host/trxcon/src/l1ctl_server.c @@ -120,14 +120,6 @@ return client_fd; } - /* TODO: remove this barrier when multi-trxcon support is implemented */ - if (!llist_empty(&server->clients)) { - LOGP(DL1C, LOGL_NOTICE, "L1CTL client rejected: " - "we already have an active connection\n"); - close(client_fd); - return -ENOMEM; - } - client = talloc_zero(server->talloc_ctx, struct l1ctl_client); if (client == NULL) { LOGP(DL1C, LOGL_ERROR, "Failed to allocate an L1CTL client\n"); @@ -155,6 +147,7 @@ LOGP(DL1C, LOGL_NOTICE, "L1CTL server got a new connection\n"); llist_add_tail(&client->list, &server->clients); + client->index = server->num_clients++; client->server = server; if (client->server->conn_accept_cb != NULL) @@ -201,6 +194,8 @@ osmo_wqueue_clear(&client->wq); llist_del(&client->list); + client->server->num_clients--; + talloc_free(client); } diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index e7327c9..d61eddb 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -696,6 +696,7 @@ const char *local_host, const char *remote_host, uint16_t base_port) { + const unsigned int offset = trxcon->index * 2; struct trx_instance *trx; int rc; @@ -722,13 +723,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 3b03956..2c9318a 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -322,7 +322,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 index) { struct trxcon_inst *trxcon; @@ -333,6 +333,9 @@ trxcon, LOGL_DEBUG, NULL); OSMO_ASSERT(trxcon->fi != NULL); + osmo_fsm_inst_update_id_f(trxcon->fi, "trxcon-%u", index); + trxcon->index = index; + /* Init transceiver interface */ trxcon->trx = trx_if_open(trxcon, app_data.trx_bind_ip, @@ -376,7 +379,7 @@ { struct trxcon_inst *trxcon; - trxcon = trxcon_inst_alloc(l1c); + trxcon = trxcon_inst_alloc(l1c, l1c->index); if (trxcon == NULL) { l1ctl_client_conn_close(l1c); return; -- 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: 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: cosmetic: remove the '_fsm' postfix in trx_fsm.name

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28674 ) Change subject: trxcon: cosmetic: remove the '_fsm' postfix in trx_fsm.name ...................................................................... trxcon: cosmetic: remove the '_fsm' postfix in trx_fsm.name Change-Id: Ie867f7a59b9d9f423944606d43f2f854313053f7 --- M src/host/trxcon/src/trx_if.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/74/28674/1 diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index 974690d..cdfef8a 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -78,7 +78,7 @@ }; static struct osmo_fsm trx_fsm = { - .name = "trx_interface_fsm", + .name = "trx_interface", .states = trx_fsm_states, .num_states = ARRAY_SIZE(trx_fsm_states), .log_subsys = DTRX, -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie867f7a59b9d9f423944606d43f2f854313053f7 Gerrit-Change-Number: 28674 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: trx_if_open(): allocate trx->fi as a child of trxcon->fi

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28675 ) Change subject: trxcon: trx_if_open(): allocate trx->fi as a child of trxcon->fi ...................................................................... trxcon: trx_if_open(): allocate trx->fi as a child of trxcon->fi Change-Id: I19579d2a76c38ca972a4ca132a8e5e3bba876c67 --- M src/host/trxcon/src/trx_if.c 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/75/28675/1 diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index cdfef8a..bc2557c 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -710,9 +710,7 @@ } /* Allocate a new dedicated state machine */ - /* TODO: allocate it as a child of trxcon->fi */ - trx->fi = osmo_fsm_inst_alloc(&trx_fsm, trx, - NULL, LOGL_DEBUG, "trx_interface"); + trx->fi = osmo_fsm_inst_alloc_child(&trx_fsm, trxcon->fi, TRX_EVENT_OFFLINE); if (trx->fi == NULL) { LOGP(DTRX, LOGL_ERROR, "Failed to allocate an instance " "of FSM '%s'\n", trx_fsm.name); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I19579d2a76c38ca972a4ca132a8e5e3bba876c67 Gerrit-Change-Number: 28675 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022