- gerrit-log - lists.osmocom.org

Change in osmo-hnbgw[master]: hbgw_hnbap: use osmo_plmn_from_bcd instead of gsm48_mcc_mnc_from_bcd

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/26920 ) Change subject: hbgw_hnbap: use osmo_plmn_from_bcd instead of gsm48_mcc_mnc_from_bcd ...................................................................... hbgw_hnbap: use osmo_plmn_from_bcd instead of gsm48_mcc_mnc_from_bcd The function gsm48_mcc_mnc_from_bcd is deprecated. Lets use osmo_plmn_from_bcd instead. Change-Id: I01406a4cf86d4f3ed162c9df55880941e54d654e --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/20/26920/1 diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index 5b92e4e..4c3a5c0 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -398,6 +398,7 @@ struct hnb_context *hnb; HNBAP_HNBRegisterRequestIEs_t ies; int rc; + struct osmo_plmn_id plmn; rc = hnbap_decode_hnbregisterrequesties(&ies, in); if (rc < 0) { @@ -413,7 +414,9 @@ ctx->id.sac = asn1str_to_u16(&ies.sac); ctx->id.rac = asn1str_to_u8(&ies.rac); ctx->id.cid = asn1bitstr_to_u28(&ies.cellIdentity); - gsm48_mcc_mnc_from_bcd(ies.plmNidentity.buf, &ctx->id.mcc, &ctx->id.mnc); + osmo_plmn_from_bcd(ies.plmNidentity.buf, &plmn); + ctx->id.mcc = plmn.mcc; + ctx->id.mnc = plmn.mnc; llist_for_each_entry(hnb, &ctx->gw->hnb_list, list) { if (hnb->hnb_registered && ctx != hnb && memcmp(&ctx->id, &hnb->id, sizeof(ctx->id)) == 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/26920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I01406a4cf86d4f3ed162c9df55880941e54d654e Gerrit-Change-Number: 26920 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

3
3
0 0

Change in osmo-ci[master]: jenkins-jobs: add master build for opencm3 projects

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/26693 ) Change subject: jenkins-jobs: add master build for opencm3 projects ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/26693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I95f84079478ce57d8d5c0cffd71bc67e1605e68e Gerrit-Change-Number: 26693 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Jan 2022 09:16:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-dev[master]: all.deps, werror.opts: add osmo-bsc-nat

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/26666 ) Change subject: all.deps, werror.opts: add osmo-bsc-nat ...................................................................... all.deps, werror.opts: add osmo-bsc-nat Change-Id: Ica90826c8bfbf4f295c49702d36e7c88e43f80cd --- M all.deps M werror.opts 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: neels: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Verified diff --git a/all.deps b/all.deps index 65bdf27..54209eb 100644 --- a/all.deps +++ b/all.deps @@ -23,6 +23,7 @@ asn1c libasn1c osmo-gbproxy libosmocore osmo-pcap libosmocore +osmo-bsc-nat libosmo-sccp # can only clone these docker-playground diff --git a/werror.opts b/werror.opts index 2121fca..21c876a 100644 --- a/werror.opts +++ b/werror.opts @@ -12,3 +12,4 @@ osmo-msc --enable-werror osmo-sgsn --enable-werror osmo-bts --enable-werror +osmo-bsc-nat --enable-werror -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/26666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ica90826c8bfbf4f295c49702d36e7c88e43f80cd Gerrit-Change-Number: 26666 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in osmo-dev[master]: net/templates/run.sh: refactor kill logic

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/26667 ) Change subject: net/templates/run.sh: refactor kill logic ...................................................................... net/templates/run.sh: refactor kill logic Put the terminal PIDs into a variable instead of running kill %1 %2 etc. This makes it easier to conditionally spawn some of the programs. Change-Id: Iaf6c175de2edf720009af13eace2b0ef83b0735b --- M net/templates/run.sh 1 file changed, 34 insertions(+), 3 deletions(-) Approvals: neels: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Verified diff --git a/net/templates/run.sh b/net/templates/run.sh index 8571a42..cd0fc72 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -118,33 +118,62 @@ sudo tcpdump -i $dev -n -w current_log/$dev.single.pcap -U not port 22 & sudo tcpdump -i lo -n -w current_log/lo.single.pcap -U not port 22 & +PIDS="" + term "$ggsn" GGSN & +PIDS="$PIDS $!" + sleep .2 term "$stp" STP & +PIDS="$PIDS $!" + sleep .2 term "$hlr" HLR & +PIDS="$PIDS $!" + sleep .2 term "$sgsn" SGSN & +PIDS="$PIDS $!" + sleep .2 term "$gbproxy" GBPROXY & +PIDS="$PIDS $!" + sleep .2 term "$mgw4msc" MGW4MSC & +PIDS="$PIDS $!" + sleep .2 term "$mgw4bsc" MGW4BSC & +PIDS="$PIDS $!" + sleep .2 term "$msc" MSC & +PIDS="$PIDS $!" + sleep 2 term "$hnbgw" HNBGW & +PIDS="$PIDS $!" + sleep .2 term "$bsc" BSC & +PIDS="$PIDS $!" if [ "x${MSC_MNCC}" != "xinternal" ]; then sleep .2 term "$sipcon" SIPCON & + PIDS="$PIDS $!" + sleep .2 case "${PBX_SERVER}" in - "kamailio") term "$kamailio" KAMAILIO &;; - "freeswitch") term "./freeswitch/freeswitch.sh" FREESWITCH &;; + "kamailio") + term "$kamailio" KAMAILIO & + PIDS="$PIDS $!" + ;; + "freeswitch") + term "./freeswitch/freeswitch.sh" FREESWITCH & + PIDS="$PIDS $!" + ;; esac fi @@ -157,7 +186,9 @@ #ssh bts neels/stop_remote.sh -kill %1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12 %13 %14 +for i in $PIDS; do + kill "$i" +done killall osmo-msc killall osmo-bsc killall osmo-gbproxy -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/26667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Iaf6c175de2edf720009af13eace2b0ef83b0735b Gerrit-Change-Number: 26667 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in osmo-dev[master]: net: add osmo-bsc-nat

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/26668 ) Change subject: net: add osmo-bsc-nat ...................................................................... net: add osmo-bsc-nat Make STP_CN_IP and STP_RAN_IP configurable. If they are not set to the same IP, run a second OsmoSTP and OsmoBSCNAT to connect both OsmoSTP. Related: OS#2545 Change-Id: I8bfbd00bfeeebc6e1b87a8cd6333212db4380653 --- M net/config_2g3g A net/templates/osmo-bsc-nat.cfg M net/templates/osmo-bsc.cfg M net/templates/osmo-msc.cfg A net/templates/osmo-stp-cn.cfg R net/templates/osmo-stp-ran.cfg M net/templates/run.sh 7 files changed, 92 insertions(+), 5 deletions(-) Approvals: neels: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Verified diff --git a/net/config_2g3g b/net/config_2g3g index 263629f..c1498be 100644 --- a/net/config_2g3g +++ b/net/config_2g3g @@ -109,6 +109,18 @@ SIPCON_SIP="${TO_SIP_IP}" SIPCON_SIP_PORT="5060" +STP_CN_IP="127.0.0.1" +STP_RAN_IP="127.0.0.1" +# Set STP_CN_IP different from STP_RAN_IP, to run a second OsmoSTP and +# OsmoBSCNAT to connect both +# STP_RAN_IP="127.0.0.2" + +# Enabled only when STP_CN_IP != STP_RAN_IP +BSCNAT_CN_PC="${BSC_PC}" +BSCNAT_CN_IP="127.0.0.3" +BSCNAT_RAN_PC="${MSC_PC}" +BSCNAT_RAN_IP="127.0.0.4" + # PBX_SERVER: # "kamailio" -- launch kamailio # "freeswitch" -- launch freeswitch diff --git a/net/templates/osmo-bsc-nat.cfg b/net/templates/osmo-bsc-nat.cfg new file mode 100644 index 0000000..c9a71da --- /dev/null +++ b/net/templates/osmo-bsc-nat.cfg @@ -0,0 +1,21 @@ +${include(common_template_warning)} +cs7 instance 0 + point-code ${BSCNAT_CN_PC} + asp asp-clnt-OsmoBSCNAT-CN 2905 0 m3ua + remote-ip ${STP_CN_IP} + local-ip ${BSCNAT_CN_IP} + +cs7 instance 1 + point-code ${BSCNAT_RAN_PC} + asp asp-clnt-OsmoBSCNAT-RAN 2905 0 m3ua + remote-ip ${STP_RAN_IP} + local-ip ${BSCNAT_RAN_IP} + +bsc-nat + cs7-instance-cn 0 + cs7-instance-ran 1 + +${foreach(LOG_OUTPUT)} +log ${LOG_OUTPUTn_TYPE} +${include(common_logging)} +${foreach_end} diff --git a/net/templates/osmo-bsc.cfg b/net/templates/osmo-bsc.cfg index ab10a81..98f4e0c 100644 --- a/net/templates/osmo-bsc.cfg +++ b/net/templates/osmo-bsc.cfg @@ -19,7 +19,8 @@ ipa bind ${BSC_IP} cs7 instance 0 point-code ${BSC_PC} - asp asp-clnt-msc-0 2905 0 m3ua + asp asp-clnt-bsc-0 2905 0 m3ua + remote-ip ${STP_RAN_IP} network network country code ${MCC} mobile network code ${MNC} diff --git a/net/templates/osmo-msc.cfg b/net/templates/osmo-msc.cfg index 00bf182..c018c78 100644 --- a/net/templates/osmo-msc.cfg +++ b/net/templates/osmo-msc.cfg @@ -1,4 +1,8 @@ ${include(common_template_warning)} +cs7 instance 0 + point-code ${MSC_PC} + asp asp-clnt-msc-0 2905 0 m3ua + remote-ip ${STP_CN_IP} network network country code ${MCC} mobile network code ${MNC} diff --git a/net/templates/osmo-stp-cn.cfg b/net/templates/osmo-stp-cn.cfg new file mode 100644 index 0000000..c84168c --- /dev/null +++ b/net/templates/osmo-stp-cn.cfg @@ -0,0 +1,24 @@ +${include(common_template_warning)} + +# By default, osmo-dev starts one osmo-stp with this config. If STP_CN_IP and +# STP_RAN_IP are changed to be different, osmo-dev starts two osmo-stp, one +# with this config and another one with osmo-stp-ran.cfg. + +line vty + bind ${STP_CN_IP} + +cs7 instance 0 + xua rkm routing-key-allocation dynamic-permitted + listen m3ua 2905 + accept-asp-connections dynamic-permitted + local-ip ${STP_CN_IP} + +${foreach(LOG_OUTPUT)} +log ${LOG_OUTPUTn_TYPE} +${include(common_logging)} + logging level linp notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice +${foreach_end} diff --git a/net/templates/osmo-stp.cfg b/net/templates/osmo-stp-ran.cfg similarity index 70% rename from net/templates/osmo-stp.cfg rename to net/templates/osmo-stp-ran.cfg index d7d1515..c753108 100644 --- a/net/templates/osmo-stp.cfg +++ b/net/templates/osmo-stp-ran.cfg @@ -1,8 +1,16 @@ ${include(common_template_warning)} + +# This file does not get used by default, only if STP_CN_IP and STP_RAN_IP are +# changed to be different! + +line vty + bind ${STP_RAN_IP} + cs7 instance 0 xua rkm routing-key-allocation dynamic-permitted listen m3ua 2905 accept-asp-connections dynamic-permitted + local-ip ${STP_RAN_IP} ${foreach(LOG_OUTPUT)} log ${LOG_OUTPUTn_TYPE} diff --git a/net/templates/run.sh b/net/templates/run.sh index cd0fc72..311cdd9 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -81,8 +81,10 @@ #mgw4bsc="strace osmo-mgw -c osmo-mgw-for-bsc.cfg" mgw4bsc="osmo-mgw -c osmo-mgw-for-bsc.cfg" hlr="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-hlr --db-upgrade" -stp="osmo-stp" +stp4cn="osmo-stp -c osmo-stp-cn.cfg" +stp4ran="osmo-stp -c osmo-stp-ran.cfg" bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc -c osmo-bsc.cfg" +bscnat="osmo-bsc-nat" if [ "x${MSC_MNCC}" != "xinternal" ]; then sipcon="osmo-sip-connector -c osmo-sip-connector.cfg" @@ -123,9 +125,23 @@ term "$ggsn" GGSN & PIDS="$PIDS $!" -sleep .2 -term "$stp" STP & -PIDS="$PIDS $!" +if [ "${STP_CN_IP}" = "${STP_RAN_IP}" ]; then + sleep .2 + term "$stp4cn" STP & + PIDS="$PIDS $!" +else + sleep .2 + term "$stp4cn" STP4CN & + PIDS="$PIDS $!" + + sleep .2 + term "$stp4ran" STP4RAN & + PIDS="$PIDS $!" + + sleep .2 + term "$bscnat" BSCNAT & + PIDS="$PIDS $!" +fi sleep .2 term "$hlr" HLR & @@ -199,6 +215,7 @@ killall -9 osmo-stp sudo killall tcpdump killall osmo-ggsn +killall osmo-bsc-nat if [ "x${MSC_MNCC}" != "xinternal" ]; then # 'killall' seems to work only with the shortened name -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/26668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I8bfbd00bfeeebc6e1b87a8cd6333212db4380653 Gerrit-Change-Number: 26668 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in osmo-dev[master]: net: add osmo-bsc-nat

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/26668 ) Change subject: net: add osmo-bsc-nat ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/26668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I8bfbd00bfeeebc6e1b87a8cd6333212db4380653 Gerrit-Change-Number: 26668 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Jan 2022 09:11:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-dev[master]: net/templates/run.sh: refactor kill logic

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/26667 ) Change subject: net/templates/run.sh: refactor kill logic ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/26667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Iaf6c175de2edf720009af13eace2b0ef83b0735b Gerrit-Change-Number: 26667 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Jan 2022 09:11:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-dev[master]: all.deps, werror.opts: add osmo-bsc-nat

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/26666 ) Change subject: all.deps, werror.opts: add osmo-bsc-nat ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/26666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ica90826c8bfbf4f295c49702d36e7c88e43f80cd Gerrit-Change-Number: 26666 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Jan 2022 09:11:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: mgw: Introduce test TC_two_crcx_mdcx_and_iuup_rtp

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26860 ) Change subject: mgw: Introduce test TC_two_crcx_mdcx_and_iuup_rtp ...................................................................... mgw: Introduce test TC_two_crcx_mdcx_and_iuup_rtp This test validates we can connect 3G to 2G AMR calls fine. Change-Id: I3627711d80c5e42d56e478c1c4ff3fb5b27adfdf --- M mgw/MGCP_Test.ttcn 1 file changed, 122 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/60/26860/1 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index e1d713e..9defea7 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -2463,7 +2463,7 @@ setverdict(pass); } - /* create two local RTP emulations and pass data in both directions */ + /* create two local RTP+IuUP emulations and pass data in both directions */ function f_tc_two_crcx_mdcx_and_iuup(charstring local_ip_a, charstring remote_ip_a, charstring local_ip_b, charstring remote_ip_b) runs on dummy_CT { var RtpFlowData flow[2]; @@ -2580,6 +2580,126 @@ mp_local_ipv4, mp_remote_ipv4); } + /* create two local emulations (1 RTP, 1 RTP+IuUP) and pass data in both directions */ + function f_tc_two_crcx_mdcx_and_iuup_rtp(charstring local_ip_a, charstring remote_ip_a, + charstring local_ip_b, charstring remote_ip_b) runs on dummy_CT { + var RtpFlowData flow[2]; + var RtpemStats stats[2]; + var MgcpResponse resp; + var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "2@" & c_mgw_domain; + var MgcpCallId call_id := '1227'H; + var integer num_pkts_tx[2]; + var integer temp; + + f_init(ep); + + /* Create the first connection in receive only mode (RNC side, IuUP-Init active) */ + flow[0] := valueof(t_RtpFlow(local_ip_a, remote_ip_a, 96, "VND.3GPP.IUFP/16000")); + flow[0].em.portnr := 10000; + flow[0].rtp_cfg := c_RtpemDefaultCfg; + flow[0].rtp_cfg.tx_payload_type := flow[0].pt; + flow[0].rtp_cfg.tx_fixed_payload := '4f28959ffeb80181f5c4e83d176c897b4a4e333298333419a493ca63ded6e0'O; + flow[0].rtp_cfg.rx_fixed_payload := '08556d944c71a1a081e7ead204244480000ecd82b81118000097c4794e7740'O; /* flow[1].rtp_cfg.tx_fixed_payload converted AMR-BE-RTP->AMR-IUUP*/ + flow[0].rtp_cfg.iuup_mode := true; + flow[0].rtp_cfg.iuup_tx_init := true; + f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true); + f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); + + /* Create the second connection. This connection will be also + * in receive only mode (CN side, regular RTP) */ + flow[1] := valueof(t_RtpFlow(local_ip_b, remote_ip_b, 112, "AMR/8000")); + flow[1].em.portnr := 20000; + flow[1].rtp_cfg := c_RtpemDefaultCfg; + flow[1].rtp_cfg.tx_payload_type := flow[1].pt; + flow[1].rtp_cfg.tx_fixed_payload := '0382155b65131c68682079fab4810911200003b360ae0446000025f11e539dd0'O; + flow[1].rtp_cfg.rx_fixed_payload := 'f3d3ca2567ffae00607d713a0f45db225ed2938ccca60ccd066924f298f7b5b8'O; /* flow[0].rtp_cfg.tx_fixed_payload converted AMR-IuUP->AMR-BE-RTP*/ + flow[1].rtp_cfg.iuup_mode := false; + f_flow_create(RTPEM[1], ep, call_id, "recvonly", flow[1], true); + f_rtpem_mode(RTPEM[1], RTPEM_MODE_RXONLY); + + /* The first leg starts transmitting */ + f_rtpem_mode(RTPEM[0], RTPEM_MODE_TXONLY); + f_sleep(0.5); + stats[0] := f_rtpem_stats_get(RTPEM[0]); + if (stats[0].num_pkts_rx_err_disabled != 0) { + setverdict(fail, "received packets from MGW on recvonly connection 0"); + mtc.stop; + } + stats[1] := f_rtpem_stats_get(RTPEM[1]); + if (stats[1].num_pkts_rx_err_disabled != 0) { + setverdict(fail, "received packets from MGW on recvonly connection 1"); + mtc.stop; + } + + /* The second leg starts transmitting a little later */ + f_rtpem_mode(RTPEM[1], RTPEM_MODE_TXONLY); + f_sleep(1.0); + stats[0] := f_rtpem_stats_get(RTPEM[0]); + if (stats[0].num_pkts_rx_err_disabled != 0) { + setverdict(fail, "received packets from MGW on recvonly connection 0"); + mtc.stop; + } + stats[1] := f_rtpem_stats_get(RTPEM[1]); + if (stats[1].num_pkts_rx_err_disabled != 0) { + setverdict(fail, "received packets from MGW on recvonly connection 1"); + mtc.stop; + } + + /* The first leg will now be switched into bidirectional + * mode, but we do not expect any data coming back yet. */ + f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR); + stats[1] := f_rtpem_stats_get(RTPEM[1]); + num_pkts_tx[1] := stats[1].num_pkts_tx; + f_flow_modify(RTPEM[0], ep, call_id, "sendrecv", flow[0]); + f_sleep(0.5); + stats[0] := f_rtpem_stats_get(RTPEM[0]); + if (stats[0].num_pkts_rx_err_disabled != 0) { + setverdict(fail, "received packets from MGW on recvonly connection 0"); + mtc.stop; + } + stats[1] := f_rtpem_stats_get(RTPEM[1]); + if (stats[1].num_pkts_rx_err_disabled != 0) { + setverdict(fail, "received packets from MGW on recvonly connection 1"); + mtc.stop; + } + + /* When the second leg is switched into bidirectional mode + * as well, then the MGW will connect the two together and + * we should see RTP streams passing through from both ends. */ + f_rtpem_mode(RTPEM[1], RTPEM_MODE_BIDIR); + stats[0] := f_rtpem_stats_get(RTPEM[0]); + num_pkts_tx[0] := stats[0].num_pkts_tx; + f_flow_modify(RTPEM[1], ep, call_id, "sendrecv", flow[1]); + f_sleep(2.0); + + stats[0] := f_rtpem_stats_get(RTPEM[0]); + stats[1] := f_rtpem_stats_get(RTPEM[1]); + + temp := stats[0].num_pkts_tx - num_pkts_tx[0] - stats[1].num_pkts_rx; + if (temp > 3 or temp < -3) { + setverdict(fail, "number of packets not within normal parameters:", temp); + mtc.stop; + } + + temp := stats[1].num_pkts_tx - num_pkts_tx[1] - stats[0].num_pkts_rx; + if (temp > 3 or temp < -3) { + setverdict(fail, "number of packets not within normal parameters:", temp); + mtc.stop; + } + + f_rtpem_stats_err_check(stats[0]); + f_rtpem_stats_err_check(stats[1]); + + /* Tear down */ + f_flow_delete(RTPEM[0]); + f_flow_delete(RTPEM[1], ep, call_id); + setverdict(pass); + } + testcase TC_two_crcx_mdcx_and_iuup_rtp() runs on dummy_CT { + f_tc_two_crcx_mdcx_and_iuup_rtp(mp_local_ipv4, mp_remote_ipv4, + mp_local_ipv4, mp_remote_ipv4); + } + control { execute(TC_selftest()); execute(TC_crcx()); @@ -2655,6 +2775,7 @@ execute(TC_two_crcx_mdcx_and_rtp_osmux_ipv6_ipv4()); execute(TC_two_crcx_mdcx_and_iuup()); + execute(TC_two_crcx_mdcx_and_iuup_rtp()); /* Note: This testcase will trigger an OSMO_ASSERT() bug in * older versions of osmo-mgw. This eventually leads into -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26860 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: I3627711d80c5e42d56e478c1c4ff3fb5b27adfdf Gerrit-Change-Number: 26860 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 5 months

2
3
0 0

Change in libosmocore[master]: PFCP: add DLPFCP and osmo-upf port numbers

by lynxis lazus

lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26606 ) Change subject: PFCP: add DLPFCP and osmo-upf port numbers ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0a46b147ec6a76d909df28136cfd2b764b2c75ea Gerrit-Change-Number: 26606 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Jan 2022 08:07:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log