osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/36349?usp=email )
Change subject: debian: initial layer23 packaging
......................................................................
debian: initial layer23 packaging
Related: OS#6409
Change-Id: I3713201233e13fca5ea4e0b8c4df913c787965f5
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/osmocom-bb.install
A debian/rules
A debian/source/format
7 files changed, 76 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/49/36349/1
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..2335d18
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+osmocom-bb (0.1.0) unstable; urgency=medium
+
+ * Initial debian packaging for layer23
+
+ -- Oliver Smith <osmith(a)sysmocom.de> Mon, 19 Mar 2024 11:38:22 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..f599e28
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..c90b6a7
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,29 @@
+Source: osmocom-bb
+Section: net
+Priority: optional
+Maintainer: Osmocom team <openbsc(a)lists.osmocom.org>
+Build-Depends: debhelper (>= 10),
+ dh-autoreconf,
+ autotools-dev,
+ autoconf,
+ automake,
+ libtool,
+ pkg-config,
+ libosmocore-dev (>= 1.5.0),
+ libosmo-csn1-dev,
+ libosmo-gprs-gmm-dev,
+ libosmo-gprs-llc-dev,
+ libosmo-gprs-rlcmac-dev,
+ libosmo-gprs-sm-dev,
+ libosmo-gprs-sndcp-dev,
+ libosmogapk-dev
+Standards-Version: 4.1.4
+Vcs-Browser: https://gitea.osmocom.org/phone-side/osmocom-bb
+Vcs-Git: https://gerrit.osmocom.org/osmocom-bb
+Homepage: https://osmocom.org/projects/baseband/wiki
+
+Package: osmocom-bb-layer23
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: MS-side implementation of L2 and L3 GSM protocols
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..c9ee2c1
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,23 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: osmocom-bb
+Source: https://gitea.osmocom.org/phone-side/osmocom-bb
+
+Files: *
+License: GPL-2.0+
+
+License: GPL-2.0+
+ This package is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/osmocom-bb.install b/debian/osmocom-bb.install
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/debian/osmocom-bb.install
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..8dd0df8
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,7 @@
+#!/usr/bin/make -f
+
+%:
+ dh $@ -D src/host/layer23 --with-autoreconf
+
+override_dh_auto_configure:
+ dh_auto_configure -D src/host/layer23 -- --with-gapk-io
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..89ae9db
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/36349?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I3713201233e13fca5ea4e0b8c4df913c787965f5
Gerrit-Change-Number: 36349
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/36342?usp=email )
Change subject: e1line_dump_vty(): dump keepalive state and params
......................................................................
e1line_dump_vty(): dump keepalive state and params
There is currently no obvious way to know if the keepalive is enabled
and which parameters are in use. Executing 'show running-config'
command in the VTY would not always reveal the current configuration,
because it tends to omit parameters with default values.
Let's print the keepalive state and params in the output of the
'show e1_line' command. Below is a few examples:
! keepalive is disabled
OsmoBSC# show e1_line
E1 Line Number 0, Name , Driver ipa
Keepalive: disabled
IPA Keepalive: disabled
! TCP Keepalive is enabled (default)
OsmoBSC# show e1_line
E1 Line Number 0, Name , Driver ipa
Keepalive: enabled
Number of probes: (driver's default)
Idle timeout: (driver's default)
Probe interval: (driver's default)
IPA Keepalive: disabled
! TCP and IPA keepalive enabled (custom params)
OsmoBSC# show e1_line
E1 Line Number 0, Name , Driver ipa
Keepalive: enabled
Number of probes: 2
Idle timeout: 1s
Probe interval: 3s
IPA Keepalive: enabled
Interval: 2s
Timeout: 10s
Note that in the case of TCP keepalive with default parameters
we cannot retrieve the actual defaults because that would be a
layering violation. Thus we say "(driver's default)".
Change-Id: I17bd991850333ee794ab216f474b5e045fb01fa3
Related: OS#6375, SYS#6801
---
M src/e1_input_vty.c
1 file changed, 95 insertions(+), 0 deletions(-)
Approvals:
osmith: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/e1_input_vty.c b/src/e1_input_vty.c
index ca45f93..b1898dd 100644
--- a/src/e1_input_vty.c
+++ b/src/e1_input_vty.c
@@ -457,12 +457,59 @@
return CMD_SUCCESS;
}
+static void e1line_ka_dump_vty(struct vty *vty, const struct e1inp_line *line)
+{
+ if (line->keepalive_num_probes == 0) {
+ vty_out(vty, "Keepalive: disabled%s", VTY_NEWLINE);
+ return;
+ }
+
+ vty_out(vty, "Keepalive: enabled%s", VTY_NEWLINE);
+
+ vty_out(vty, " Number of probes: ");
+ if (line->keepalive_num_probes != E1INP_USE_DEFAULT)
+ vty_out(vty, "%d", line->keepalive_num_probes);
+ else
+ vty_out(vty, "(driver's default)");
+ vty_out(vty, "%s", VTY_NEWLINE);
+
+ vty_out(vty, " Idle timeout: ");
+ if (line->keepalive_idle_timeout != E1INP_USE_DEFAULT)
+ vty_out(vty, "%ds", line->keepalive_idle_timeout);
+ else
+ vty_out(vty, "(driver's default)");
+ vty_out(vty, "%s", VTY_NEWLINE);
+
+ vty_out(vty, " Probe interval: ");
+ if (line->keepalive_probe_interval != E1INP_USE_DEFAULT)
+ vty_out(vty, "%ds", line->keepalive_probe_interval);
+ else
+ vty_out(vty, "(driver's default)");
+ vty_out(vty, "%s", VTY_NEWLINE);
+}
+
+static void e1line_ipa_ka_dump_vty(struct vty *vty, const struct e1inp_line *line)
+{
+ if (line->ipa_kap == NULL) {
+ vty_out(vty, "IPA Keepalive: disabled%s", VTY_NEWLINE);
+ return;
+ }
+
+ vty_out(vty, "IPA Keepalive: enabled%s", VTY_NEWLINE);
+ vty_out(vty, " Interval: %us%s", line->ipa_kap->interval, VTY_NEWLINE);
+ vty_out(vty, " Timeout: %us%s", line->ipa_kap->wait_for_resp, VTY_NEWLINE);
+}
+
static void e1line_dump_vty(struct vty *vty, struct e1inp_line *line,
int stats)
{
vty_out(vty, "E1 Line Number %u, Name %s, Driver %s%s",
line->num, line->name ? line->name : "",
line->driver->name, VTY_NEWLINE);
+ if (line->driver->has_keepalive)
+ e1line_ka_dump_vty(vty, line);
+ if (!strcmp(line->driver->name, "ipa"))
+ e1line_ipa_ka_dump_vty(vty, line);
if (line->pcap_file)
vty_out(vty, "PCAP %s%s", line->pcap_file, VTY_NEWLINE);
if (line->driver->vty_show)
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36342?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I17bd991850333ee794ab216f474b5e045fb01fa3
Gerrit-Change-Number: 36342
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(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: jolly, laforge, pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36317?usp=email )
Change subject: osmo-bts-virtual: Port over to osmo_io
......................................................................
Patch Set 2:
(1 comment)
File src/osmo-bts-virtual/scheduler_virtbts.c:
https://gerrit.osmocom.org/c/osmo-bts/+/36317/comment/09280084_61ee0f4f
PS2, Line 105: else if (rc == 0)
> If the socket dies, not handling of rc <= 0 will result in an infinite loop of read events. […]
This is not `read()`, but `send()` code path. The return value is either the number of bytes sent, or -1. AFAIU, checking against 0 makes no sense (even before this patch), so this is why this block is being dropped?
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36317?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Icfe42da00fd446c38090055e2baa5d5e0ae5b70c
Gerrit-Change-Number: 36317
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 19 Mar 2024 11:46:38 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: jolly <andreas(a)eversberg.eu>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: neels.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/36348?usp=email )
Change subject: add osmo_pfcp_ip_addrs_get
......................................................................
Patch Set 1:
(1 comment)
File src/libosmo-pfcp/pfcp_msg.c:
https://gerrit.osmocom.org/c/libosmo-pfcp/+/36348/comment/79c70236_7713c0be
PS1, Line 523: *v4 = (struct osmo_sockaddr){};
you probably want to set sa_family to AF_UNSPEC here.
If you can find somewhere that it's specified that AF_UNSPEC is 0 then it's fine.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/36348?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-pfcp
Gerrit-Branch: master
Gerrit-Change-Id: I4338a83f26ef2443f90cf835621e73aed5eac521
Gerrit-Change-Number: 36348
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 19 Mar 2024 11:43:19 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: neels.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/36347?usp=email )
Change subject: pfcp up_function_features: allow shorter lengths
......................................................................
Patch Set 1:
(2 comments)
File src/libosmo-pfcp/pfcp_ies_custom.c:
https://gerrit.osmocom.org/c/libosmo-pfcp/+/36347/comment/4a51ea7b_82dec78e
PS1, Line 435: * if the peer sends less octets, make do with what we get. */
"make do" ?
https://gerrit.osmocom.org/c/libosmo-pfcp/+/36347/comment/b3b96f18_0d923e71
PS1, Line 436: memset(up_function_features->bits, 0, sizeof(up_function_features->bits));
we can probably avoid memcpying twice.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/36347?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-pfcp
Gerrit-Branch: master
Gerrit-Change-Id: I40e255fd0b4770e578aea7a10ba88f5eeba087f4
Gerrit-Change-Number: 36347
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 19 Mar 2024 11:40:31 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: laforge, pespin.
jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36317?usp=email )
Change subject: osmo-bts-virtual: Port over to osmo_io
......................................................................
Patch Set 2:
(1 comment)
File src/osmo-bts-virtual/scheduler_virtbts.c:
https://gerrit.osmocom.org/c/osmo-bts/+/36317/comment/c281e135_fbfb82c1
PS2, Line 105: else if (rc == 0)
> why is this removed? because it cannot happen anymore right?
If the socket dies, not handling of rc <= 0 will result in an infinite loop of read events. This is UDP socket can it die?a
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36317?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Icfe42da00fd446c38090055e2baa5d5e0ae5b70c
Gerrit-Change-Number: 36317
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: jolly <andreas(a)eversberg.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 19 Mar 2024 11:39:46 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment