August 2022 - gerrit-log - lists.osmocom.org

Change in libsmpp34[master]: update git URLs (git -> https; gitea)

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libsmpp34/+/29078 ) Change subject: update git URLs (git -> https; gitea) ...................................................................... update git URLs (git -> https; gitea) Change-Id: Ic7adcdb289dff952f9897813ea1243cd1945c1ca --- M README.md M debian/control 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/README.md b/README.md index d2db059..8b9a7d1 100644 --- a/README.md +++ b/README.md @@ -24,9 +24,9 @@ You can clone from the Osmocom libsmpp34.git repository using - git clone git://git.osmocom.org/libsmpp34.git + git clone https://gitea.osmocom.org/cellular-infrastructure/libsmpp34 -There is a cgit interface at <http://git.osmocom.org/libsmpp34/> +There is a web interface at <https://gitea.osmocom.org/cellular-infrastructure/libsmpp34> Documentation ------------- diff --git a/debian/control b/debian/control index 875480d..3698922 100644 --- a/debian/control +++ b/debian/control @@ -13,8 +13,8 @@ pkg-config, libxml2-dev Standards-Version: 3.9.6 -Vcs-Browser: http://git.osmocom.org/libsmpp34/ -Vcs-Git: git://git.osmocom.org/libsmpp34.git +Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/libsmpp34 +Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/libsmpp34 Homepage: https://projects.osmocom.org/projects/libsmpp34 Package: libsmpp1 -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/29078 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: Ic7adcdb289dff952f9897813ea1243cd1945c1ca Gerrit-Change-Number: 29078 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in libsmpp34[master]: Makefile.am, configure.ac: fix autoreconf related warnings

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libsmpp34/+/29080 ) Change subject: Makefile.am, configure.ac: fix autoreconf related warnings ...................................................................... Makefile.am, configure.ac: fix autoreconf related warnings * aclocal: warning: couldn't open directory 'm4': No such file or directory * libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([m4])' to configure.ac * libtoolize: Consider adding '-I m4' to ACLOCAL_AMFLAGS in Makefile.am * configure.ac:9: warning: 'AM_CONFIG_HEADER': this macro is obsolete configure.ac:9: You should use the 'AC_CONFIG_HEADERS' macro instead * configure.ac:22: warning: The macro `AC_PROG_LIBTOOL' is obsolete * configure.ac:86: warning: AC_OUTPUT should be used without arguments Change-Id: I3199e7de0a04b4df89d01277cdb305d33902fcc2 --- M .gitignore M Makefile.am M configure.ac A m4/.gitkeep 4 files changed, 14 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore index 474a5d6..c80e81c 100644 --- a/.gitignore +++ b/.gitignore @@ -20,5 +20,6 @@ debian/tmp debian/*.log debian/*.substvars +m4/*.m4 contrib/libsmpp34.spec diff --git a/Makefile.am b/Makefile.am index f888647..4b1006e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = binaries def_frame def_list if HAVE_LIBXML2 diff --git a/configure.ac b/configure.ac index b25602d..fce48b4 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,8 @@ AC_CONFIG_AUX_DIR(aux_config) AM_INIT_AUTOMAKE([foreign]) -AM_CONFIG_HEADER([aux_config/config.h]) +AC_CONFIG_HEADERS([aux_config/config.h]) +AC_CONFIG_MACRO_DIRS([m4]) dnl kernel style compile messages m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -18,8 +19,8 @@ # Checks for programs. AC_PROG_CC AM_PROG_CC_C_O -AC_PROG_LIBTOOL AC_PROG_INSTALL +LT_INIT dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang AS_CASE(["$LD"],[*clang*], @@ -82,10 +83,11 @@ AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) -AC_OUTPUT([Makefile - def_frame/Makefile - def_list/Makefile - binaries/Makefile - test_apps/Makefile - libsmpp34.pc - contrib/libsmpp34.spec]) +AC_CONFIG_FILES([Makefile + def_frame/Makefile + def_list/Makefile + binaries/Makefile + test_apps/Makefile + libsmpp34.pc + contrib/libsmpp34.spec]) +AC_OUTPUT diff --git a/m4/.gitkeep b/m4/.gitkeep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/m4/.gitkeep -- To view, visit https://gerrit.osmocom.org/c/libsmpp34/+/29080 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libsmpp34 Gerrit-Branch: master Gerrit-Change-Id: I3199e7de0a04b4df89d01277cdb305d33902fcc2 Gerrit-Change-Number: 29080 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmo-bts[master]: Move lchan_dl_tch_queue_enqueue to lchan.c and make it public

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29045 ) Change subject: Move lchan_dl_tch_queue_enqueue to lchan.c and make it public ...................................................................... Move lchan_dl_tch_queue_enqueue to lchan.c and make it public It will be used too by osmux code present in another file. This is a preparation commit to simplify the one adding osmux support. Change-Id: Ie7fa57bb04db9ad9b03971467e12ee7b8e4c190a --- M include/osmo-bts/lchan.h M src/common/l1sap.c M src/common/lchan.c 3 files changed, 15 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index 64b7efa..484fccc 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -360,6 +360,8 @@ int lchan_rtp_socket_connect(struct gsm_lchan *lchan, const struct in_addr *ia, uint16_t connect_port); void lchan_rtp_socket_free(struct gsm_lchan *lchan); +void lchan_dl_tch_queue_enqueue(struct gsm_lchan *lchan, struct msgb *msg, unsigned int limit); + static inline bool lchan_is_dcch(const struct gsm_lchan *lchan) { switch (lchan->type) { diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 640ff57..acb2683 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -152,19 +152,6 @@ return GSM_RTP_DURATION; } -/*! limit number of queue entries to %u; drops any surplus messages */ -static void lchan_dl_tch_queue_enqueue(struct gsm_lchan *lchan, struct msgb *msg, unsigned int limit) -{ - if (lchan->dl_tch_queue_len > limit) - LOGPLCHAN(lchan, DL1P, LOGL_NOTICE, "freeing %d queued frames\n", - lchan->dl_tch_queue_len - limit); - while (lchan->dl_tch_queue_len > limit) { - struct msgb *tmp = msgb_dequeue_count(&lchan->dl_tch_queue, &lchan->dl_tch_queue_len); - msgb_free(tmp); - } - msgb_enqueue_count(&lchan->dl_tch_queue, msg, &lchan->dl_tch_queue_len); -} - /* allocate a msgb containing a osmo_phsap_prim + optional l2 data * in order to wrap femtobts header around l2 data, there must be enough space * in front and behind data pointer */ diff --git a/src/common/lchan.c b/src/common/lchan.c index c7d8d45..c521f26 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -641,3 +641,16 @@ msgb_queue_free(&lchan->dl_tch_queue); lchan->dl_tch_queue_len = 0; } + +/*! limit number of queue entries to %u; drops any surplus messages */ +void lchan_dl_tch_queue_enqueue(struct gsm_lchan *lchan, struct msgb *msg, unsigned int limit) +{ + if (lchan->dl_tch_queue_len > limit) + LOGPLCHAN(lchan, DL1P, LOGL_NOTICE, "freeing %d queued frames\n", + lchan->dl_tch_queue_len - limit); + while (lchan->dl_tch_queue_len > limit) { + struct msgb *tmp = msgb_dequeue_count(&lchan->dl_tch_queue, &lchan->dl_tch_queue_len); + msgb_free(tmp); + } + msgb_enqueue_count(&lchan->dl_tch_queue, msg, &lchan->dl_tch_queue_len); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie7fa57bb04db9ad9b03971467e12ee7b8e4c190a Gerrit-Change-Number: 29045 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmo-bts[master]: rsl: Reduce scope of variable

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29036 ) Change subject: rsl: Reduce scope of variable ...................................................................... rsl: Reduce scope of variable The function is long/complex enough, so having one extra struct in_addr declared the function top only used in one specific small path to print the variable is unnecesary. Let's move it to the conditional path where it is used to print the ip address. Change-Id: I4c16bbca6a6779537517b6b196828b47eddaa516 --- M src/common/rsl.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/common/rsl.c b/src/common/rsl.c index 8cdb662..413c28d 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2702,7 +2702,6 @@ int rc, inc_ip_port = 0; char *name; struct in_addr ia; - struct in_addr addr; if (dch->c.msg_type == RSL_MT_IPAC_CRCX) name = "CRCX"; @@ -2721,6 +2720,7 @@ LOGPLCHAN(lchan, DRSL, LOGL_DEBUG, "IPAC_%s: ", name); if (TLVP_PRES_LEN(&tp, RSL_IE_IPAC_REMOTE_IP, 4)) { + struct in_addr addr; connect_ip = tlvp_val32_unal(&tp, RSL_IE_IPAC_REMOTE_IP); addr.s_addr = connect_ip; LOGPC(DRSL, LOGL_DEBUG, "connect_ip=%s ", inet_ntoa(addr)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29036 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4c16bbca6a6779537517b6b196828b47eddaa516 Gerrit-Change-Number: 29036 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmo-bts[master]: Move lchan_dl_tch_queue_enqueue to lchan.c and make it public

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29045 ) Change subject: Move lchan_dl_tch_queue_enqueue to lchan.c and make it public ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie7fa57bb04db9ad9b03971467e12ee7b8e4c190a Gerrit-Change-Number: 29045 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 20 Aug 2022 08:15:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-bts[master]: rsl: Reduce scope of variable

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29036 ) Change subject: rsl: Reduce scope of variable ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29036 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4c16bbca6a6779537517b6b196828b47eddaa516 Gerrit-Change-Number: 29036 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 20 Aug 2022 08:14:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-mgw[master]: Use Osmux default port define from libosmo-netif

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29064 ) Change subject: Use Osmux default port define from libosmo-netif ...................................................................... Use Osmux default port define from libosmo-netif Change-Id: Ibf5fbec591307232be98cad914c0df4b2993db15 Requires: libosmo-netif.git Ibfd058bceeeaa1384a00d8fcd6d6268b445e19bd --- M TODO-RELEASE M include/osmocom/mgcp/osmux.h M src/libosmo-mgcp/mgcp_vty.c 3 files changed, 2 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index c5a3b36..746808e 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -24,3 +24,4 @@ # If any interfaces have been removed or changed since the last public release, a=0. # #library what description / commit summary line +libosmo-netif >1.2.0 OSMUX_DEFAULT_PORT diff --git a/include/osmocom/mgcp/osmux.h b/include/osmocom/mgcp/osmux.h index 99b44d1..f138901 100644 --- a/include/osmocom/mgcp/osmux.h +++ b/include/osmocom/mgcp/osmux.h @@ -4,9 +4,6 @@ #include <osmocom/netif/osmux.h> struct mgcp_conn_rtp; - -#define OSMUX_PORT 1984 - enum { OSMUX_ROLE_BSC = 0, OSMUX_ROLE_BSC_NAT, diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c index a05733f..796db85 100644 --- a/src/libosmo-mgcp/mgcp_vty.c +++ b/src/libosmo-mgcp/mgcp_vty.c @@ -1734,7 +1734,7 @@ int rc; struct mgcp_trunk *trunk; - cfg->osmux_port = OSMUX_PORT; + cfg->osmux_port = OSMUX_DEFAULT_PORT; cfg->osmux_batch = 4; cfg->osmux_batch_size = OSMUX_BATCH_DEFAULT_MAX; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibf5fbec591307232be98cad914c0df4b2993db15 Gerrit-Change-Number: 29064 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmo-mgw[master]: Use Osmux default port define from libosmo-netif

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29064 ) Change subject: Use Osmux default port define from libosmo-netif ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibf5fbec591307232be98cad914c0df4b2993db15 Gerrit-Change-Number: 29064 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 20 Aug 2022 08:13:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: OSMUX_Emulation: Add special error case for port events

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29069 ) Change subject: OSMUX_Emulation: Add special error case for port events ...................................................................... OSMUX_Emulation: Add special error case for port events This way it's easier to quickly spot there was a problem with the socket connection. Change-Id: I962bf4837a9e359576c42a51a9919891186c7100 --- M library/OSMUX_Emulation.ttcn 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/OSMUX_Emulation.ttcn b/library/OSMUX_Emulation.ttcn index 5d9a95e..6189266 100644 --- a/library/OSMUX_Emulation.ttcn +++ b/library/OSMUX_Emulation.ttcn @@ -422,7 +422,7 @@ var OsmuxRxHandle rx_hdl; var OsmuxTxHandle tx_hdl; var octetstring payload_truncated; - + var PortEvent port_event; timer T_transmit := int2float(g_cfg.tx_duration_ms)/1000.0; var Osmux_RecvFrom rx_osmux; var PDU_Osmux_AMR rx_amr; @@ -569,6 +569,11 @@ T_transmit.start; } + [] OSMUX.receive(PortEvent:?) -> value port_event { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Received unexpected port event from Osmux:", port_event)); + } + /* fail on any unexpected messages */ [] OSMUX.receive { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29069 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: I962bf4837a9e359576c42a51a9919891186c7100 Gerrit-Change-Number: 29069 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: OSMUX_Emulation: Use Misc_Helpers.f_shutdown() everywhere

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29068 ) Change subject: OSMUX_Emulation: Use Misc_Helpers.f_shutdown() everywhere ...................................................................... OSMUX_Emulation: Use Misc_Helpers.f_shutdown() everywhere Change-Id: Id8f104a4123fcfbc96ab07f2e9343369946e3334 --- M library/OSMUX_Emulation.ttcn 1 file changed, 24 insertions(+), 22 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/OSMUX_Emulation.ttcn b/library/OSMUX_Emulation.ttcn index d31a562..5d9a95e 100644 --- a/library/OSMUX_Emulation.ttcn +++ b/library/OSMUX_Emulation.ttcn @@ -54,6 +54,7 @@ import from General_Types all; import from Osmocom_Types all; import from IPL4asp_Types all; +import from Misc_Helpers all; import from OSMUX_Types all; import from OSMUX_CodecPort all; import from OSMUX_CodecPort_CtrlFunct all; @@ -289,26 +290,26 @@ /* Check if there was some activity at either on the RX or on the * TX side, but complete silence would indicate some problem */ if (s.num_pkts_tx < 1 and s.num_pkts_rx < 1) { - setverdict(fail, "no Osmux packet activity detected (packets)"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "no Osmux packet activity detected (packets)"); } if (s.bytes_payload_tx < 1 and s.bytes_payload_rx < 1) { - setverdict(fail, "no Osmux packet activity detected (bytes)"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "no Osmux packet activity detected (bytes)"); } /* Check error counters */ if (s.num_pkts_rx_err_seq != 0) { - setverdict(fail, "Osmux packet sequence number errors occurred"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Osmux packet sequence number errors occurred"); } if (s.num_pkts_rx_err_disabled != 0) { - setverdict(fail, "Osmux packets received while RX was disabled"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Osmux packets received while RX was disabled"); } if (s.num_pkts_rx_err_payload != 0) { - setverdict(fail, "Osmux packets with mismatching payload received"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Osmux packets with mismatching payload received"); } } @@ -336,8 +337,9 @@ return RxHandleTable[i].vc_conn; } } - setverdict(fail, "No Component for CID ", cid); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("No Component for CID ", cid)); + return RxHandleTable[0].vc_conn; /* make compiler happy, not reached */ } private function f_rxhandle_cid_add(OsmuxRxHandle hdl) runs on OSMUX_Emulation_CT { @@ -349,8 +351,8 @@ return; } } - testcase.stop("No Space in RxHandleTable for ", hdl.cid); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("No Space in RxHandleTable for ", hdl.cid)); } private function f_txhandle_cid_add(OsmuxTxHandle hdl) runs on OSMUX_Emulation_CT { @@ -361,8 +363,8 @@ return; } } - testcase.stop("No Space in TxHandleList for ", hdl.cid); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("No Space in TxHandleList for ", hdl.cid)); } function f_osmux_gen_expected_rx_rtp_payload(INT4b amr_ft, octetstring tx_fixed_payload) return octetstring { @@ -459,8 +461,8 @@ res := OSMUX_CodecPort_CtrlFunct.f_IPL4_listen(OSMUX, g_local_host, g_local_port, {udp:={}}); if (not ispresent(res.connId)) { - setverdict(fail, "Could not listen on Osmux socket, check your configuration"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Could not listen on Osmux socket, check your configuration"); } g_osmux_conn_id := res.connId; tr_osmux_amr.connId := g_osmux_conn_id; @@ -474,8 +476,8 @@ g_local_host, g_local_port, g_osmux_conn_id, {udp:={}}); if (not ispresent(res.connId)) { - setverdict(fail, "Could not connect to Osmux socket, check your configuration"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Could not connect to Osmux socket, check your configuration"); } g_tx_connected := true; CTRL.reply(OsmuxEM_connect:{g_remote_host, g_remote_port}); @@ -569,8 +571,8 @@ /* fail on any unexpected messages */ [] OSMUX.receive { - setverdict(fail, "Received unexpected type from Osmux"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Received unexpected msg type from Osmux"); } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29068 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: Id8f104a4123fcfbc96ab07f2e9343369946e3334 Gerrit-Change-Number: 29068 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2022