jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/34423?usp=email )
Change subject: ASCI: Ignore LAPD frames from MS, while the uplink is not active
......................................................................
ASCI: Ignore LAPD frames from MS, while the uplink is not active
Do not forward any message from the MS to LAPD while the uplink is not
active. If the MS did not recognize (fast enough) that the uplink is
free, it may continue to transmit LAPD frames. A reaction of LAPD is to
these frames is not desired and not required. If we react on them, we
will transmit LAPD response frames to the MS and this stops us from
sending UPLINK FREE messages.
Note: UPLINK FREE messages are repeated automatically until a different
message is transmitted.
Related: OS#5781
Change-Id: I5075115123055b2997481f56ddf473430a1dc9e3
---
M src/common/l1sap.c
1 file changed, 30 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/23/34423/1
diff --git a/src/common/l1sap.c b/src/common/l1sap.c
index 13d271e..1456761 100644
--- a/src/common/l1sap.c
+++ b/src/common/l1sap.c
@@ -1822,6 +1822,16 @@
if (check_for_first_ciphrd(lchan, data, len))
l1sap_tx_ciph_req(lchan->ts->trx, chan_nr, 1, 0);
+ /* Do not forward any message from the MS to LAPD while the uplink is not
+ * active. If the MS did not recognize (fast enough) that the uplink is
+ * free, it may continue to transmit LAPD frames. A reaction of LAPD is to
+ * these frames is not desired and not required. If we react on them, we
+ * will transmit LAPD response frames to the MS and this stops us from
+ * sending UPLINK FREE messages.
+ */
+ if (rsl_chan_rt_is_asci(lchan->rsl_chan_rt) && lchan->asci.talker_active != VGCS_TALKER_ACTIVE)
+ return 0;
+
/* SDCCH, SACCH and FACCH all go to LAPDm */
msgb_pull_to_l2(msg);
lapdm_phsap_up(&l1sap->oph, le);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34423?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: I5075115123055b2997481f56ddf473430a1dc9e3
Gerrit-Change-Number: 34423
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
Gerrit-MessageType: newchange
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34422?usp=email )
Change subject: OBS: fix generating wrong limesuite version
......................................................................
OBS: fix generating wrong limesuite version
Instead of using git-version-gen in all git repositories, only use it
where it is part of the repository. Use git directly to build the
version string otherwise. To fix generating the wrong version string for
limesuite, use "git describe --tags" instead of "git describe" as in
git-version-gen. This is needed because limesuite releases > 20.01 only
have lightweight (non-annotated) tags.
Fix for:
limesuite: WARNING: version from changelog (22.09.1-1) is higher than
version based on git tag (20.01.0.182-4828.202309140026), using
version from changelog (git tag not pushed yet?)
Change-Id: I00d97d5cd12b2938a002d3e5c8ada6503f976e36
---
M scripts/obs/lib/srcpkg.py
1 file changed, 50 insertions(+), 27 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/22/34422/1
diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py
index 13404a7..cffb961 100644
--- a/scripts/obs/lib/srcpkg.py
+++ b/scripts/obs/lib/srcpkg.py
@@ -24,38 +24,40 @@
lib.git.checkout(project, f"origin/{feed}")
-def get_git_version_gen_path(project):
- # Use git-version-gen in the project's repository if available
- repo_path = lib.git.get_repo_path(project)
- ret = f"{repo_path}/git-version-gen"
- if os.path.exists(ret):
- return ret
-
- # Use git-version-gen script from libosmocore.git as fallback
- print(f"{project}: has no git-version-gen, using the one from libosmocore")
- repo_path = lib.git.get_repo_path("libosmocore")
- ret = f"{repo_path}/git-version-gen"
- if not os.path.exists(ret):
- lib.git.clone("libosmocore")
- if os.path.exists(ret):
- return ret
-
- print(f"ERROR: {project}.git doesn't have a git-version-gen script and"
- " couldn't find libosmocore.git's copy of the script here either: "
- + ret)
- sys.exit(1)
-
-
def get_git_version(project):
""" :returns: the string from git-version-gen, e.g. '1.7.0.10-76bdb' """
repo_path = lib.git.get_repo_path(project)
- script_path = get_git_version_gen_path(project)
- ret = lib.run_cmd([script_path, "."], cwd=repo_path)
- if not ret.output:
- lib.exit_error_cmd(ret, "empty output from git-version-gen")
+ # Run git-version-gen if it is in the repository
+ script_path = f"{repo_path}/git-version-gen"
+ if os.path.exists(script_path):
+ ret = lib.run_cmd([script_path, "."], cwd=repo_path).output
+ if not ret:
+ lib.exit_error_cmd(ret, "empty output from git-version-gen")
+ return ret
- return ret.output
+ # Generate a version string similar to git-version-gen, but run use git
+ # describe --tags, so it works with non-annotated tags as well (needed for
+ # e.g. limesuite's tags).
+ pattern = lib.git.get_latest_tag_pattern(project)
+ pattern = pattern.replace("^", "", 1)
+ pattern = pattern.replace("$", "", -1)
+ ret = lib.run_cmd(["git", "describe",
+ "--abbrev=4",
+ "--tags",
+ f"--match={pattern}",
+ "HEAD"], cwd=repo_path).output.rstrip()
+
+ # Like git-version-gen:
+ # * Change the first '-' to '.'
+ # * Remove the 'g' in git describe's output string
+ # * Remove the leading 'v'
+ ret = ret.replace("-", ".", 1)
+ ret = ret.replace("-g", "-", 1)
+ if ret.startswith("v"):
+ ret = ret[1:]
+
+ return ret
def get_version_for_feed(project):
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34422?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: I00d97d5cd12b2938a002d3e5c8ada6503f976e36
Gerrit-Change-Number: 34422
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34356?usp=email )
Change subject: oml: ipacc: parse Object Version from SW Activated Report
......................................................................
Set Ready For Review
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34356?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: I39105096a6b29bd7e4fb15287653074527c3e024
Gerrit-Change-Number: 34356
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 14 Sep 2023 12:28:57 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: fixeria, pespin.
Hello Jenkins Builder, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bsc/+/34421?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review-1 by pespin, Verified+1 by Jenkins Builder
Change subject: bts_ipaccess_nanobts: clean up, use gsm_objclass2mo()
......................................................................
bts_ipaccess_nanobts: clean up, use gsm_objclass2mo()
Change-Id: Ic6c0dfe950459d07a8f506b5007a65fea1950c18
---
M src/osmo-bsc/bts_ipaccess_nanobts.c
1 file changed, 31 insertions(+), 128 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/21/34421/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34421?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: Ic6c0dfe950459d07a8f506b5007a65fea1950c18
Gerrit-Change-Number: 34421
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: fixeria.
Hello Jenkins Builder, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bsc/+/34357?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
The change is no longer submittable: Verified is unsatisfied now.
Change subject: oml: ipacc: fix sending hard-coded GPRS Cell attributes
......................................................................
oml: ipacc: fix sending hard-coded GPRS Cell attributes
Change-Id: I7d90ca3d6a660af8e953e890c7919194f5d297d2
Related: OS#4505
---
M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c
M tests/nanobts_omlattr/nanobts_omlattr_test.c
M tests/nanobts_omlattr/nanobts_omlattr_test.ok
3 files changed, 40 insertions(+), 26 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/57/34357/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34357?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: I7d90ca3d6a660af8e953e890c7919194f5d297d2
Gerrit-Change-Number: 34357
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset