March 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-gsm-manuals[master]: build/Makefile.common.inc: unset OSMO_REPOSITORY
by osmith 09 Mar '23

09 Mar '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/31726 ) Change subject: build/Makefile.common.inc: unset OSMO_REPOSITORY ...................................................................... build/Makefile.common.inc: unset OSMO_REPOSITORY Don't have a default value for OSMO_REPOSITORY, as this leads to manuals getting uploaded to the wrong directory (publish) target and installed to the wrong directory (install, uninstall). Add checks to ensure the variable is set before using it in install and uninstall. Related: OS#5902 Change-Id: Ie21d58dd57a893a83f566eea464ab3eec82b67a4 --- M build/Makefile.common.inc M tests/Makefile.am 2 files changed, 20 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified msuraev: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/build/Makefile.common.inc b/build/Makefile.common.inc index a9a8ddf..2bbd324 100644 --- a/build/Makefile.common.inc +++ b/build/Makefile.common.inc @@ -11,7 +11,6 @@ SYMLINKS = common build CLEAN_FILES += $(SYMLINKS) PDF_FILES = $(patsubst %.adoc,%.pdf,$(ASCIIDOC)) $(patsubst %.xml,%.pdf,$(VTY_REFERENCE)) -OSMO_REPOSITORY ?= osmo-gsm-manuals PUBLISH_REF ?= master PUBLISH_TEMPDIR = _publish_tmpdir @@ -49,6 +48,7 @@ # - installing manuals by default is fine, because Osmocom projects won't include # the whole Makefile.common.inc unless --enable-manuals is passed to configure. install: $(PDF_FILES) + [ -n "$(OSMO_REPOSITORY)" ] || exit 1 if [ "$(OSMO_GSM_MANUALS_NO_INSTALL)" != "1" ]; then \ for i in $(PDF_FILES); do \ install -vDm644 "$$i" "$(DESTDIR)$(prefix)/share/doc/$(OSMO_REPOSITORY)-doc/$$i" || exit 1; \ @@ -56,6 +56,7 @@ fi uninstall: + [ -n "$(OSMO_REPOSITORY)" ] || exit 1 if [ "$(OSMO_GSM_MANUALS_NO_INSTALL)" != "1" ]; then \ for i in $(PDF_FILES); do \ rm -v "$(DESTDIR)$(prefix)/share/doc/$(OSMO_REPOSITORY)-doc/$$i"; \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 784f61f..0761d48 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -34,6 +34,7 @@ VTY_REFERENCE = test-vty-reference.xml test2-vty-reference.xml include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc +OSMO_REPOSITORY = osmo-gsm-manuals include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/31726 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: Ie21d58dd57a893a83f566eea464ab3eec82b67a4 Gerrit-Change-Number: 31726 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-gsm-manuals[master]: build/Makefile.common.inc: unset OSMO_REPOSITORY
by osmith 09 Mar '23

09 Mar '23

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/31726 ) Change subject: build/Makefile.common.inc: unset OSMO_REPOSITORY ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/31726 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: Ie21d58dd57a893a83f566eea464ab3eec82b67a4 Gerrit-Change-Number: 31726 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Mar 2023 09:38:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: osmo-hnbgw-with-pfcp.cfg: improve logging
by laforge 09 Mar '23

09 Mar '23

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31768 ) Change subject: osmo-hnbgw-with-pfcp.cfg: improve logging ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iaf4e8993f9d3b41f74145291940ca59947f9d171 Gerrit-Change-Number: 31768 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Mar 2023 09:35:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: add f_bssap_expect()
by laforge 09 Mar '23

09 Mar '23

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31767 ) Change subject: hnbgw: add f_bssap_expect() ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: see previous comment about function vs. altstep -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I51c60ed8fcef83c98e6c62c9f62a8c3c665de860 Gerrit-Change-Number: 31767 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Mar 2023 09:35:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: add f_pfcp_expect()
by laforge 09 Mar '23

09 Mar '23

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31766 ) Change subject: hnbgw: add f_pfcp_expect() ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: see previous comment about function vs. altstep -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2117475b695d486b1204d61e5bb21120a6187354 Gerrit-Change-Number: 31766 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Mar 2023 09:35:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: add f_rua_expect()
by laforge 09 Mar '23

09 Mar '23

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31765 ) Change subject: hnbgw: add f_rua_expect() ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I'm not sure if this is really best handled in a function. The problem with functions is that you can always only call one of them at a time. In more complex tests, this may no longer be feasible. Those could however simply be altsteps. With altsteps, a more complex testcase could combine any number of those together in an alt. See for example BSC_Tests.ttcn f_TC_reassignment_codec where two altsteps are combined in a local 'alt'. I'm not sure if this really makes sense here, but would like you to think about it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I29e6b7659ba53efee9f676197b502f79780ead7e Gerrit-Change-Number: 31765 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Mar 2023 09:34:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: GSMTAP: allow configuring src IP for log messages
by pespin 09 Mar '23

09 Mar '23

Attention is currently required from: osmith, neels, fixeria, msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31513 ) Change subject: GSMTAP: allow configuring src IP for log messages ...................................................................... Patch Set 12: Code-Review-1 (4 comments) File src/core/logging_gsmtap.c: https://gerrit.osmocom.org/c/libosmocore/+/31513/comment/e5018e7d_286b2311 PS12, Line 132: gsmtap_source_free(target->tgt_gsmtap.gsmtap_inst); You could try comparing if new ip if same as the old one and then do nothing. Otherwise you are recreating the whole thing every time you enter the VTY node (potentially recreating the socket?) https://gerrit.osmocom.org/c/libosmocore/+/31513/comment/bea02783_56d5fb24 PS12, Line 139: if (ip) if without {} and else with them. Fix. https://gerrit.osmocom.org/c/libosmocore/+/31513/comment/89db26fd_92b61a6f PS12, Line 186: target->tgt_gsmtap.src_addr = talloc_strdup(target, src); I hope arget->tgt_gsmtap.src_addr is NULL here and we are not leaking. File utils/osmo-stat-dummy/osmo-stat-dummy.cfg: https://gerrit.osmocom.org/c/libosmocore/+/31513/comment/c858fd48_6e927ac2 PS4, Line 1: log gsmtap 127.0.0.69 127.6.9.1 > Not sure I'm following - 127.0.0.1/8 always exist. […] 1- 127.0.0.1/8 always exist on linux for IPv4 (not even the case for IPv6 iirc). 2- I still don't see the point on why do you want to set a specific source IP address there. As a default, letting the kernel decide the src IP address based on current routing table is a better solution as per user expectancies. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31513 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9000269ce5b3dce1e757271b7c42e77b68d38f25 Gerrit-Change-Number: 31513 Gerrit-PatchSet: 12 Gerrit-Owner: msuraev <msuraev(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-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Mar 2023 09:33:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: add f_rua_expect()
by laforge 09 Mar '23

09 Mar '23

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31765 ) Change subject: hnbgw: add f_rua_expect() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I29e6b7659ba53efee9f676197b502f79780ead7e Gerrit-Change-Number: 31765 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 09 Mar 2023 09:31:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: make: doc/sequence_charts: use wildcards for EXTRA_DIST and CLEANFILES
by laforge 09 Mar '23

09 Mar '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/31742 ) Change subject: make: doc/sequence_charts: use wildcards for EXTRA_DIST and CLEANFILES ...................................................................... make: doc/sequence_charts: use wildcards for EXTRA_DIST and CLEANFILES Both EXTRA_DIST and CLEANFILES had missing entries. It is easy to forget to keep them up to date. Rather use wildcards to always pick up all relevant files. (Not adding *.dot because there are no .dot charts here, yet.) Change-Id: I3a18e4608a310169d7c9cd9c1b8ac9015a990920 --- M doc/sequence_charts/Makefile.am 1 file changed, 17 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/sequence_charts/Makefile.am b/doc/sequence_charts/Makefile.am index 5efe855..c119458 100644 --- a/doc/sequence_charts/Makefile.am +++ b/doc/sequence_charts/Makefile.am @@ -4,17 +4,11 @@ charts: msc dot EXTRA_DIST = \ - inter_bsc_ho.msc \ - inter_msc_ho.msc \ - mncc_call_fsm.msc \ - call_reestablishment.msc \ + $(srcdir)/*.msc \ $(NULL) CLEANFILES = \ - inter_bsc_ho.png \ - inter_msc_ho.png \ - mncc_call_fsm.png \ - voice_call_full.png \ + $(builddir)/*.png \ $(NULL) msc: \ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/31742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3a18e4608a310169d7c9cd9c1b8ac9015a990920 Gerrit-Change-Number: 31742 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[M] Change in osmo-msc[master]: msc_log_to_ladder.py: various tweaks
by laforge 09 Mar '23

09 Mar '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/31744 ) Change subject: msc_log_to_ladder.py: various tweaks ...................................................................... msc_log_to_ladder.py: various tweaks (multiple changes in one patch because who cares about this script) tweak regexes -- they worked ok, but some of the '[^:]' should really be '[^:)]', and they also look happier that way. don't skip RAN=NONE, so we also see messages before Complete Layer 3. s/sip/mncc, to generally be valid for both internal and external MNCC. pick up RTP port information from MGCP OK pick up RTP port information from MNCC rx and tx add --verbose flag, to be able to check whether the regex rules are still working (getting any hits). fix rule_imsi_detach: should return True to be counted in --verbose. tweak comment 'Generated by...' to include the full git path. Change-Id: If619182ba76c6b238a1fa105a3c3449d7f473dd1 --- M doc/sequence_charts/msc_log_to_ladder.py 1 file changed, 76 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/sequence_charts/msc_log_to_ladder.py b/doc/sequence_charts/msc_log_to_ladder.py index 30b6594..9bfb9c9 100755 --- a/doc/sequence_charts/msc_log_to_ladder.py +++ b/doc/sequence_charts/msc_log_to_ladder.py @@ -53,7 +53,7 @@ MS_UE_UNKNOWN = 'ms' #None MSC = 'msc' MGW = 'mgw' -SIP = 'sip' +MNCC = 'mncc' MO = 'mo' MT = 'mt' @@ -69,7 +69,7 @@ self.start_with_re = re.compile(start_with_re) def head(self): - self.writeln('# Generated by msc_log_to_ladder.py') + self.writeln('# Generated by osmo-msc.git/doc/sequence_charts/msc_log_to_ladder.py') def tail(self): pass @@ -129,7 +129,7 @@ mo_mt = arrow.mo_mt or MO def prepend_mo_mt(name): - if name in ('.', SIP): + if name in ('.', MNCC): return name return '%s%s' % (mo_mt, name) @@ -222,7 +222,7 @@ mo_mt = arrow.mo_mt or MO def prepend_mo_mt(name): - if name in ('.', SIP): + if name in ('.', MNCC): return name return '%s%s' % (mo_mt, name) @@ -371,6 +371,7 @@ self.output = output self.linenr = 0 self.rules = [] + self.rules_hit = {} self.seen_udtrace_mncc = False self.callrefs_mo_mt = {} @@ -390,6 +391,7 @@ re_str = docstr.splitlines()[0] self.rules.append(Rule(name=member, re_str=re_str, handler=func)) + self.rules_hit[member] = 0 @@ -403,7 +405,7 @@ #('moue', 'UE,hNodeB (MO)'), ('momgw', 'MGW for MSC (MO)'), ('momsc', 'MSC (MO)'), - ('sip', 'MNCC to PBX via\nosmo-sip-connector'), + ('mncc', 'MNCC'), ('mtmsc', 'MSC (MT)'), ('mtmgw', 'MGW for MSC (MT)'), ('mtms', 'BSS,MS (MT)\\nhNodeB,UE (MT)'), @@ -448,6 +450,7 @@ for rule in self.rules: if rule.match(line): + self.rules_hit[rule.name] = self.rules_hit.get(rule.name, 0) + 1 break RE_DTAP_NAME = re.compile('.*GSM48_MT_([^_]+)_(.+)') @@ -473,7 +476,8 @@ dtap = '%s %s' % m.groups() if 'IMSI_DETACH_IND' in dtap: - # detecting IMSI Detach separately + # detecting IMSI Detach separately, because this log line does not contain the IMSI. + # By using the rule_imsi_detach(), we can accurately put it on the MO/MT side. return True if l3type == 'NONE' and not tx and dtap.endswith('PAG_RESP'): @@ -497,6 +501,7 @@ imsi = m.group(1) e = MO_MT_UNKNOWN self.diagram.add_line(Arrow(e, MS_UE_UNKNOWN, '>', MSC, 'IMSI Detach', imsi=imsi)) + return True def rule_mgcp_tx(self, m): r'.*mgw-endp$[^)]*:([^:]+):([^:]+)$.* (rtpbridge[^ ]+) .* RTP_TO_(RAN|CN)( CI=([^:]+)|): ([^ :]+).*: Sending' @@ -512,19 +517,20 @@ return True def rule_mgcp_rx(self, m): - r'.*mgw-endp$[^)]*:([^:]+):([^:]+)$.* (rtpbridge[^ ]+) .* RTP_TO_(RAN|CN)( CI=([^:]+)|).*: received successful response to ([^:]+): (.*)' - ran, l3type, endp, rtp_to, cond_ci, ci, verb, details = m.groups() + r'.*mgw-endp$([^)]+):([^:)]+):([^:)]+)$.* (rtpbridge[^ ]+) .* RTP_TO_(RAN|CN)( CI=([^:]+)|).*: received successful response to ([^:]+): RTP=[^:]+:([0-9.:]+)' + subscr, ran_conn, l3type, endp, rtp_to, cond_ci, ci, verb, rtp = m.groups() e = mo_mt_from_l3type(l3type) endp = self.mask_value('EP', endp) ci = self.mask_value('CI', ci) ci_str = '' if ci: ci_str = ' %s' % ci - self.diagram.add_line(Arrow(e, MGW, '>', MSC, 'for %s: %s OK\\n%s%s' % (rtp_to, verb, endp, ci_str))) + rtp = self.mask_value('IP:port', rtp) + self.diagram.add_line(Arrow(e, MGW, '>', MSC, 'for %s: %s OK\\n%s%s %s' % (rtp_to, verb, endp, ci_str, rtp))) return True def rule_ran_tx(self, m): - r'.*msc_a$([^)]*):([^:]+):([^:]+)$.* RAN encode: ([^: ]+): (.+)$' + r'.*msc_a$([^)]+):([^:)]+):([^:)]+)$.* RAN encode: ([^: ]+): (.+)$' subscr, ran_conn, l3type, ran_type, msg_type = m.groups() @@ -538,8 +544,6 @@ # skip 'RAB Assignment: rab_id=1, rtp=192.168.178.66:50008, use_x213_nsap=1' return True - if l3type == 'NONE': - return True e = mo_mt_from_l3type(l3type) @@ -555,7 +559,7 @@ return True def rule_ran_rx(self, m): - r'.*msc_a$([^)]*):([^:]+):([^:]+)$.* RAN decode: ([^: ]+) (.+)$' + r'.*msc_a$([^)]+):([^:)]+):([^:)]+)$.* RAN decode: ([^: ]+) (.+)$' subscr, ran_conn, l3type, ran_type, msg_type = m.groups() @@ -563,8 +567,6 @@ # will get DTAP details from rule_dtap() instead, not from BSSMAP logging return True - if l3type == 'NONE': - return True e = mo_mt_from_l3type(l3type) @@ -589,7 +591,7 @@ self.diagram.add_line(Arrow(e, MSC, '<>', '.', 'CC state:\\n%s' % to_state)) return True - def rule_log_mncc(self, m): + def rule_log_mncc_no_rtp(self, m): r'.*trans$CC[^) ]* [^ )]+:([^:)]+) callref-([^ ]+) [^)]+$ (tx|rx) (MNCC_[^ ]*)$' l3type, callref_hex, tx_rx, mncc_msg = m.groups() @@ -605,12 +607,34 @@ except: e = MT - self.diagram.add_line(Arrow(e, MSC, '>' if tx else '<', 'sip', mncc_msg)) + self.diagram.add_line(Arrow(e, MSC, '>' if tx else '<', 'mncc', mncc_msg)) + return True + + def rule_log_mncc_with_rtp(self, m): + r'.*trans$CC[^) ]* [^ )]+:([^:)]+) callref-([^ ]+) [^)]+$ (tx|rx) (MNCC_[^ ]*) $RTP=([^){]+)(|{.*})$$' + l3type, callref_hex, tx_rx, mncc_msg, rtp, codec = m.groups() + + if self.seen_udtrace_mncc: + # If no udtrace is present, take the MNCC logging. + # But if there is udtrace logging available, we should not duplicate those MNCC lines. + return True + + tx = (tx_rx == 'tx') + + try: + e = self.callrefs_mo_mt.get(callref_hex, MT) + except: + e = MT + + rtp = self.mask_value('IP:port', rtp) + self.diagram.add_line(Arrow(e, MSC, '>' if tx else '<', 'mncc', f'{mncc_msg}\\n{rtp}')) return True RE_MNCC_RTP = re.compile(' ip := ([^, ]+), rtp_port := ([0-9]+),') RE_MNCC_CALLREF = re.compile(' callref := ([^ ,]+), ') + # detecting MNCC with udtrace has the advantage that we also get an indication whether RTP information is + # present def rule_udtrace_mncc(self, m): r'.*(write|recv).* (Tx|Rx): \{ msg_type := ([^ ]+) .* u := \{ (.*) \} \}$' write_recv, tx_rx, msg_type, u = m.groups() @@ -650,7 +674,7 @@ descr = '%s\\n%s' % (descr, rtp_info) break - self.diagram.add_line(Arrow(e, MSC, '>' if tx else '<', 'sip', descr)) + self.diagram.add_line(Arrow(e, MSC, '>' if tx else '<', 'mncc', descr)) return True def rule_cc_timer(self, m): @@ -680,6 +704,9 @@ break; parse.add_line(line) parse.end() + if cmdline.verbose: + for name, count in parse.rules_hit.items(): + print(f" {name}: {count}") def open_output(inf, cmdline): if cmdline.output_file == '-': @@ -716,6 +743,8 @@ ' present. This makes the output reproducible across various logs.') parser.add_argument('-s', '--start-with', dest='start_with_re', default=None, help='Skip until the first message with this label (regex), e.g. -s "CC SETUP"') + parser.add_argument('-v', '--verbose', dest='verbose', action='store_true', + help='show some debug info, like which regex rules were hit and which were not.') cmdline = parser.parse_args() -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/31744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: If619182ba76c6b238a1fa105a3c3449d7f473dd1 Gerrit-Change-Number: 31744 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0