pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/36239?usp=email )
Change subject: Name llsk prim_srv{_link}
......................................................................
Name llsk prim_srv{_link}
This allows easily identifying the prim_srv{_link} in logs.
Depends: libosmo-netif.git Change-Id Iba683e4d65e0aba81e13bdf1b9d5a9065b1fc89c
Change-Id: Idae27bc9a2a223710edb9fca905ad5ae924dde80
---
M TODO-RELEASE
M src/osmo-hnodeb/llsk.c
2 files changed, 15 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
diff --git a/TODO-RELEASE b/TODO-RELEASE
index 2c9f8ba..61eb973 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -8,3 +8,4 @@
# If any interfaces have been removed or changed since the last public release: c:r:0.
#library what description / commit summary line
libosmocore depend >= 1.9.0 we need osmo_sockaddr_from_str_and_uint()
+libosmo-netif depend > 1.4.0 osmo_prim_srv{_link}_set_name()
\ No newline at end of file
diff --git a/src/osmo-hnodeb/llsk.c b/src/osmo-hnodeb/llsk.c
index ddb13c4..b76b595 100644
--- a/src/osmo-hnodeb/llsk.c
+++ b/src/osmo-hnodeb/llsk.c
@@ -85,6 +85,7 @@
static int llsk_opened_cb(struct osmo_prim_srv *srv)
{
struct hnb *hnb = (struct hnb *)osmo_prim_srv_get_priv(srv);
+ osmo_prim_srv_set_name(srv, "llsk");
if (hnb->llsk.srv) {
LOGP(DLLSK, LOGL_ERROR, "New connection opened while one is already active, dropping it\n");
@@ -208,6 +209,7 @@
{
hnb->llsk.link = osmo_prim_srv_link_alloc(hnb);
osmo_prim_srv_link_set_priv(hnb->llsk.link, hnb);
+ osmo_prim_srv_link_set_name(hnb->llsk.link, "llsk-link");
osmo_prim_srv_link_set_log_category(hnb->llsk.link, DLLSK);
osmo_prim_srv_link_set_addr(hnb->llsk.link, HNB_PRIM_UD_SOCK_DEFAULT);
osmo_prim_srv_link_set_opened_conn_cb(hnb->llsk.link, llsk_opened_cb);
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/36239?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnodeb
Gerrit-Branch: master
Gerrit-Change-Id: Idae27bc9a2a223710edb9fca905ad5ae924dde80
Gerrit-Change-Number: 36239
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/36245?usp=email )
Change subject: cosmetic: Fix typo in comment
......................................................................
cosmetic: Fix typo in comment
Change-Id: Ie13952075be29201751d5b7884ca572a285ca9dd
---
M src/osmo-hnodeb/hnb_shutdown_fsm.c
1 file changed, 10 insertions(+), 1 deletion(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
osmith: Looks good to me, approved
diff --git a/src/osmo-hnodeb/hnb_shutdown_fsm.c b/src/osmo-hnodeb/hnb_shutdown_fsm.c
index 7c9eee8..9d7e186 100644
--- a/src/osmo-hnodeb/hnb_shutdown_fsm.c
+++ b/src/osmo-hnodeb/hnb_shutdown_fsm.c
@@ -47,7 +47,7 @@
struct hnb *hnb = (struct hnb *)fi->priv;
switch (event) {
case HNB_SHUTDOWN_EV_START:
- /* TODO: here we may want to communicate t lower layers over UDsocket that we are shutting down...
+ /* TODO: here we may want to communicate to lower layers over UDsocket that we are shutting down...
* TODO: Also, if Iuh link is still up, maybe send a Hnb deregister req towards HNBGW
* TODO: also signal the hnb object somehow that we are starting to shut down?
*/
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/36245?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnodeb
Gerrit-Branch: master
Gerrit-Change-Id: Ie13952075be29201751d5b7884ca572a285ca9dd
Gerrit-Change-Number: 36245
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36254?usp=email )
Change subject: library: add templates for L1CTL_{DATA,TRAFFIC}_CONF
......................................................................
Patch Set 1:
(1 comment)
File library/L1CTL_Types.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36254/comment/5e50021d_4ae3…
PS1, Line 859: template L1ctlMessage
> 1- It really is a "template (present)", it cannot be omit.
Yes, it's obvious that a complete template definition cannot be `omit` unless it's a direct and implicit assignment of `omit` (`template Foo bar := omit;`), and unless it's generated and returned by a function (`template Foo bar := f_gen_tr_Foo(...);`). So I would say it's redundant to say that it's `(present)` in this specific case.
> 2- Then if you want to pass it as a param to another template which expects as param "template (present)", it won't match the expectancies. This probably generates warnings.
I don't think this is the case, at least it's not with TITAN.
The following code compiles without any warnings, and the testcase is passing:
```
diff --git a/selftest/Selftest.ttcn b/selftest/Selftest.ttcn
index 3d749253..5ee8a544 100644
--- a/selftest/Selftest.ttcn
+++ b/selftest/Selftest.ttcn
@@ -94,6 +94,39 @@ testcase TC_ipa_fragment() runs on IPA_selftest_CT {
setverdict(pass);
}
+private type record FooBar {
+ integer foo,
+ integer bar
+};
+
+private type record FooBarZoo {
+ FooBar foo_bar,
+ integer zoo
+};
+
+template FooBar tr_FooBar(template (present) integer foo,
+ template (present) integer bar) := {
+ foo := foo,
+ bar := bar
+}
+
+template FooBarZoo tr_FooBarZoo(template (present) FooBar foo_bar,
+ template (present) integer zoo) := {
+ foo_bar := foo_bar,
+ zoo := zoo
+}
+
+private type component dummy_CT { };
+
+testcase TC_foo_bar_zoo() runs on dummy_CT {
+ var FooBarZoo fbz := { { 1, 2 }, 42 };
+
+ if (match(fbz, tr_FooBarZoo(tr_FooBar(?, ?), 42))) {
+ setverdict(pass);
+ } else {
+ setverdict(fail);
+ }
+}
control {
execute( TC_ipa_fragment() );
```
Note that I am passing `tr_FooBar(?, ?)`, which is defined without the `(present)` restriction, to `tr_FooBarZoo`, which does expect the first template parameter to be `(present)`.
All in all, I don't think we should be forcing this during code review.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36254?usp=email
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: I914555ac8bf2784c14e1b5564b116221ecc7b539
Gerrit-Change-Number: 36254
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 13 Mar 2024 15:06:24 +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