Attention is currently required from: pespin, fixeria.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29582 )
Change subject: bts: Log unexpected RSL message
......................................................................
Patch Set 2:
(1 comment)
File bts/BTS_Tests.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29582/comment/2745684c_64f0…
PS2, Line 786: RSL PDU
> I thought you meant PDU as a generic thing so I put it here. […]
the problem is the overloading of the name RSL with either "RSL Port" and "RSL protocol [message|packet|PDU". The RSL port can (AFAIR) also transport other messages, as per its port definition. I think among those are IPA up/down notifications.
So the generic catch-all receive at the bottom is catching something received on the RSL test port which is not a RSL message.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29582
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I6cdc53ff038858211b09c0a8eeec19603107ffe4
Gerrit-Change-Number: 29582
Gerrit-PatchSet: 2
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-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 06 Oct 2022 10:38:42 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29618 )
Change subject: usb: Add support for new GPSDO status field "Accumulated error"
......................................................................
usb: Add support for new GPSDO status field "Accumulated error"
Because we want to handle older firmwares too, we need to excepect
we might get a smaller structure !
(We can't get a larger one since the wLength we send is limited to
the structure we know)
Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com>
Change-Id: I4222bf22267f8343abf1e97546111ceb1c299846
---
M src/e1d.h
M src/ice1usb_proto.h
M src/intf_line.c
M src/usb.c
4 files changed, 23 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/e1d.h b/src/e1d.h
index 42be1b4..ff34800 100644
--- a/src/e1d.h
+++ b/src/e1d.h
@@ -67,6 +67,7 @@
LINE_GPSDO_TUNE_COARSE,
LINE_GPSDO_TUNE_FINE,
LINE_GPSDO_FREQ_EST,
+ LINE_GPSDO_ERR_ACC,
};
enum e1_ts_mode {
diff --git a/src/ice1usb_proto.h b/src/ice1usb_proto.h
index 3170d55..54b91ab 100644
--- a/src/ice1usb_proto.h
+++ b/src/ice1usb_proto.h
@@ -65,6 +65,7 @@
uint8_t mode; /*!< Current configured operating mode */
struct e1usb_gpsdo_tune tune; /*!< Current VCXO tuning values */
uint32_t freq_est; /*!< Latest frequency estimate measurement */
+ int16_t err_acc; /*!< Accumulated error (since fw icE1usb-fw-0.3 commit cfb8b0b7) */
} __attribute__((packed));
diff --git a/src/intf_line.c b/src/intf_line.c
index a645cd3..811b8fe 100644
--- a/src/intf_line.c
+++ b/src/intf_line.c
@@ -75,6 +75,7 @@
[LINE_GPSDO_TUNE_COARSE]= { "gpsdo:tune:coarse", "GSPDO Coarse Tuning" },
[LINE_GPSDO_TUNE_FINE] = { "gpsdo:tune:fine", "GSPDO Fine Tuning" },
[LINE_GPSDO_FREQ_EST] = { "gpsdo:freq_est", "GSPDO Frequency Estimate" },
+ [LINE_GPSDO_ERR_ACC] = { "gpsdo:err_acc", "GPSDO Accumulated Error" },
};
static const struct osmo_stat_item_group_desc line_stats_desc = {
diff --git a/src/usb.c b/src/usb.c
index fa6ddee..a60ea99 100644
--- a/src/usb.c
+++ b/src/usb.c
@@ -706,14 +706,29 @@
{
struct e1_usb_intf_data *id = intf->drv_data;
struct e1usb_gpsdo_status *last_st = &id->gpsdo.last_status;
- const struct e1usb_gpsdo_status *st;
+ struct e1usb_gpsdo_status _st, *st = &_st;
struct e1_line *line;
if (len < sizeof(*st)) {
- LOGPIF(intf, DE1D, LOGL_ERROR, "GPSDO status %zu < %zu!\n", len, sizeof(*st));
- return;
+ /*
+ * Because some fields can be added to the structure by newer
+ * firmware revisions, this means we can potentially get a shorter
+ * struct than what we asked for. We simply set those fields to
+ * zero.
+ *
+ * The opposite case (newer firmware than e1d) means the structure
+ * could be larger, but because we limit the wLength to the struct
+ * we know, we can't receive a larger one and the new fields are
+ * just ignored by this e1d version
+ */
+ LOGPIF(intf, DE1D, LOGL_DEBUG,
+ "GPSDO status %zu < %zu ! Firmware probably outdated. "
+ "Some values will be zeroed\n",
+ len, sizeof(*st));
}
- st = (const struct e1usb_gpsdo_status *) data;
+
+ memset(st, 0x00, sizeof(*st));
+ memcpy(st, data, len);
if (st->state != last_st->state) {
LOGPIF(intf, DE1D, LOGL_NOTICE, "GPSDO state change: %s -> %s\n",
@@ -750,6 +765,7 @@
line_stat_set(line, LINE_GPSDO_TUNE_COARSE, libusb_le16_to_cpu(st->tune.coarse));
line_stat_set(line, LINE_GPSDO_TUNE_FINE, libusb_le16_to_cpu(st->tune.fine));
line_stat_set(line, LINE_GPSDO_FREQ_EST, osmo_load32le(&st->freq_est));
+ line_stat_set(line, LINE_GPSDO_ERR_ACC, (int16_t)libusb_le16_to_cpu(st->err_acc));
}
/* update our state */
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29618
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: I4222bf22267f8343abf1e97546111ceb1c299846
Gerrit-Change-Number: 29618
Gerrit-PatchSet: 6
Gerrit-Owner: tnt <tnt(a)246tNt.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
Attention is currently required from: tnt.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29618 )
Change subject: usb: Add support for new GPSDO status field "Accumulated error"
......................................................................
Patch Set 6: Code-Review+2
(2 comments)
File src/ice1usb_proto.h:
https://gerrit.osmocom.org/c/osmo-e1d/+/29618/comment/20e17f2e_78fe84c8
PS3, Line 68: int16_t err_acc; /*!< Accumulated error */
> I added a reference to the next (yet to be tagged/release) version (since it'll be the first to have […]
Done
File src/usb.c:
https://gerrit.osmocom.org/c/osmo-e1d/+/29618/comment/176bb43f_f1484aa8
PS3, Line 715: "Some values will be zeroed\n",
> Yup notice is probably a bit much. Switched to DEBUG. […]
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29618
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: I4222bf22267f8343abf1e97546111ceb1c299846
Gerrit-Change-Number: 29618
Gerrit-PatchSet: 6
Gerrit-Owner: tnt <tnt(a)246tNt.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: tnt <tnt(a)246tNt.com>
Gerrit-Comment-Date: Thu, 06 Oct 2022 10:35:55 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: tnt <tnt(a)246tNt.com>
Gerrit-MessageType: comment
Attention is currently required from: tnt.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/29635 )
Change subject: vty: Add option to disable GPS-DO loop and use manual tuning values
......................................................................
Patch Set 4: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29635
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: I8668fe42e4c399f08696e497887120e501341f5a
Gerrit-Change-Number: 29635
Gerrit-PatchSet: 4
Gerrit-Owner: tnt <tnt(a)246tNt.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: tnt <tnt(a)246tNt.com>
Gerrit-Comment-Date: Thu, 06 Oct 2022 10:34:31 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29643 )
Change subject: Check once if remote addr is available when sending dummy packet
......................................................................
Check once if remote addr is available when sending dummy packet
It's checked in all code paths being called, which makes sense since
it's impossible to send anything if the remote address is not set. Let's
check it once in a unique to simplify the code.
Change-Id: I224dbfeda17c364b85166268e2ac1e019a87edb6
---
M src/libosmo-mgcp/mgcp_osmux.c
M src/libosmo-mgcp/mgcp_protocol.c
2 files changed, 6 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/43/29643/1
diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c
index d9a10a9..ebb41a6 100644
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -645,9 +645,6 @@
* endpoint may have already punched the hole in the firewall. This
* approach is simple though. */
- /* Wait until we have the connection information from MDCX */
- if (!mgcp_rtp_end_remote_addr_available(&conn->end))
- return 0;
if (endp_osmux_state_check(endp, conn, true) < 0)
return 0;
diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c
index 1d286ed..b4a4792 100644
--- a/src/libosmo-mgcp/mgcp_protocol.c
+++ b/src/libosmo-mgcp/mgcp_protocol.c
@@ -324,6 +324,11 @@
* osmux connection, send the dummy packet via OSMUX */
static void send_dummy(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn)
{
+ /* Avoid sending dummy packet if the remote address was not yet
+ * configured through CRCX/MDCX: */
+ if (!mgcp_rtp_end_remote_addr_available(&conn->end))
+ return;
+
if (mgcp_conn_rtp_is_osmux(conn))
osmux_send_dummy(endp, conn);
else
@@ -1090,7 +1095,6 @@
/* Send dummy packet, see also comments in mgcp_keepalive_timer_cb() */
OSMO_ASSERT(trunk->keepalive_interval >= MGCP_KEEPALIVE_ONCE);
if (conn->conn->mode & MGCP_CONN_RECV_ONLY &&
- mgcp_rtp_end_remote_addr_available(&conn->end) &&
trunk->keepalive_interval != MGCP_KEEPALIVE_NEVER)
send_dummy(endp, conn);
@@ -1310,7 +1314,6 @@
/* Send dummy packet, see also comments in mgcp_keepalive_timer_cb() */
OSMO_ASSERT(trunk->keepalive_interval >= MGCP_KEEPALIVE_ONCE);
if (conn->conn->mode & MGCP_CONN_RECV_ONLY &&
- mgcp_rtp_end_remote_addr_available(&conn->end) &&
trunk->keepalive_interval != MGCP_KEEPALIVE_NEVER)
send_dummy(endp, conn);
@@ -1579,8 +1582,7 @@
struct mgcp_endpoint *endp = trunk->endpoints[i];
llist_for_each_entry(conn, &endp->conns, entry) {
if (conn->type == MGCP_CONN_TYPE_RTP &&
- conn->mode == MGCP_CONN_RECV_ONLY &&
- mgcp_rtp_end_remote_addr_available(&conn->u.rtp.end))
+ conn->mode == MGCP_CONN_RECV_ONLY)
send_dummy(endp, &conn->u.rtp);
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29643
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I224dbfeda17c364b85166268e2ac1e019a87edb6
Gerrit-Change-Number: 29643
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: laforge, tnt.
Hello Jenkins Builder, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-e1d/+/29618
to look at the new patch set (#6).
Change subject: usb: Add support for new GPSDO status field "Accumulated error"
......................................................................
usb: Add support for new GPSDO status field "Accumulated error"
Because we want to handle older firmwares too, we need to excepect
we might get a smaller structure !
(We can't get a larger one since the wLength we send is limited to
the structure we know)
Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com>
Change-Id: I4222bf22267f8343abf1e97546111ceb1c299846
---
M src/e1d.h
M src/ice1usb_proto.h
M src/intf_line.c
M src/usb.c
4 files changed, 23 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/18/29618/6
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/29618
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: I4222bf22267f8343abf1e97546111ceb1c299846
Gerrit-Change-Number: 29618
Gerrit-PatchSet: 6
Gerrit-Owner: tnt <tnt(a)246tNt.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: tnt <tnt(a)246tNt.com>
Gerrit-MessageType: newpatchset