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 <laforge(a)osmocom.org>
Gerrit-MessageType: newchange
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 <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Wed, 15 Nov 2023 13:58:22 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
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 <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Wed, 15 Nov 2023 13:58:18 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
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(&dl->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 <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Wed, 15 Nov 2023 13:58:13 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: comment
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_FRAME 0x0001
#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_REJ 0x0002
/*! 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 = &le->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 <andreas(a)eversberg.eu>
Gerrit-MessageType: newchange
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 <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-MessageType: newpatchset
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 <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-MessageType: newpatchset
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 <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-MessageType: newpatchset
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 <andreas(a)eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: jolly <andreas(a)eversberg.eu>
Gerrit-MessageType: newpatchset
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 <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged