Attention is currently required from: pespin.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36520?usp=email )
Change subject: fixup for re-est: do not succeed on acceptance fail
......................................................................
Patch Set 1:
(2 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-msc/+/36520/comment/38ec6d3f_8a242e2c
PS1, Line 18: Related: SYS#5130
> Fixes: ae98b97382285420ba81549bc874b9fea5e7daa9
never seen this header pointing at a commit hash before. "Fixes:" is about issue numbers. AFAIK we hardly ever use this header. I've never used it before and it has not been indicated that i should, so where is this coming from?
File src/libmsc/msc_a.c:
https://gerrit.osmocom.org/c/osmo-msc/+/36520/comment/1e89b76a_e1b1e176
PS1, Line 165: if (conn_accepted) {
> Can we please try refactoring this function? I see "if (conn_accepted)" spread like in 4 different p […]
the argument goes both ways. if you prefer the other way, then i guess you can suggest a refactoring. i'm not going to spend time on it, because IMHO this is bad style:
if (conn_accepted) {
update_counters(fi, true);
...
} else {
update_counters(fi, false);
...
}
instead of just
update_counters(fi, conn_accepted);
as we have now.
resolving because it's about code prior to this patch.
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36520?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I3679162143e8d7d8c0878de2102faa11eadfccfc
Gerrit-Change-Number: 36520
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 03 Apr 2024 23:27:07 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
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/osmo-msc/+/36520?usp=email )
Change subject: fixup for re-est: do not succeed on acceptance fail
......................................................................
Patch Set 1: Code-Review+1
(2 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-msc/+/36520/comment/db4f8ffe_cd2242fd
PS1, Line 18: Related: SYS#5130
Fixes: ae98b97382285420ba81549bc874b9fea5e7daa9
File src/libmsc/msc_a.c:
https://gerrit.osmocom.org/c/osmo-msc/+/36520/comment/ae0c33e2_bd6ef57a
PS1, Line 165: if (conn_accepted) {
Can we please try refactoring this function? I see "if (conn_accepted)" spread like in 4 different places now.
Without knowing this, code, looks like stuff could be moved around to really simplify the logic here.
That would have probably also helped back in time when the bug was introduced.
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36520?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I3679162143e8d7d8c0878de2102faa11eadfccfc
Gerrit-Change-Number: 36520
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 03 Apr 2024 19:03:28 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/36520?usp=email )
Change subject: fixup for re-est: do not succeed on acceptance fail
......................................................................
fixup for re-est: do not succeed on acceptance fail
Fix a bug introduced in commit
implement CM Re-Establish for voice calls
ae98b97382285420ba81549bc874b9fea5e7daa9
Neels Hofmeyr <neels(a)hofmeyr.de>
Thu Jul 29 22:40:59 2021 +0200
I6fa37d6ca9fcb1637742b40e37b68d67664c9b60
We should only succeed when conn_accepted == true!
Related: SYS#5130
Change-Id: I3679162143e8d7d8c0878de2102faa11eadfccfc
---
M src/libmsc/msc_a.c
1 file changed, 20 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/36520/1
diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c
index 70d9bf7..db1d998 100644
--- a/src/libmsc/msc_a.c
+++ b/src/libmsc/msc_a.c
@@ -182,7 +182,7 @@
if (msc_a->complete_layer3_type == COMPLETE_LAYER3_LU)
msc_a_put(msc_a, MSC_A_USE_LOCATION_UPDATING);
- if (msc_a->complete_layer3_type == COMPLETE_LAYER3_CM_RE_ESTABLISH_REQ) {
+ if (conn_accepted && msc_a->complete_layer3_type == COMPLETE_LAYER3_CM_RE_ESTABLISH_REQ) {
/* Trigger new Assignment to recommence the voice call. A little dance here because normally we verify
* that no CC trans is already active. */
struct gsm_trans *cc_trans = msc_a->cc.active_trans;
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36520?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I3679162143e8d7d8c0878de2102faa11eadfccfc
Gerrit-Change-Number: 36520
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: newchange
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/36518?usp=email )
Change subject: build/Makefile.asciidoc: fix GIT_DATE
......................................................................
build/Makefile.asciidoc: fix GIT_DATE
Omit the "../." parameter from git log. This is legacy from when all
manuals were in the osmo-gsm-manuals.git repository, and now causes the
wrong date to be used. After removal, it uses the date of the currently
checked out git commit again.
For most projects using osmo-gsm-manuals, the directory structure looks
like the following:
├── doc
│ ├── manuals
│ │ ├── build -> /usr/share/osmo-gsm-manuals/build
│ │ ├── Makefile.am
Makefile.am includes build/Makefile.asciidoc.inc. With the "../."
parameter, git log parses the date of the last commit of the doc
directory. In case of osmo-hnbgw, this is:
osmo-hnbgw/doc/manuals $ git log -n1 ../.
commit 90928fb2467aef2b2b8419c1c96f7edae6fc2907
Author: Neels Janosch Hofmeyr <nhofmeyr(a)sysmocom.de>
Date: Thu Nov 30 18:13:06 2023 +0100
systemd,manual: set LimitNOFILE=65536
...which then leads to 2023-Nov-30 appearing in the document even though
the last commit in the repository is much newer.
Fixes: OS#6428
Change-Id: Id46d0d6928c0ad820214280cb36c0c3180f3bff1
---
M build/Makefile.asciidoc.inc
1 file changed, 38 insertions(+), 1 deletion(-)
Approvals:
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc
index 7dd38d6..4e57f56 100644
--- a/build/Makefile.asciidoc.inc
+++ b/build/Makefile.asciidoc.inc
@@ -20,7 +20,7 @@
COMMONDIR = $(OSMO_GSM_MANUALS_DIR)/common
GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always --tags)
-GIT_DATE := $(shell $(OSMO_GSM_MANUALS_DIR)/build/unix-time-to-fmt.py `git log -n 1 "--pretty=%at" ../.`)
+GIT_DATE := $(shell $(OSMO_GSM_MANUALS_DIR)/build/unix-time-to-fmt.py `git log -n 1 "--pretty=%at"`)
# prepend the document name with the version numbe suffix
#DOCS_VER = $(foreach P, $(ASCIIDOC_NAME), $(P)-v$(shell xmllint --recover --xpath "//revnumber[position()=last()]/text()" $(P)-docinfo.xml 2>/dev/null))
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/36518?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Change-Id: Id46d0d6928c0ad820214280cb36c0c3180f3bff1
Gerrit-Change-Number: 36518
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged