[L] Change in libosmocore[master]: tests: Test gsmtap logging if write queue fills up
Attention is currently required from: daniel. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34967?usp=email ) Change subject: tests: Test gsmtap logging if write queue fills up .. Patch Set 2: (1 comment) File tests/logging/logging_test_gsmtap.c: https://gerrit.osmocom.org/c/libosmocore/+/34967/comment/0eccdc17_56efdb64 PS2, Line 3: 2008, 2009 by Holger Hans Peter Freyther I doubt it was Holger who wrote this test -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34967?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id5ae0c4c3820a9ed59eaf4003d2c57b6bdfe3468 Gerrit-Change-Number: 34967 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: daniel Gerrit-Comment-Date: Thu, 16 Nov 2023 06:57:55 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in libosmocore[master]: core: add parity calculation functions for uint{32,16,8}_t
fixeria has abandoned this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35005?usp=email )
Change subject: core: add parity calculation functions for uint{32,16,8}_t
..
Abandoned
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35005?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2d6265eac5ce062276a40f4968b129d8702c6117
Gerrit-Change-Number: 35005
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-MessageType: abandon
[S] Change in osmo-mgw[master]: mgcp_parse_audio_port_pt(): fix buffer overflow
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-mgw/+/34898?usp=email )
Change subject: mgcp_parse_audio_port_pt(): fix buffer overflow
..
mgcp_parse_audio_port_pt(): fix buffer overflow
Change-Id: I18c78d15eb1593f404b4741248225b68878b463f
---
M src/libosmo-mgcp-client/mgcp_client.c
1 file changed, 10 insertions(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/libosmo-mgcp-client/mgcp_client.c
b/src/libosmo-mgcp-client/mgcp_client.c
index 5df4560..b5897a6 100644
--- a/src/libosmo-mgcp-client/mgcp_client.c
+++ b/src/libosmo-mgcp-client/mgcp_client.c
@@ -319,7 +319,7 @@
pt_str = strtok(line, " ");
while (1) {
/* Do not allow excessive payload types */
- if (count > ARRAY_SIZE(r->codecs))
+ if (count >= ARRAY_SIZE(r->codecs))
goto response_parse_failure_pt;
pt_str = strtok(NULL, " ");
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34898?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I18c78d15eb1593f404b4741248225b68878b463f
Gerrit-Change-Number: 34898
Gerrit-PatchSet: 3
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
[S] Change in libosmocore[master]: core: add parity calculation functions for uint{32,16,8}_t
Attention is currently required from: fixeria, neels.
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35005?usp=email )
Change subject: core: add parity calculation functions for uint{32,16,8}_t
..
Patch Set 1: -Code-Review
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35005?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2d6265eac5ce062276a40f4968b129d8702c6117
Gerrit-Change-Number: 35005
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-Attention: neels
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Wed, 15 Nov 2023 22:04:52 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[S] Change in libosmocore[master]: core: add parity calculation functions for uint{32,16,8}_t
Attention is currently required from: fixeria, neels.
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/libosmocore/+/35005?usp=email )
Change subject: core: add parity calculation functions for uint{32,16,8}_t
..
Patch Set 1:
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/libosmocore/+/35005/comment/3354dbf4_c4bad8dc
PS1, Line 8:
> Yes, Harald's guess is correct. […]
I'd rather not merge functions where we don't know we actually have any
immediate users. Let's then abandon this one?
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35005?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I2d6265eac5ce062276a40f4968b129d8702c6117
Gerrit-Change-Number: 35005
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-Attention: neels
Gerrit-Attention: fixeria
Gerrit-Comment-Date: Wed, 15 Nov 2023 21:55:30 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels
Comment-In-Reply-To: laforge
Comment-In-Reply-To: fixeria
Gerrit-MessageType: comment
[S] Change in docker-playground[master]: Use 2023q1 osmo-ttcn3-hacks branch for 2023q1 SUTs
laforge has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/35013?usp=email )
Change subject: Use 2023q1 osmo-ttcn3-hacks branch for 2023q1 SUTs
..
Use 2023q1 osmo-ttcn3-hacks branch for 2023q1 SUTs
Fix the TTCN3-centos-pcu-test-2023q1 jenkins job where currently most
tests are failing. This is because 2023q1 is using an older PCUIF
version that is no longer supported by osmo-ttcn3-hacks.git. As
discussed, use a 2023q1 branch of osmo-ttcn3-hacks where the support was
not removed yet.
Fixes: SYS#6638
Change-Id: Id82425aca4a8ff87feb8a130d31712bc62fa27ed
---
M jenkins-common.sh
1 file changed, 38 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
diff --git a/jenkins-common.sh b/jenkins-common.sh
index 4e476f6..7978749 100644
--- a/jenkins-common.sh
+++ b/jenkins-common.sh
@@ -122,6 +122,27 @@
set -x
}
+# Get the osmo-ttcn3-hacks branch to use, based on the IMAGE_SUFFIX we are
+# testing. This allows e.g. running 2023q1 SUTs against the 2023q1 branch of
+# osmo-ttcn3-hacks.git (SYS#6638). The OSMO_TTCN3_BRANCH env var can be used to
+# override it in any case.
+# $IMAGE_SUFFIX: e.g. 2023q1-centos8
+docker_osmo_ttcn3_branch() {
+ if [ -n "$OSMO_TTCN3_BRANCH" ]; then
+ echo "$OSMO_TTCN3_BRANCH"
+ return
+ fi
+
+ case "$IMAGE_SUFFIX" in
+ 20*q*)
+ echo "$IMAGE_SUFFIX" | cut -d- -f 1
+ ;;
+ *)
+ echo "master"
+ ;;
+ esac
+}
+
# Make sure required images are available and build them if necessary.
# $*: image names (e.g. "debian-bullseye-build", "osmo-mgw-master",
"osmo-mgw-master-centos8")
# The images are automatically built from the Dockerfile of the subdir of
@@ -184,6 +205,7 @@
UPSTREAM_DISTRO="$upstream_distro_arg" \
DISTRO="$distro_arg" \
IMAGE="$REPO_USER/$i" \
+ OSMO_TTCN3_BRANCH="$(docker_osmo_ttcn3_branch)"
\
|| exit 1
fi
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35013?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Id82425aca4a8ff87feb8a130d31712bc62fa27ed
Gerrit-Change-Number: 35013
Gerrit-PatchSet: 3
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-MessageType: merged
[S] Change in docker-playground[master]: Use 2023q1 osmo-ttcn3-hacks branch for 2023q1 SUTs
Attention is currently required from: daniel, dexter, neels, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35013?usp=email ) Change subject: Use 2023q1 osmo-ttcn3-hacks branch for 2023q1 SUTs .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35013?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id82425aca4a8ff87feb8a130d31712bc62fa27ed Gerrit-Change-Number: 35013 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Attention: osmith Gerrit-Attention: neels Gerrit-Attention: daniel Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 15 Nov 2023 21:54:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmocore[master]: gsmtap_util: Simplify sink
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/34881?usp=email )
Change subject: gsmtap_util: Simplify sink
..
gsmtap_util: Simplify sink
- Instead of using the osmo_fd API to call read() on the socket's file
descriptor each time (unused) data is received, simply open the
socket and never read
Related: OS#6213
Change-Id: I4025920d5f62d17133e9b5fe81cd34a88c4f20b5
---
M src/core/gsmtap_util.c
1 file changed, 21 insertions(+), 43 deletions(-)
Approvals:
daniel: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/core/gsmtap_util.c b/src/core/gsmtap_util.c
index 458d1d7..d817885 100644
--- a/src/core/gsmtap_util.c
+++ b/src/core/gsmtap_util.c
@@ -58,7 +58,7 @@
struct osmo_wqueue wq;/*!< the wait queue. This field member may
not be changed or moved (backwards compatibility) */
struct osmo_io_fd *out; /*!< Used when osmo_io_mode is nonzero */
- struct osmo_fd sink_ofd;
+ int sink_fd;
};
struct _gsmtap_inst_legacy {
@@ -433,22 +433,6 @@
signal_dbm, snr, data, len);
}
-/* Callback from select layer if we can read from the sink socket */
-static int gsmtap_sink_fd_cb(struct osmo_fd *fd, unsigned int flags)
-{
- int rc;
- uint8_t buf[4096];
- if (!(flags & OSMO_FD_READ))
- return 0;
-
- rc = read(fd->fd, buf, sizeof(buf));
- if (rc < 0)
- return rc;
- /* simply discard any data arriving on the socket */
-
- return 0;
-}
-
/*! Add a local sink to an existing GSMTAP source and return fd
* \param[in] gti existing GSMTAP source
* \returns file descriptor of locally bound receive socket
@@ -466,28 +450,7 @@
*/
int gsmtap_source_add_sink(struct gsmtap_inst *gti)
{
- int fd, rc;
-
- fd = gsmtap_source_add_sink_fd(gsmtap_inst_fd2(gti));
- if (fd < 0)
- return fd;
-
- if (gti->osmo_io_mode) {
- struct osmo_fd *sink_ofd;
-
- sink_ofd = >sink_ofd;
- sink_ofd->fd = fd;
- sink_ofd->when = OSMO_FD_READ;
- sink_ofd->cb = gsmtap_sink_fd_cb;
-
- rc = osmo_fd_register(sink_ofd);
- if (rc < 0) {
- close(fd);
- return rc;
- }
- }
-
- return fd;
+ return gti->sink_fd = gsmtap_source_add_sink_fd(gsmtap_inst_fd2(gti));
}
/* Registered in Osmo IO as a no-op to set the write callback. */
@@ -524,7 +487,7 @@
gti->osmo_io_mode = ofd_wq_mode;
/* Still using the wq member for its 'fd' field only, since we are
keeping it for now, anyways */
gti->wq.bfd.fd = fd;
- gti->sink_ofd.fd = -1;
+ gti->sink_fd = -1;
if (ofd_wq_mode) {
gti->out = osmo_iofd_setup(gti, gti->wq.bfd.fd,
"gsmtap_inst.io_fd", OSMO_IO_FD_MODE_READ_WRITE, _ops, NULL);
@@ -564,10 +527,11 @@
if (gti->osmo_io_mode) {
osmo_iofd_free(gti->out);
- if (gti->sink_ofd.fd != -1) {
- osmo_fd_unregister(>sink_ofd);
- close(gti->sink_ofd.fd);
+ if (gti->sink_fd != -1) {
+ close(gti->sink_fd);
+ gti->sink_fd = -1;
}
+
}
talloc_free(gti);
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34881?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I4025920d5f62d17133e9b5fe81cd34a88c4f20b5
Gerrit-Change-Number: 34881
Gerrit-PatchSet: 5
Gerrit-Owner: arehbein
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
[M] Change in libosmocore[master]: gsmtap_util: Simplify sink
Attention is currently required from: arehbein. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34881?usp=email ) Change subject: gsmtap_util: Simplify sink .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34881?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I4025920d5f62d17133e9b5fe81cd34a88c4f20b5 Gerrit-Change-Number: 34881 Gerrit-PatchSet: 5 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Attention: arehbein Gerrit-Comment-Date: Wed, 15 Nov 2023 21:29:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in pysim[master]: ts_31_102: correct name of EF_ePDGId
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35024?usp=email ) Change subject: ts_31_102: correct name of EF_ePDGId .. ts_31_102: correct name of EF_ePDGId In 31.102 v17.10, file 6ff3 is called "EF_ePDGId". Adjust the spelling to match. Change-Id: I2c27a7f325f75274e2110eb312b623cf9e7dab47 --- M pySim/ts_31_102.py 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index 738f107..0fcf883 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -880,7 +880,7 @@ 'IPv4': HexAdapter(GreedyBytes), 'IPv6': HexAdapter(GreedyBytes)})) -def __init__(self, fid='6ff3', sfid=None, name='EF.eDPDGId', desc='Home ePDG Identifier', **kwargs): +def __init__(self, fid='6ff3', sfid=None, name='EF.ePDGId', desc='Home ePDG Identifier', **kwargs): super().__init__(fid, sfid=sfid, name=name, desc=desc, **kwargs) self._tlv = EF_ePDGId.ePDGId -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35024?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2c27a7f325f75274e2110eb312b623cf9e7dab47 Gerrit-Change-Number: 35024 Gerrit-PatchSet: 2 Gerrit-Owner: iw0 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[S] Change in pysim[master]: ts_31_102: correct name of EF_ePDGId
Attention is currently required from: iw0. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35024?usp=email ) Change subject: ts_31_102: correct name of EF_ePDGId .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35024?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2c27a7f325f75274e2110eb312b623cf9e7dab47 Gerrit-Change-Number: 35024 Gerrit-PatchSet: 2 Gerrit-Owner: iw0 Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: iw0 Gerrit-Comment-Date: Wed, 15 Nov 2023 21:28:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: LAPD: Always update N(R) in pending TX frames if V(R) is incremented
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/34984?usp=email )
Change subject: LAPD: Always update N(R) in pending TX frames if V(R) is
incremented
..
LAPD: Always update N(R) in pending TX frames if V(R) is incremented
The outcome of the update function is still used to indicate if an RR
frame must be sent or not. Only if there is no I frame in the TX queue,
RR frame must be sent.
Related: OS#4074
Change-Id: I71676c709878105bfd18b9370fecc61b92796a6f
---
M src/gsm/lapdm.c
M src/isdn/lapd_core.c
2 files changed, 25 insertions(+), 8 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c
index 86dc242..43f5662 100644
--- a/src/gsm/lapdm.c
+++ b/src/gsm/lapdm.c
@@ -658,7 +658,8 @@
LAPDm_CTRL_PF_BIT(msg->l2h[1]));
rc = 0;
} else if (LAPDm_CTRL_is_S(msg->l2h[1])) {
- LOGDL(dl, LOGL_ERROR, "Supervisory frame in queue, this
shouldn't happen\n");
+ msg->l2h[1] = LAPDm_CTRL_S(dl->v_recv,
LAPDm_CTRL_S_BITS(msg->l2h[1]),
+
LAPDm_CTRL_PF_BIT(msg->l2h[1]));
}
}
diff --git a/src/isdn/lapd_core.c b/src/isdn/lapd_core.c
index e352189..57a0225 100644
--- a/src/isdn/lapd_core.c
+++ b/src/isdn/lapd_core.c
@@ -1525,6 +1525,7 @@
uint8_t ns = lctx->n_send;
int length = lctx->length;
int rc;
+ bool i_frame_in_queue = false;
LOGDL(dl, LOGL_INFO, "I received in state %s on SAPI(%u)\n",
lapd_state_name(dl->state), lctx->sapi);
@@ -1615,6 +1616,13 @@
dl->v_recv = inc_mod(dl->v_recv, dl->v_range);
LOGDL(dl, LOGL_INFO, "incrementing V(R) to %u\n", dl->v_recv);
+ /* Update all pending frames in the queue to the new V(R) state. */
+ if (dl->update_pending_frames) {
+ rc = dl->update_pending_frames(lctx);
+ if (!rc)
+ i_frame_in_queue = true;
+ }
+
/* 5.5.3.1: Acknowlege all transmitted frames up the the N(R)-1 */
lapd_acknowledge(lctx); /* V(A) is also set here */
@@ -1680,13 +1688,7 @@
if (!dl->own_busy) {
/* NOTE: V(R) is already set above */
rc = lapd_send_i(dl, __LINE__, false);
-
- /* if update_pending_iframe returns 0 it updated
-* the lapd header of an iframe in the tx queue */
- if (rc && dl->update_pending_frames)
- rc = dl->update_pending_frames(lctx);
-
- if (rc) {
+ if (rc && !i_frame_in_queue) {
LOGDL(dl, LOGL_INFO, "we are not busy and have
no pending data, "
"send RR\n");
/* Send RR with F=0 */
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34984?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I71676c709878105bfd18b9370fecc61b92796a6f
Gerrit-Change-Number: 34984
Gerrit-PatchSet: 5
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
[M] Change in libosmocore[master]: LAPD: Prepare lapd_send_i() for RTS support
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/34982?usp=email )
Change subject: LAPD: Prepare lapd_send_i() for RTS support
..
LAPD: Prepare lapd_send_i() for RTS support
When RTS is used, lapd_send_i() is called very frequently. (for every
PH-READY-TO-SEND primitive) The logging output can be suppressed in this
case.
As there is no complete lctx (lapd context) when calling lapd_send_i()
at RTS, take the stored lctx.
Related: OS#4074
Change-Id: I3109b7aa15c0f75f4a7458fc1c5d0ce633100f76
---
M src/isdn/lapd_core.c
1 file changed, 40 insertions(+), 20 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/src/isdn/lapd_core.c b/src/isdn/lapd_core.c
index 5674c66..be45a95 100644
--- a/src/isdn/lapd_core.c
+++ b/src/isdn/lapd_core.c
@@ -108,7 +108,7 @@
static void lapd_t200_cb(void *data);
static void lapd_t203_cb(void *data);
-static int lapd_send_i(struct lapd_msg_ctx *lctx, int line);
+static int lapd_send_i(struct lapd_datalink *dl, int line, bool rts);
static int lapd_est_req(struct osmo_dlsap_prim *dp, struct lapd_msg_ctx *lctx);
/* UTILITY FUNCTIONS */
@@ -1242,7 +1242,7 @@
/* enter multiple-frame-established state */
lapd_dl_newstate(dl, LAPD_STATE_MF_EST);
/* send outstanding frames, if any (resume / reconnect) */
- lapd_send_i(lctx, __LINE__);
+ lapd_send_i(dl, __LINE__, false);
/* send notification to L3 */
rc = send_dl_simple(PRIM_DL_EST, PRIM_OP_CONFIRM, lctx);
msgb_free(msg);
@@ -1365,7 +1365,7 @@
lapd_dl_newstate(dl, LAPD_STATE_MF_EST);
}
/* Send message, if possible due to acknowledged data */
- lapd_send_i(lctx, __LINE__);
+ lapd_send_i(dl, __LINE__, false);
break;
case LAPD_S_RNR:
@@ -1402,7 +1402,7 @@
LOGDL(dl, LOGL_INFO, "RNR not polling/final state
received\n");
/* Send message, if possible due to acknowledged data */
- lapd_send_i(lctx, __LINE__);
+ lapd_send_i(dl, __LINE__, false);
break;
case LAPD_S_REJ:
@@ -1487,8 +1487,8 @@
/* FIXME: 5.5.4.2 2) */
- /* Send message, if possible due to acknowledged data */
- lapd_send_i(lctx, __LINE__);
+ /* Send message, if possible due to acknowledged data and new
V(S) and V(A). */
+ lapd_send_i(dl, __LINE__, false);
break;
default:
@@ -1590,7 +1590,7 @@
lapd_acknowledge(lctx); /* V(A) is also set here */
/* Send message, if possible due to acknowledged data */
- lapd_send_i(lctx, __LINE__);
+ lapd_send_i(dl, __LINE__, false);
return 0;
}
@@ -1664,7 +1664,7 @@
/* check if we are not in own receiver busy */
if (!dl->own_busy) {
/* NOTE: V(R) is already set above */
- rc = lapd_send_i(lctx, __LINE__);
+ rc = lapd_send_i(dl, __LINE__, false);
/* if update_pending_iframe returns 0 it updated
* the lapd header of an iframe in the tx queue */
@@ -1687,7 +1687,7 @@
}
/* Send message, if possible due to acknowledged data */
- lapd_send_i(lctx, __LINE__);
+ lapd_send_i(dl, __LINE__, false);
return rc;
}
@@ -1825,15 +1825,15 @@
msgb_enqueue(>send_queue, msg);
/* Send message, if possible */
- lapd_send_i(>lctx, __LINE__);
+ lapd_send_i(dl, __LINE__, false);
return 0;
}
/* Send next I frame from queued/buffered data */
-static int lapd_send_i(struct lapd_msg_ctx *lctx, int line)
+static int lapd_send_i(struct lapd_datalink *dl, int line, bool rts)
{
- struct lapd_datalink *dl = lctx->dl;
+ struct lapd_msg_ctx *lctx = >lctx;
uint8_t k = dl->k;
uint8_t h;
struct msgb *msg;
@@ -1841,18 +1841,20 @@
int rc = - 1; /* we sent nothing */
struct lapd_msg_ctx nctx;
-
- LOGDL(dl, LOGL_INFO, "%s() called from line %d\n", __func__, line);
+ if (!rts)
+ LOGDL(dl, LOGL_INFO, "%s() called from line %d\n", __func__,
line);
next_frame:
if (dl->peer_busy) {
- LOGDL(dl, LOGL_INFO, "peer busy, not sending\n");
+ if (!rts)
+ LOGDL(dl, LOGL_INFO, "Peer busy, not sending.\n");
return rc;
}
if (dl->state == LAPD_STATE_TIMER_RECOV) {
- LOGDL(dl, LOGL_INFO, "timer recovery, not sending\n");
+ if (!rts)
+ LOGDL(dl, LOGL_INFO, "Timer recovery, not sending.\n");
[S] Change in libosmocore[master]: LAPD: Flush TX queue, if remote peer enters busy condition or rejects
laforge has submitted this change. (
https://gerrit.osmocom.org/c/libosmocore/+/34983?usp=email )
Change subject: LAPD: Flush TX queue, if remote peer enters busy condition or
rejects
..
LAPD: Flush TX queue, if remote peer enters busy condition or rejects
In case of a busy condition or a reject (sequence error) from the remove
peer, the messages in the TX queue are obsolete and will be flushed.
Related: OS#4074
Change-Id: Iaaf9aaabb958ef889e252ddd0026ff82cfac981f
---
M src/isdn/lapd_core.c
1 file changed, 29 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
diff --git a/src/isdn/lapd_core.c b/src/isdn/lapd_core.c
index be45a95..e352189 100644
--- a/src/isdn/lapd_core.c
+++ b/src/isdn/lapd_core.c
@@ -169,12 +169,17 @@
}
}
-static void lapd_dl_flush_tx(struct lapd_datalink *dl)
+static void lapd_dl_flush_tx_queue(struct lapd_datalink *dl)
{
struct msgb *msg;
while ((msg = msgb_dequeue(>tx_queue)))
msgb_free(msg);
+}
+
+static void lapd_dl_flush_tx(struct lapd_datalink *dl)
+{
+ lapd_dl_flush_tx_queue(dl);
lapd_dl_flush_hist(dl);
}
@@ -1376,6 +1381,10 @@
/* 5.5.5 */
/* Set peer receiver busy condition */
dl->peer_busy = 1;
+ /* Flush pending messages in TX queue. */
+ lapd_dl_flush_tx_queue(dl);
+ /* stop Timer T200 */
+ lapd_stop_t200(dl);
if (lctx->p_f) {
if (lctx->cr == dl->cr.rem2loc.cmd) {
@@ -1416,6 +1425,8 @@
dl->peer_busy = 0;
/* V(S) and V(A) to the N(R) in the REJ frame */
dl->v_send = dl->v_ack = lctx->n_recv;
+ /* Flush pending messages in TX queue. */
+ lapd_dl_flush_tx_queue(dl);
/* stop Timer T200 */
lapd_stop_t200(dl);
/* 5.5.3.2 */
@@ -1452,6 +1463,8 @@
dl->peer_busy = 0;
/* V(S) and V(A) to the N(R) in the REJ frame */
dl->v_send = dl->v_ack = lctx->n_recv;
+ /* Flush pending messages in TX queue. */
+ lapd_dl_flush_tx_queue(dl);
/* stop Timer T200 */
lapd_stop_t200(dl);
/* 5.5.7 Clear timer recovery condition */
@@ -1461,6 +1474,8 @@
dl->peer_busy = 0;
/* V(S) and V(A) to the N(R) in the REJ frame */
dl->v_send = dl->v_ack = lctx->n_recv;
+ /* Flush pending messages in TX queue. */
+ lapd_dl_flush_tx_queue(dl);
/* 5.5.3.2 */
if (lctx->cr == dl->cr.rem2loc.cmd && lctx->p_f) {
if (!dl->own_busy && !dl->seq_err_cond) {
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34983?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Iaaf9aaabb958ef889e252ddd0026ff82cfac981f
Gerrit-Change-Number: 34983
Gerrit-PatchSet: 5
Gerrit-Owner: jolly
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
[M] Change in libosmocore[master]: LAPD: Prepare lapd_send_i() for RTS support
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34982?usp=email ) Change subject: LAPD: Prepare lapd_send_i() for RTS support .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34982?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3109b7aa15c0f75f4a7458fc1c5d0ce633100f76 Gerrit-Change-Number: 34982 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 15 Nov 2023 21:28:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: LAPD: Flush TX queue, if remote peer enters busy condition or rejects
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34983?usp=email ) Change subject: LAPD: Flush TX queue, if remote peer enters busy condition or rejects .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34983?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iaaf9aaabb958ef889e252ddd0026ff82cfac981f Gerrit-Change-Number: 34983 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 15 Nov 2023 21:28:14 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: LAPD: Always update N(R) in pending TX frames if V(R) is incremented
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34984?usp=email ) Change subject: LAPD: Always update N(R) in pending TX frames if V(R) is incremented .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34984?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I71676c709878105bfd18b9370fecc61b92796a6f Gerrit-Change-Number: 34984 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 15 Nov 2023 21:28:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmocore[master]: LAPDm: Add support for RTS based polling
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email ) Change subject: LAPDm: Add support for RTS based polling .. Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ebe83f829d7751ea9de1d90eb478c7a628db64c Gerrit-Change-Number: 34986 Gerrit-PatchSet: 9 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 15 Nov 2023 21:28:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmocore[master]: LAPD: Add support for RTS based polling and T200
Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34985?usp=email ) Change subject: LAPD: Add support for RTS based polling and T200 .. Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34985?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib961b5a44911b99b0487641533301749c0286995 Gerrit-Change-Number: 34985 Gerrit-PatchSet: 6 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 15 Nov 2023 21:27:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[L] Change in osmo-bsc[master]: Introduce per-BTS timers, RLC timer commands
Attention is currently required from: arehbein, fixeria, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email ) Change subject: Introduce per-BTS timers, RLC timer commands .. Patch Set 12: (2 comments) File src/osmo-bsc/bts_init.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/06a4a40c_5c500598 PS12, Line 41: _templates > I am wondering why `_templates`? `_def` or `_defaults` maybe? (I think the term "template" is fine and accurate, i assume no vty edits these) File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/31878/comment/f216e673_fd0b3aa1 PS3, Line 2068: > (explanation in comment above https://gerrit.osmocom. […] In general, the tdefs API was made modular with flexible re-use in mind. I havent gone into the smallest details of reading this -- I might find a simplification here or there but in general, I think that this is the way to go: plug tdefs API functions to a custom vty "frontend", tailored to per-BTS timers, which is not provided by the tdefs API in itself. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2c24110d8c977d6cc74c3c8e77bcc709ad9d2675 Gerrit-Change-Number: 31878 Gerrit-PatchSet: 12 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 15 Nov 2023 19:43:05 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment
[L] Change in osmo-bsc[master]: Introduce per-BTS timers, RLC timer commands
Attention is currently required from: arehbein, pespin.
neels has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email )
Change subject: Introduce per-BTS timers, RLC timer commands
..
Patch Set 12: Code-Review-1
(1 comment)
Patchset:
PS12:
Hmm, the task this patch has is actually quite difficult, for these reasons:
- the osmo_tdefs API was implemented with T1234 and X1234 in mind, but not
N1234. Looks like we won't get around adding another namespace for N, in the
libosmocore tdef API itself. Mainly because T3101 and N3101 collide. (If it's
only this one maybe we want an ugly workaround instead? T23101 is N3101?).
Adding the 'N' category is a separate discussion, Vadim and I discussed it a
bit in PM and let's say there's potential for diverse opinions.
- the osmo_tdefs API was implemented with a single global timer config in mind,
not individual per-object timers. The tdefs API is modular enough to be helpful
in implementing this, so no problem here, just many choices to be made.
- confusion: we already have a global timer 'net' / 'T3101'; now we are also
adding a per-BTS T3101 as well as N3101. So per-BTS for GPRS, but only global T
for CS. And these seemingly identical T3101 items do not interact...? ("are you
sure they are separate?" / "did you really use the correct T3101?"...)
I'll not dive into per-line comments now, but I'd like to already say that we
need to still work on this patch (and it's not arehbein's fault)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31878?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I2c24110d8c977d6cc74c3c8e77bcc709ad9d2675
Gerrit-Change-Number: 31878
Gerrit-PatchSet: 12
Gerrit-Owner: arehbein
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-Reviewer: pespin
Gerrit-Attention: arehbein
Gerrit-Attention: pespin
Gerrit-Comment-Date: Wed, 15 Nov 2023 19:27:18 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
[S] Change in libosmocore[master]: LAPD: Always update N(R) in pending TX frames if V(R) is incremented
Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34984?usp=email ) Change subject: LAPD: Always update N(R) in pending TX frames if V(R) is incremented .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34984?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I71676c709878105bfd18b9370fecc61b92796a6f Gerrit-Change-Number: 34984 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 15 Nov 2023 16:37:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: LAPD: Flush TX queue, if remote peer enters busy condition or rejects
Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34983?usp=email ) Change subject: LAPD: Flush TX queue, if remote peer enters busy condition or rejects .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34983?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iaaf9aaabb958ef889e252ddd0026ff82cfac981f Gerrit-Change-Number: 34983 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 15 Nov 2023 16:36:55 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in libosmocore[master]: LAPD: Prepare lapd_send_i() for RTS support
Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34982?usp=email ) Change subject: LAPD: Prepare lapd_send_i() for RTS support .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34982?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3109b7aa15c0f75f4a7458fc1c5d0ce633100f76 Gerrit-Change-Number: 34982 Gerrit-PatchSet: 4 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 15 Nov 2023 16:36:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmo-bts[master]: Use polling based LAPDm with frame numbers
Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35007?usp=email ) Change subject: Use polling based LAPDm with frame numbers .. Patch Set 3: (2 comments) File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/35007/comment/463ddebd_8bae64ec PS2, Line 1975: (fn + GSM_MAX_FN - 1) % GSM_MAX_FN Feel free to use `GSM_TDMA_FN_SUB(fn, 1)` here. File src/common/oml.c: https://gerrit.osmocom.org/c/osmo-bts/+/35007/comment/ab43d4eb_54f3283e PS3, Line 686: #if 0 IMO, we should at least log a `NOTICE` message here saying that the T200 values from the BSC and ignored and not applied. Also, a comment in code explaining why we ignore these values would be very welcome. Thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35007?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: Ic6d7902b13cf491daaa8752db78f9875387aeffd Gerrit-Change-Number: 35007 Gerrit-PatchSet: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 15 Nov 2023 16:33:07 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: bsc: Make socket queue max. length configurable
Attention is currently required from: arehbein, dexter, laforge, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33892?usp=email ) Change subject: bsc: Make socket queue max. length configurable .. Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33892?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic5f19f4613bccaf582997a4d02b689adee083a0b Gerrit-Change-Number: 33892 Gerrit-PatchSet: 9 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: arehbein Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 15 Nov 2023 16:31:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in libosmocore[master]: LAPDm: Add a flag to enable suppression of subsequent REJ frame
Attention is currently required from: jolly. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35015?usp=email ) Change subject: LAPDm: Add a flag to enable suppression of subsequent REJ frame .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35015?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I93994dbbd1fc2c9edb8f3015c6b18ecd0fce0565 Gerrit-Change-Number: 35015 Gerrit-PatchSet: 1 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: jolly Gerrit-Comment-Date: Wed, 15 Nov 2023 16:27:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-ci[master]: obs-mirror: rsync over from remote server via rsync
Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35016?usp=email ) Change subject: obs-mirror: rsync over from remote server via rsync .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35016?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id490690394db9eb773f945ad4d7e65fe7fd5e17a Gerrit-Change-Number: 35016 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 15 Nov 2023 16:25:29 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: bsc: Make socket queue max. length configurable
Attention is currently required from: arehbein, daniel, dexter, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33892?usp=email ) Change subject: bsc: Make socket queue max. length configurable .. Patch Set 9: Code-Review+1 (1 comment) File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/33892/comment/76e07588_bf52087d PS9, Line 2491: 2147483646 For those wondering where this number is coming from, it's `INT_MAX - 1`. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33892?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic5f19f4613bccaf582997a4d02b689adee083a0b Gerrit-Change-Number: 33892 Gerrit-PatchSet: 9 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-Attention: arehbein Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: daniel Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 15 Nov 2023 16:25:03 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: bsc: Make socket queue max. length configurable
Attention is currently required from: daniel, dexter, laforge, pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33892?usp=email ) Change subject: bsc: Make socket queue max. length configurable .. Patch Set 9: (2 comments) File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/33892/comment/8b83f94b_9fdb9ecd PS8, Line 2499: size_t to = (net->pcu_sock_wqueue_len_max = atoi(argv[0])); > Ack Done https://gerrit.osmocom.org/c/osmo-bsc/+/33892/comment/36ff37df_b06c4044 PS8, Line 2503: LOGP(DPCU, LOGL_INFO, "Have dropped %zu messages due to shortened max. message queue size (from: %zu to %zu)\n", > ACK Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33892?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic5f19f4613bccaf582997a4d02b689adee083a0b Gerrit-Change-Number: 33892 Gerrit-PatchSet: 9 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: daniel Gerrit-Attention: dexter Gerrit-Comment-Date: Wed, 15 Nov 2023 15:45:27 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: daniel Gerrit-MessageType: comment
[S] Change in osmo-bsc[master]: bsc: Make socket queue max. length configurable
Attention is currently required from: arehbein, dexter, laforge, pespin. Hello Jenkins Builder, dexter, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/33892?usp=email to look at the new patch set (#9). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: bsc: Make socket queue max. length configurable .. bsc: Make socket queue max. length configurable Title refers to the maximum length of the osmo_wqueue used for the PCU socket connection. Related: OS#5774 Change-Id: Ic5f19f4613bccaf582997a4d02b689adee083a0b --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_init.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/pcu_sock.c 4 files changed, 44 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/33892/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33892?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic5f19f4613bccaf582997a4d02b689adee083a0b Gerrit-Change-Number: 33892 Gerrit-PatchSet: 9 Gerrit-Owner: arehbein Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-Attention: arehbein Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Attention: dexter Gerrit-MessageType: newpatchset
[S] Change in osmo-ci[master]: obs-mirror: rsync over from remote server via rsync
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/35016?usp=email ) Change subject: obs-mirror: rsync over from remote server via rsync .. obs-mirror: rsync over from remote server via rsync We no longer run the archive on the same machine/lxc as the normal downloads server Change-Id: Id490690394db9eb773f945ad4d7e65fe7fd5e17a Related: OS#6257 --- M contrib/obs-mirror/obs-mirror.sh 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/16/35016/1 diff --git a/contrib/obs-mirror/obs-mirror.sh b/contrib/obs-mirror/obs-mirror.sh index 03e307e..85336ab 100755 --- a/contrib/obs-mirror/obs-mirror.sh +++ b/contrib/obs-mirror/obs-mirror.sh @@ -20,7 +20,7 @@ # base directory on the local side BASE_DIR="/downloads/obs-mirror/" # sync remote where to find the osmocom packages -REMOTE="/downloads/home/packages/web-files/osmocom:" +REMOTE="downloads.osmocom.org::packages/osmocom:" cd "$BASE_DIR" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35016?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id490690394db9eb773f945ad4d7e65fe7fd5e17a Gerrit-Change-Number: 35016 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
[M] Change in libosmocore[master]: LAPD: Add support for RTS based polling and T200
Attention is currently required from: laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34985?usp=email ) Change subject: LAPD: Add support for RTS based polling and T200 .. Patch Set 6: (3 comments) File include/osmocom/isdn/lapd_core.h: https://gerrit.osmocom.org/c/libosmocore/+/34985/comment/434a3ec9_3d1e59da PS5, Line 155: unsigned > you are modifying a public data structure, which is ABI breakage. […] Done File src/isdn/lapd_core.c: https://gerrit.osmocom.org/c/libosmocore/+/34985/comment/7e619430_778d63ce PS5, Line 220: / > handle how? This requires more ddocumentation. […] Done https://gerrit.osmocom.org/c/libosmocore/+/34985/comment/f67e0606_6343fc1c PS5, Line 399: dl->flags = flags; > I guess it would leads to undefined behaviour if somebody called > lapd_dl_set_flags to enable RTS mod […] done, also moved the timer state to an enum, so it is not mixed with the flags that define behavior of LAPD. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34985?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib961b5a44911b99b0487641533301749c0286995 Gerrit-Change-Number: 34985 Gerrit-PatchSet: 6 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 15 Nov 2023 13:58:22 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[M] Change in libosmocore[master]: LAPDm: Add support for RTS based polling
Attention is currently required from: laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email ) Change subject: LAPDm: Add support for RTS based polling .. Patch Set 9: (4 comments) File include/osmocom/gsm/lapdm.h: https://gerrit.osmocom.org/c/libosmocore/+/34986/comment/550c0b77_938b5c9a PS8, Line 38: uint32_t t200_timeout; /*!< T200 timeout frame number */ > also breaks ABI, see my comment regarding TODO-RELEASE in previous patch Done File src/gsm/lapdm.c: https://gerrit.osmocom.org/c/libosmocore/+/34986/comment/a994a5b8_fb4e3b8e PS8, Line 355:uint8_t chan_nr, uint8_t link_id, uint8_t pad) > unrelated cosmetic change? Done https://gerrit.osmocom.org/c/libosmocore/+/34986/comment/5d9fc761_bc350e9d PS8, Line 1617: void lapdm_entity_set_t200_fn(struct lapdm_entity *le, int *t200_fn) > this misses explanation of what the int t200_fn array is supposed to contain. > […] Done https://gerrit.osmocom.org/c/libosmocore/+/34986/comment/4fe72b97_23274def PS8, Line 1625: T200 FN timer > The reader should be educated what is a "T200 FN timer"? What are the > expected argument types? In wh […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ebe83f829d7751ea9de1d90eb478c7a628db64c Gerrit-Change-Number: 34986 Gerrit-PatchSet: 9 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 15 Nov 2023 13:58:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[M] Change in libosmocore[master]: LAPDm: Add an extra queue for UI frames
Attention is currently required from: laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34987?usp=email ) Change subject: LAPDm: Add an extra queue for UI frames .. Patch Set 9: (2 comments) File include/osmocom/gsm/lapdm.h: https://gerrit.osmocom.org/c/libosmocore/+/34987/comment/026bd399_0400e9ad PS8, Line 37: struct llist_head tx_ui_queue; /*!< UI frames to L1 */ > TODO-RELEASE due to ABI breakage Done File src/gsm/lapdm.c: https://gerrit.osmocom.org/c/libosmocore/+/34987/comment/d6af0bf0_1a13513a PS8, Line 295: while ((msg = msgb_dequeue(>tx_ui_queue))) > this function reimplements the msgb_queue_free() function which we already > have in msgb. […] removed. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34987?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I00c8ee73be8b7c564a4dee3fca3e893484f567da Gerrit-Change-Number: 34987 Gerrit-PatchSet: 9 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Attention: laforge Gerrit-Comment-Date: Wed, 15 Nov 2023 13:58:13 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
[S] Change in libosmocore[master]: LAPDm: Add a flag to enable suppression of subsequent REJ frame
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/35015?usp=email )
Change subject: LAPDm: Add a flag to enable suppression of subsequent REJ frame
..
LAPDm: Add a flag to enable suppression of subsequent REJ frame
This behaviour was default in earlier versions of LAPDm/LAPD. Because it
is only required for osmocom-bb, a flag is added to enable it there.
Related: OS#5969
Change-Id: I93994dbbd1fc2c9edb8f3015c6b18ecd0fce0565
---
M include/osmocom/gsm/lapdm.h
M include/osmocom/isdn/lapd_core.h
M src/gsm/lapdm.c
M src/isdn/lapd_core.c
4 files changed, 19 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/15/35015/1
diff --git a/include/osmocom/gsm/lapdm.h b/include/osmocom/gsm/lapdm.h
index 2777dec..0f616db 100644
--- a/include/osmocom/gsm/lapdm.h
+++ b/include/osmocom/gsm/lapdm.h
@@ -50,6 +50,7 @@
#define LAPDM_ENT_F_EMPTY_FRAME0x0001
#define LAPDM_ENT_F_POLLING_ONLY 0x0002
+#define LAPDM_ENT_F_DROP_2ND_REJ 0x0004
/*! a LAPDm Entity */
struct lapdm_entity {
diff --git a/include/osmocom/isdn/lapd_core.h b/include/osmocom/isdn/lapd_core.h
index 776d4f4..1e010af 100644
--- a/include/osmocom/isdn/lapd_core.h
+++ b/include/osmocom/isdn/lapd_core.h
@@ -86,6 +86,7 @@
/*! lapd_flags */
#define LAPD_F_RTS 0x0001
+#define LAPD_F_DROP_2ND_REJ0x0002
/*! LAPD T200 state in RTS mode */
enum lapd_t200_rts {
diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c
index eba6fe7..2426cc1 100644
--- a/src/gsm/lapdm.c
+++ b/src/gsm/lapdm.c
@@ -1634,6 +1634,8 @@
/* Set flags at LAPD. */
if (le->flags & LAPDM_ENT_F_POLLING_ONLY)
dl_flags |= LAPD_F_RTS;
+ if (le->flags & LAPDM_ENT_F_DROP_2ND_REJ)
+ dl_flags |= LAPD_F_DROP_2ND_REJ;
for (i = 0; i < ARRAY_SIZE(le->datalink); i++) {
dl = >datalink[i];
diff --git a/src/isdn/lapd_core.c b/src/isdn/lapd_core.c
index 3865bfc..925f209 100644
--- a/src/isdn/lapd_core.c
+++ b/src/isdn/lapd_core.c
@@ -1633,9 +1633,8 @@
ns, dl->v_recv, lapd_state_name(dl->state));
/* discard data */
msgb_free(msg);
- if (dl->seq_err_cond != 1) {
- /* FIXME: help me understand what exactly todo here
- */
+ /* Send reject, but suppress second reject if
LAPD_F_DROP_2ND_REJ flag is set. */
+ if (dl->seq_err_cond != 1 || !(dl->lapd_flags &
LAPD_F_DROP_2ND_REJ)) {
dl->seq_err_cond = 1;
lapd_send_rej(lctx, lctx->p_f);
} else {
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35015?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I93994dbbd1fc2c9edb8f3015c6b18ecd0fce0565
Gerrit-Change-Number: 35015
Gerrit-PatchSet: 1
Gerrit-Owner: jolly
Gerrit-MessageType: newchange
[M] Change in libosmocore[master]: LAPD: Add support for RTS based polling and T200
Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/34985?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: LAPD: Add support for RTS based polling and T200 .. LAPD: Add support for RTS based polling and T200 The T200 timer is started when the current frame is polled at PH-READY-TO-SEND event. A flag is used to enable this feature. The user of LAPD core must track frame numbers to check the timeout condition. Then it must call the external timeout function. Related: OS#4074 Change-Id: Ib961b5a44911b99b0487641533301749c0286995 --- M TODO-RELEASE M include/osmocom/isdn/lapd_core.h M src/isdn/lapd_core.c M src/isdn/libosmoisdn.map 4 files changed, 135 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/34985/6 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34985?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib961b5a44911b99b0487641533301749c0286995 Gerrit-Change-Number: 34985 Gerrit-PatchSet: 6 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[M] Change in libosmocore[master]: LAPDm: Add support for RTS based polling
Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email to look at the new patch set (#9). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: LAPDm: Add support for RTS based polling .. LAPDm: Add support for RTS based polling The lower layer must set the 'POLLING_ONLY' flag and provide frame number when polling a frame. If T200 is pending, it is started with a timeout frame number in advance to given frame number. The lower layer must call lapdm_t200_fn() after a frame has been received or if a frame has not been received. Also it must be called after a TCH frame has been received. LAPDm uses this to check the T200 timeout condition. A new function is used to set the frame number based timeout values. Related: OS#4074 Change-Id: I6ebe83f829d7751ea9de1d90eb478c7a628db64c --- M TODO-RELEASE M include/osmocom/gsm/lapdm.h M src/gsm/lapdm.c M src/gsm/libosmogsm.map 4 files changed, 175 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/86/34986/9 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6ebe83f829d7751ea9de1d90eb478c7a628db64c Gerrit-Change-Number: 34986 Gerrit-PatchSet: 9 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[M] Change in libosmocore[master]: LAPDm: Add an extra queue for UI frames
Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/34987?usp=email to look at the new patch set (#9). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: LAPDm: Add an extra queue for UI frames .. LAPDm: Add an extra queue for UI frames The extra queue is used to transmit the UI frame only when there is no frame in the regular TX queue. This allows to give LAPD frames prioity over UI frame. Related: OS#4074 Change-Id: I00c8ee73be8b7c564a4dee3fca3e893484f567da --- M TODO-RELEASE M include/osmocom/gsm/lapdm.h M src/gsm/lapdm.c 3 files changed, 52 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/87/34987/9 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34987?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I00c8ee73be8b7c564a4dee3fca3e893484f567da Gerrit-Change-Number: 34987 Gerrit-PatchSet: 9 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[M] Change in osmo-bts[master]: Use polling based LAPDm with frame numbers
Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/35007?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Use polling based LAPDm with frame numbers .. Use polling based LAPDm with frame numbers Osmo-bts uses the new polling based LAPDm implementation. The OML message NM_ATT_T200 is ignored, because T200 timeouts are set to the minimal response time. Longer timeouts would cause lower throughput in case of lost frames. Shorter timeouts would cause LAPDm to fail. Related: OS#4074 Change-Id: Ic6d7902b13cf491daaa8752db78f9875387aeffd --- M include/osmo-bts/bts.h M include/osmo-bts/oml.h M src/common/bts.c M src/common/l1sap.c M src/common/lchan.c M src/common/oml.c 6 files changed, 102 insertions(+), 72 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/07/35007/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35007?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: Ic6d7902b13cf491daaa8752db78f9875387aeffd Gerrit-Change-Number: 35007 Gerrit-PatchSet: 3 Gerrit-Owner: jolly Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Attention: jolly Gerrit-MessageType: newpatchset
[S] Change in osmo-ci[master]: obs-mirror: keep nightly builds for two years
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35014?usp=email ) Change subject: obs-mirror: keep nightly builds for two years .. obs-mirror: keep nightly builds for two years As we're moving the archive to a machine with sufficient storage, let's extend the time we keep an archive of nightly builds from one month to two years. Change-Id: Ic8529ee5679f15c4e4940a5f095374605c2e5c79 Related: OS#6257 --- M contrib/obs-mirror/rm-old-nightly-archives.sh 1 file changed, 15 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/obs-mirror/rm-old-nightly-archives.sh b/contrib/obs-mirror/rm-old-nightly-archives.sh index 485bf01..485788f 100755 --- a/contrib/obs-mirror/rm-old-nightly-archives.sh +++ b/contrib/obs-mirror/rm-old-nightly-archives.sh @@ -6,7 +6,7 @@ DRY=0 # Get removal date in seconds since epoch and display it -DATE_RM_SEC=$(expr $(date +%s) - 3600 \* 24 \* 32) +DATE_RM_SEC=$(expr $(date +%s) - 3600 \* 24 \* 365 \* 2) DATE_RM_STR=$(date -d "@$DATE_RM_SEC" +"%Y-%m-%d") echo "Removing nightly archives from $DATE_RM_STR and older (DRY=$DRY)" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35014?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic8529ee5679f15c4e4940a5f095374605c2e5c79 Gerrit-Change-Number: 35014 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged
[S] Change in osmo-ci[master]: obs-mirror: keep nightly builds for two years
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35014?usp=email ) Change subject: obs-mirror: keep nightly builds for two years .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35014?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic8529ee5679f15c4e4940a5f095374605c2e5c79 Gerrit-Change-Number: 35014 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 15 Nov 2023 12:47:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
