- gerrit-log - lists.osmocom.org

Change in osmo-msc[master]: call_leg: local_bridge: Avoid null pointer access if CN-side not ready

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/26917 ) Change subject: call_leg: local_bridge: Avoid null pointer access if CN-side not ready ...................................................................... call_leg: local_bridge: Avoid null pointer access if CN-side not ready This happens if for instance an HNBGW drops the RAB-AssignmentRequest and does nothing with it. call_leg.c:348:15: runtime error: member access within null pointer of type 'struct rtp_stream' Related: OS#5401 Change-Id: I67d2d5b2dd3b367c34f929d63c056306ec001431 --- M src/libmsc/call_leg.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/17/26917/1 diff --git a/src/libmsc/call_leg.c b/src/libmsc/call_leg.c index 6242a80..e890f75 100644 --- a/src/libmsc/call_leg.c +++ b/src/libmsc/call_leg.c @@ -344,6 +344,9 @@ } codec = cl1->rtp[RTP_TO_RAN]->codec; + if (!cl1->rtp[RTP_TO_CN] || !cl2->rtp[RTP_TO_CN]) + return -ENOTCONN; + call_leg_ensure_ci(cl1, RTP_TO_CN, call_id1, trans1, &codec, &cl2->rtp[RTP_TO_CN]->local); call_leg_ensure_ci(cl2, RTP_TO_CN, call_id2, trans2, -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/26917 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I67d2d5b2dd3b367c34f929d63c056306ec001431 Gerrit-Change-Number: 26917 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 6 months

4
8
0 0

Change in osmo-bsc[master]: nm_bts_fsm: fix sourcecode formatting

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26924 ) Change subject: nm_bts_fsm: fix sourcecode formatting ...................................................................... nm_bts_fsm: fix sourcecode formatting Change-Id: If7db7f5611e0ebf69d66b135515c0a08c6edfb11 --- M src/osmo-bsc/nm_bts_fsm.c 1 file changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/24/26924/1 diff --git a/src/osmo-bsc/nm_bts_fsm.c b/src/osmo-bsc/nm_bts_fsm.c index eda74fd..b9ed5a0 100644 --- a/src/osmo-bsc/nm_bts_fsm.c +++ b/src/osmo-bsc/nm_bts_fsm.c @@ -366,15 +366,15 @@ .action = st_op_disabled_offline, }, [NM_BTS_ST_OP_ENABLED] = { - .in_event_mask = - X(NM_EV_STATE_CHG_REP), - .out_state_mask = - X(NM_BTS_ST_OP_DISABLED_NOTINSTALLED) | - X(NM_BTS_ST_OP_DISABLED_DEPENDENCY) | - X(NM_BTS_ST_OP_DISABLED_OFFLINE), - .name = "ENABLED", - .onenter = st_op_enabled_on_enter, - .action = st_op_enabled, + .in_event_mask = + X(NM_EV_STATE_CHG_REP), + .out_state_mask = + X(NM_BTS_ST_OP_DISABLED_NOTINSTALLED) | + X(NM_BTS_ST_OP_DISABLED_DEPENDENCY) | + X(NM_BTS_ST_OP_DISABLED_OFFLINE), + .name = "ENABLED", + .onenter = st_op_enabled_on_enter, + .action = st_op_enabled, }, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If7db7f5611e0ebf69d66b135515c0a08c6edfb11 Gerrit-Change-Number: 26924 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 6 months

2
2
0 0

Change in osmo-dev[master]: Add tmux scripts for ttcn3-{msc,bsc,bts}-test

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/26485 ) Change subject: Add tmux scripts for ttcn3-{msc,bsc,bts}-test ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/26485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I201b77c013cbeef9d1a07b9422b27f375811ed69 Gerrit-Change-Number: 26485 Gerrit-PatchSet: 4 Gerrit-Owner: 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: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Jan 2022 10:30:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 6 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... Patch Set 6: > having stale configs downloaded. what I mean: * the config gets downloaded once on a developer's machine * the config changes in osmo-ttcn3-hacks * now the config does not get downloaded again, since the file already exists * tests will start failing, developer needs to figure out why -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 Gerrit-Change-Number: 20622 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Assignee: fixeria <vyanitskiy(a)sysmocom.de> 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-Comment-Date: Mon, 17 Jan 2022 10:29:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 6 months

1
0
0 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... Patch Set 6: Should this be marked as WIP? In OS#5377 fixeria wrote: "the configuration file is still not understood correctly" Regarding the patch, I would try to avoid downloading the files with wget, and rather run the config merge inside docker, where the config files are available in the checked out osmo-ttcn3-hacks.git. Then we would avoid the problem of having stale configs downloaded. But not sure if it's worth investing time to refactor it at this point, the solution from this patch should work well enough. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 Gerrit-Change-Number: 20622 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Assignee: fixeria <vyanitskiy(a)sysmocom.de> 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-Comment-Date: Mon, 17 Jan 2022 10:27:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 6 months

1
0
0 0

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, 6 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, 6 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, 6 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, 6 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, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log