<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13108">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">net/: refactor cfg templates<br><br>Adopt "foreach" and "common_" features and generally take in the improved<br>templates as used at 35c3.<br><br>If your config file relies on the tmpl_std that is now removed, you can locally<br>resurrect it with<br><br> git checkout 2c6a55baa72de0e -- tmpl_std<br><br>but it's probably better to make a new copy of config_2g3g and insert your<br>local config there.<br><br>Change-Id: Ie6352c584c0fce57c617387160c285abf40a5f90<br>---<br>M net/README<br>D net/common_bsc_logging<br>D net/common_logging<br>M net/config_2g3g<br>R net/templates/Makefile<br>A net/templates/common_logging_bsc<br>A net/templates/common_logging_gsmtap<br>A net/templates/common_logging_msc<br>A net/templates/common_logging_stderr<br>A net/templates/common_statsd<br>A net/templates/common_template_warning<br>R net/templates/kamailio.cfg<br>A net/templates/nano3G_dmi.txt<br>A net/templates/osmo-bsc.cfg<br>R net/templates/osmo-gbproxy.cfg<br>A net/templates/osmo-ggsn.cfg<br>A net/templates/osmo-hlr.cfg<br>A net/templates/osmo-hnbgw.cfg<br>A net/templates/osmo-mgw-for-bsc.cfg<br>A net/templates/osmo-mgw-for-msc.cfg<br>A net/templates/osmo-msc.cfg<br>R net/templates/osmo-sgsn.cfg<br>A net/templates/osmo-sip-connector.cfg<br>A net/templates/osmo-stp.cfg<br>R net/templates/run.sh<br>D net/tmpl_std/nano3G.txt<br>D net/tmpl_std/nano3G2.txt<br>D net/tmpl_std/osmo-bsc.cfg<br>D net/tmpl_std/osmo-ggsn.cfg<br>D net/tmpl_std/osmo-hlr.cfg<br>D net/tmpl_std/osmo-hnbgw.cfg<br>D net/tmpl_std/osmo-mgw-for-bsc.cfg<br>D net/tmpl_std/osmo-mgw-for-msc.cfg<br>D net/tmpl_std/osmo-msc.cfg<br>D net/tmpl_std/osmo-sip-connector.cfg<br>D net/tmpl_std/osmo-stp.cfg<br>36 files changed, 377 insertions(+), 310 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/08/13108/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/net/README b/net/README</span><br><span>index 1d07775..73a8d2f 100644</span><br><span>--- a/net/README</span><br><span>+++ b/net/README</span><br><span>@@ -16,7 +16,7 @@</span><br><span> </span><br><span> mkdir my_network</span><br><span> cd my_network</span><br><span style="color: hsl(0, 100%, 40%);">-../fill_config.py ../config_mine ../tmpl_std</span><br><span style="color: hsl(120, 100%, 40%);">+../fill_config.py ../config_mine ../templates</span><br><span> </span><br><span> ./run.sh</span><br><span> # Launches numerous x-terminals with one component running in each.</span><br><span>@@ -31,27 +31,27 @@</span><br><span> # tweak config?</span><br><span> $EDITOR ../config_mine</span><br><span> ../fill_config.py</span><br><span style="color: hsl(0, 100%, 40%);">-# picks up same ../config_mine and ../tmpl_std from last time</span><br><span style="color: hsl(120, 100%, 40%);">+# picks up same ../config_mine and ../templates from last time</span><br><span> </span><br><span> # own templates?</span><br><span style="color: hsl(0, 100%, 40%);">-cp -r ../tmpl_std ../tmpl_mine</span><br><span style="color: hsl(0, 100%, 40%);">-$EDITOR ../tmpl_mine/*</span><br><span style="color: hsl(0, 100%, 40%);">-../fill_config.py ../tmpl_mine</span><br><span style="color: hsl(0, 100%, 40%);">-# picks up same ../config_mine from last time, and ../tmpl_mine from cmdline</span><br><span style="color: hsl(120, 100%, 40%);">+cp -r ../templates ../templates_mine</span><br><span style="color: hsl(120, 100%, 40%);">+$EDITOR ../templates_mine/*</span><br><span style="color: hsl(120, 100%, 40%);">+../fill_config.py ../templates_mine</span><br><span style="color: hsl(120, 100%, 40%);">+# picks up same ../config_mine from last time, and ../templates_mine from cmdline</span><br><span> </span><br><span> </span><br><span> If you wanted to change to dynamic timeslots, you can:</span><br><span> </span><br><span> cd ..</span><br><span style="color: hsl(0, 100%, 40%);">-mkdir tmpl_dyn</span><br><span style="color: hsl(0, 100%, 40%);">-cd tmpl_dyn</span><br><span style="color: hsl(0, 100%, 40%);">-ln -s ../tmpl_std/* .</span><br><span style="color: hsl(120, 100%, 40%);">+mkdir templates_dyn</span><br><span style="color: hsl(120, 100%, 40%);">+cd templates_dyn</span><br><span style="color: hsl(120, 100%, 40%);">+ln -s ../templates/* .</span><br><span> rm ./osmo-bsc.cfg</span><br><span style="color: hsl(0, 100%, 40%);">-cp ../tmpl_std/osmo-bsc.cfg .</span><br><span style="color: hsl(120, 100%, 40%);">+cp ../templates/osmo-bsc.cfg .</span><br><span> sed -i 's#TCH/F#TCH/F_TCH/H_PDCH#' osmo-bsc.cfg</span><br><span> </span><br><span> cd ../my_network</span><br><span style="color: hsl(0, 100%, 40%);">-../fill_config.py ../tmpl_dyn</span><br><span style="color: hsl(120, 100%, 40%);">+../fill_config.py ../templates_dyn</span><br><span> </span><br><span> </span><br><span> If you moved your laptop to a different location, you can:</span><br><span>@@ -64,7 +64,7 @@</span><br><span> === Config file templates</span><br><span> </span><br><span> A *directory* contains template files that are filled with specific values by the</span><br><span style="color: hsl(0, 100%, 40%);">-fill_config.py script. See e.g. tmpl_std/.</span><br><span style="color: hsl(120, 100%, 40%);">+fill_config.py script. See e.g. templates/.</span><br><span> </span><br><span> A *file* contains local config items as name=val pairs that are put into the</span><br><span> templates. See e.g. config_2g3g.</span><br><span>@@ -83,7 +83,7 @@</span><br><span> </span><br><span> === Launch</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-A run.sh script template (tmpl_std/run.sh) also gets filled with specifics and</span><br><span style="color: hsl(120, 100%, 40%);">+A run.sh script template (templates/run.sh) also gets filled with specifics and</span><br><span> placed next to the .cfg files.</span><br><span> </span><br><span> run.sh uses sudo to start tcpdump, configure ip forwarding and masquerading</span><br><span>diff --git a/net/common_bsc_logging b/net/common_bsc_logging</span><br><span>deleted file mode 100644</span><br><span>index 2f891c7..0000000</span><br><span>--- a/net/common_bsc_logging</span><br><span>+++ /dev/null</span><br><span>@@ -1,11 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-${include(common_logging)}</span><br><span style="color: hsl(0, 100%, 40%);">-log stderr</span><br><span style="color: hsl(0, 100%, 40%);">- logging level lsua notice</span><br><span style="color: hsl(0, 100%, 40%);">- logging level lss7 notice</span><br><span style="color: hsl(0, 100%, 40%);">- logging level linp notice</span><br><span style="color: hsl(0, 100%, 40%);">- logging level hodec notice</span><br><span style="color: hsl(0, 100%, 40%);">-log gsmtap 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">- logging level lsua notice</span><br><span style="color: hsl(0, 100%, 40%);">- logging level lss7 notice</span><br><span style="color: hsl(0, 100%, 40%);">- logging level linp notice</span><br><span style="color: hsl(0, 100%, 40%);">- logging level hodec notice</span><br><span>diff --git a/net/common_logging b/net/common_logging</span><br><span>deleted file mode 100644</span><br><span>index 8d074ab..0000000</span><br><span>--- a/net/common_logging</span><br><span>+++ /dev/null</span><br><span>@@ -1,23 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-log stderr</span><br><span style="color: hsl(0, 100%, 40%);">- logging filter all 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging color 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging print level 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging print category 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging print category-hex 0</span><br><span style="color: hsl(0, 100%, 40%);">- logging print file basename last</span><br><span style="color: hsl(0, 100%, 40%);">- #logging print timestamp date</span><br><span style="color: hsl(0, 100%, 40%);">- logging print extended-timestamp 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging level set-all debug</span><br><span style="color: hsl(0, 100%, 40%);">-log file current_log/${_name}.log</span><br><span style="color: hsl(0, 100%, 40%);">- logging filter all 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging color 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging print level 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging print category 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging print category-hex 0</span><br><span style="color: hsl(0, 100%, 40%);">- logging print file basename last</span><br><span style="color: hsl(0, 100%, 40%);">- #logging print timestamp date</span><br><span style="color: hsl(0, 100%, 40%);">- logging print extended-timestamp 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging level set-all debug</span><br><span style="color: hsl(0, 100%, 40%);">-log gsmtap 127.0.0.1</span><br><span style="color: hsl(0, 100%, 40%);">- logging filter all 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging level set-all debug</span><br><span>diff --git a/net/config_2g3g b/net/config_2g3g</span><br><span>index 622a4be..891e962 100644</span><br><span>--- a/net/config_2g3g</span><br><span>+++ b/net/config_2g3g</span><br><span>@@ -1,81 +1,112 @@</span><br><span> ETH_DEV=eth0</span><br><span> APN_DEV=apn0</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-PUBLIC_IP="192.168.0.23"</span><br><span style="color: hsl(0, 100%, 40%);">-PUBLIC_IP2="192.168.0.42"</span><br><span style="color: hsl(120, 100%, 40%);">+TO_RAN_IP="192.168.0.3"</span><br><span style="color: hsl(120, 100%, 40%);">+TO_RAN_IP2="192.168.0.4"</span><br><span style="color: hsl(120, 100%, 40%);">+TO_SIP_IP="127.0.0.2"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+STATSD_IP="127.0.0.1"</span><br><span> </span><br><span> MCC=001</span><br><span> MNC=01</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-BTS0_BAND=GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">-BTS0_LAC=23</span><br><span style="color: hsl(0, 100%, 40%);">-BTS0_CI=5</span><br><span style="color: hsl(0, 100%, 40%);">-BTS0_ARFCN=860</span><br><span style="color: hsl(0, 100%, 40%);">-BTS0_MAX_POWER_RED=21</span><br><span style="color: hsl(0, 100%, 40%);">-BTS0_IPA_UNIT="1234 0"</span><br><span style="color: hsl(0, 100%, 40%);">-BTS0_NSVCI=1234</span><br><span style="color: hsl(0, 100%, 40%);">-BTS0_NSEI="${BTS0_NSVCI}"</span><br><span style="color: hsl(0, 100%, 40%);">-BTS0_BVCI="${BTS0_NSVCI}"</span><br><span style="color: hsl(120, 100%, 40%);">+TCH_TYPE=TCH/H</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-BTS1_BAND=GSM-1800</span><br><span style="color: hsl(0, 100%, 40%);">-BTS1_LAC=42</span><br><span style="color: hsl(0, 100%, 40%);">-BTS1_CI=13</span><br><span style="color: hsl(0, 100%, 40%);">-BTS1_ARFCN=862</span><br><span style="color: hsl(0, 100%, 40%);">-BTS1_MAX_POWER_RED=21</span><br><span style="color: hsl(0, 100%, 40%);">-BTS1_IPA_UNIT="1235 0"</span><br><span style="color: hsl(0, 100%, 40%);">-BTS1_NSVCI=1235</span><br><span style="color: hsl(0, 100%, 40%);">-BTS1_NSEI="${BTS1_NSVCI}"</span><br><span style="color: hsl(0, 100%, 40%);">-BTS1_BVCI="${BTS1_NSVCI}"</span><br><span style="color: hsl(120, 100%, 40%);">+BTS_BAND=GSM-1800</span><br><span style="color: hsl(120, 100%, 40%);">+BTS_LAC=23</span><br><span style="color: hsl(120, 100%, 40%);">+BTS_MAX_POWER_RED=21</span><br><span style="color: hsl(120, 100%, 40%);">+BTS_CODEC_SUPPORT=fr amr</span><br><span style="color: hsl(120, 100%, 40%);">+BTS_200mW=23</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-HLR_IP="127.0.0.1"</span><br><span style="color: hsl(120, 100%, 40%);">+BTS0_DESCRIPTION="my test BTS 0"</span><br><span style="color: hsl(120, 100%, 40%);">+BTS0_IPA_UNIT="0 0"</span><br><span style="color: hsl(120, 100%, 40%);">+BTS0_ARFCN=123</span><br><span style="color: hsl(120, 100%, 40%);">+BTS0_CI=${BTSn}</span><br><span style="color: hsl(120, 100%, 40%);">+BTS0_BSIC=${BTSn}</span><br><span style="color: hsl(120, 100%, 40%);">+BTS0_GPRS_MODE=gprs</span><br><span style="color: hsl(120, 100%, 40%);">+BTS0_GB_REMOTE_IP=${SGSN_IP}</span><br><span style="color: hsl(120, 100%, 40%);">+BTS0_GB_REMOTE_PORT=${SGSN_GB_PORT}</span><br><span style="color: hsl(120, 100%, 40%);">+BTS0_NSVCI=${BTSn}</span><br><span style="color: hsl(120, 100%, 40%);">+BTS0_NSEI="${BTSn_NSVCI}"</span><br><span style="color: hsl(120, 100%, 40%);">+# according to osmo-bsc vty, BVCI must be >= 2</span><br><span style="color: hsl(120, 100%, 40%);">+BTS0_BVCI="100${BTSn}"</span><br><span style="color: hsl(120, 100%, 40%);">+BTS0_BAND=${BTS_BAND}</span><br><span style="color: hsl(120, 100%, 40%);">+BTS0_LAC=${BTS_LAC}</span><br><span style="color: hsl(120, 100%, 40%);">+BTS0_MAX_POWER_RED=${BTS_MAX_POWER_RED}</span><br><span style="color: hsl(120, 100%, 40%);">+BTS0_NOMINAL_POWER=${BTS_200mW}</span><br><span style="color: hsl(120, 100%, 40%);">+BTS0_CODEC_SUPPORT=${BTS_CODEC_SUPPORT}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+BTS1_DESCRIPTION="my test BTS 1"</span><br><span style="color: hsl(120, 100%, 40%);">+BTS1_IPA_UNIT="1 0"</span><br><span style="color: hsl(120, 100%, 40%);">+BTS1_ARFCN=125</span><br><span style="color: hsl(120, 100%, 40%);">+BTS1_CI=${BTSn}</span><br><span style="color: hsl(120, 100%, 40%);">+BTS1_BSIC=${BTSn}</span><br><span style="color: hsl(120, 100%, 40%);">+BTS1_GPRS_MODE=gprs</span><br><span style="color: hsl(120, 100%, 40%);">+BTS1_GB_REMOTE_IP=${GBPROXY_IP}</span><br><span style="color: hsl(120, 100%, 40%);">+BTS1_GB_REMOTE_PORT=${GBPROXY_GB_PORT}</span><br><span style="color: hsl(120, 100%, 40%);">+BTS1_NSVCI=${BTSn}</span><br><span style="color: hsl(120, 100%, 40%);">+BTS1_NSEI="${BTSn_NSVCI}"</span><br><span style="color: hsl(120, 100%, 40%);">+BTS1_BVCI="100${BTSn}"</span><br><span style="color: hsl(120, 100%, 40%);">+BTS1_BAND=${BTS_BAND}</span><br><span style="color: hsl(120, 100%, 40%);">+BTS1_LAC=${BTS_LAC}</span><br><span style="color: hsl(120, 100%, 40%);">+BTS1_MAX_POWER_RED=${BTS_MAX_POWER_RED}</span><br><span style="color: hsl(120, 100%, 40%);">+BTS1_NOMINAL_POWER=${BTS_200mW}</span><br><span style="color: hsl(120, 100%, 40%);">+BTS1_CODEC_SUPPORT=${BTS_CODEC_SUPPORT}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+HLR_IP=127.0.0.1</span><br><span> </span><br><span> MSC_PC="0.23.1"</span><br><span style="color: hsl(0, 100%, 40%);">-MSC_MNCC_SOCKET="${NET_DIR}/msc_mncc_socket"</span><br><span style="color: hsl(120, 100%, 40%);">+MSC_MNCC_SOCKET="/tmp/mncc_socket"</span><br><span style="color: hsl(120, 100%, 40%);">+MSC_MNCC="internal"</span><br><span style="color: hsl(120, 100%, 40%);">+# MSC_MNCC="external ${MSC_MNCC_SOCKET}"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-AUTH=optional</span><br><span style="color: hsl(0, 100%, 40%);">-ENCR_A5=0</span><br><span style="color: hsl(120, 100%, 40%);">+AUTH=required</span><br><span style="color: hsl(120, 100%, 40%);">+ENCR_A5=1</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-SGSN_IP="${PUBLIC_IP}"</span><br><span style="color: hsl(120, 100%, 40%);">+SGSN_IP="${TO_RAN_IP}"</span><br><span> SGSN_PC="0.23.2"</span><br><span> SGSN_GB_PORT=23000</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-GBPROXY_IP="${PUBLIC_IP}"</span><br><span style="color: hsl(120, 100%, 40%);">+GBPROXY_IP="${TO_RAN_IP}"</span><br><span> GBPROXY_GB_PORT=7777</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-PCU_GB_PORT=23000</span><br><span style="color: hsl(120, 100%, 40%);">+PCU_GB_LOCAL_PORT=23000</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-MGW4MSC_IP="${PUBLIC_IP}"</span><br><span style="color: hsl(120, 100%, 40%);">+MGW4MSC_IP="${TO_SIP_IP}"</span><br><span style="color: hsl(120, 100%, 40%);">+MGW4MSC_PORT="2427"</span><br><span> MGW4MSC_VTY_IP="127.0.0.1"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-BSC_IP="${PUBLIC_IP}"</span><br><span style="color: hsl(0, 100%, 40%);">-BSC_PC="0.42.0"</span><br><span style="color: hsl(0, 100%, 40%);">-BSC_CODEC_LIST="fr1 hr1"</span><br><span style="color: hsl(0, 100%, 40%);">-MGW4BSC_IP="${PUBLIC_IP2}"</span><br><span style="color: hsl(120, 100%, 40%);">+MGW4BSC_IP="${TO_RAN_IP}"</span><br><span> MGW4BSC_PORT="2427"</span><br><span> MGW4BSC_VTY_IP="127.0.0.2"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-HNBGW_PC="0.3.0"</span><br><span style="color: hsl(0, 100%, 40%);">-HNBGW_IP="${PUBLIC_IP}"</span><br><span style="color: hsl(120, 100%, 40%);">+BSC_IP="${TO_RAN_IP}"</span><br><span style="color: hsl(120, 100%, 40%);">+BSC_PC="0.23.3"</span><br><span style="color: hsl(120, 100%, 40%);">+BSC_CODEC_LIST="hr3"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-GGSN_IP="${PUBLIC_IP2}"</span><br><span style="color: hsl(120, 100%, 40%);">+HNBGW_PC="0.3.0"</span><br><span style="color: hsl(120, 100%, 40%);">+HNBGW_IP="${TO_RAN_IP}"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+HNODEB0_IP="192.168.0.124"</span><br><span style="color: hsl(120, 100%, 40%);">+HNODEB0_UARFCN=4357</span><br><span style="color: hsl(120, 100%, 40%);">+HNODEB0_SCRAMBLE=157</span><br><span style="color: hsl(120, 100%, 40%);">+HNODEB0_LAC=1${HNODEB0_UARFCN}</span><br><span style="color: hsl(120, 100%, 40%);">+HNODEB0_RAC=11</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+HNODEB1_IP="192.168.0.23"</span><br><span style="color: hsl(120, 100%, 40%);">+HNODEB1_UARFCN=4358</span><br><span style="color: hsl(120, 100%, 40%);">+HNODEB1_SCRAMBLE=258</span><br><span style="color: hsl(120, 100%, 40%);">+HNODEB1_LAC=1${HNODEB1_UARFCN}</span><br><span style="color: hsl(120, 100%, 40%);">+HNODEB1_RAC=22</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+GGSN_IP="${TO_RAN_IP2}"</span><br><span> GGSN_DNS0="192.168.0.1"</span><br><span> GGSN_DNS1="9.9.9.9"</span><br><span> GGSN_NET="192.168.42.0/24"</span><br><span style="color: hsl(120, 100%, 40%);">+GGSN_GTP_STATE_DIR=/tmp</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-HNODEB_IP="192.168.0.124"</span><br><span style="color: hsl(0, 100%, 40%);">-UARFCN=4357</span><br><span style="color: hsl(0, 100%, 40%);">-SCRAMBLE=157</span><br><span style="color: hsl(0, 100%, 40%);">-LAC=1${UARFCN}</span><br><span style="color: hsl(0, 100%, 40%);">-RAC=11</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-HNODEB_IP2="192.168.0.23"</span><br><span style="color: hsl(0, 100%, 40%);">-UARFCN2=4358</span><br><span style="color: hsl(0, 100%, 40%);">-SCRAMBLE2=258</span><br><span style="color: hsl(0, 100%, 40%);">-LAC2=2${UARFCN2}</span><br><span style="color: hsl(0, 100%, 40%);">-RAC2=22</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-SIPCON_ENABLE="false"</span><br><span style="color: hsl(0, 100%, 40%);">-SIPCON_LOCAL="${PUBLIC_IP}"</span><br><span style="color: hsl(0, 100%, 40%);">-SIPCON_LOCAL_PORT="5069"</span><br><span style="color: hsl(0, 100%, 40%);">-SIPCON_REMOTE="${PUBLIC_IP}"</span><br><span style="color: hsl(0, 100%, 40%);">-SIPCON_REMOTE_PORT="5060"</span><br><span style="color: hsl(120, 100%, 40%);">+# Enabled only when MSC_MNCC != "internal"</span><br><span style="color: hsl(120, 100%, 40%);">+SIPCON_LOCAL="${TO_SIP_IP}"</span><br><span style="color: hsl(120, 100%, 40%);">+SIPCON_LOCAL_PORT="5060"</span><br><span style="color: hsl(120, 100%, 40%);">+SIPCON_REMOTE="127.0.0.1"</span><br><span style="color: hsl(120, 100%, 40%);">+SIPCON_REMOTE_PORT="5069"</span><br><span>diff --git a/net/tmpl_std/Makefile b/net/templates/Makefile</span><br><span>similarity index 100%</span><br><span>rename from net/tmpl_std/Makefile</span><br><span>rename to net/templates/Makefile</span><br><span>diff --git a/net/templates/common_logging_bsc b/net/templates/common_logging_bsc</span><br><span>new file mode 100644</span><br><span>index 0000000..bf60d7a</span><br><span>--- /dev/null</span><br><span>+++ b/net/templates/common_logging_bsc</span><br><span>@@ -0,0 +1,8 @@</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level hodec info</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level ho info</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lmi info</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level linp notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lss7 notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lsccp notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lsua notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lm3ua notice</span><br><span>diff --git a/net/templates/common_logging_gsmtap b/net/templates/common_logging_gsmtap</span><br><span>new file mode 100644</span><br><span>index 0000000..f85da41</span><br><span>--- /dev/null</span><br><span>+++ b/net/templates/common_logging_gsmtap</span><br><span>@@ -0,0 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+log gsmtap 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging filter all 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level set-all notice</span><br><span>diff --git a/net/templates/common_logging_msc b/net/templates/common_logging_msc</span><br><span>new file mode 100644</span><br><span>index 0000000..5100d47</span><br><span>--- /dev/null</span><br><span>+++ b/net/templates/common_logging_msc</span><br><span>@@ -0,0 +1,5 @@</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level linp notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lss7 notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lsccp notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lsua notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lm3ua notice</span><br><span>diff --git a/net/templates/common_logging_stderr b/net/templates/common_logging_stderr</span><br><span>new file mode 100644</span><br><span>index 0000000..695d19c</span><br><span>--- /dev/null</span><br><span>+++ b/net/templates/common_logging_stderr</span><br><span>@@ -0,0 +1,9 @@</span><br><span style="color: hsl(120, 100%, 40%);">+log stderr</span><br><span style="color: hsl(120, 100%, 40%);">+ logging filter all 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging color 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print level 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category-hex 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file basename last</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print extended-timestamp 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level set-all debug</span><br><span>diff --git a/net/templates/common_statsd b/net/templates/common_statsd</span><br><span>new file mode 100644</span><br><span>index 0000000..1c35610</span><br><span>--- /dev/null</span><br><span>+++ b/net/templates/common_statsd</span><br><span>@@ -0,0 +1,8 @@</span><br><span style="color: hsl(120, 100%, 40%);">+stats reporter statsd</span><br><span style="color: hsl(120, 100%, 40%);">+ disable</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip ${STATSD_IP}</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-port 9125</span><br><span style="color: hsl(120, 100%, 40%);">+ level global</span><br><span style="color: hsl(120, 100%, 40%);">+ no prefix</span><br><span style="color: hsl(120, 100%, 40%);">+ enable</span><br><span style="color: hsl(120, 100%, 40%);">+stats interval 5</span><br><span>diff --git a/net/templates/common_template_warning b/net/templates/common_template_warning</span><br><span>new file mode 100644</span><br><span>index 0000000..6ce6fae</span><br><span>--- /dev/null</span><br><span>+++ b/net/templates/common_template_warning</span><br><span>@@ -0,0 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+# DO NET EDIT THIS FILE DIRECTLY!</span><br><span style="color: hsl(120, 100%, 40%);">+# This is generated from templates, and manual edits will be overwritten.</span><br><span style="color: hsl(120, 100%, 40%);">+# See /etc/osmocom/README</span><br><span>diff --git a/net/tmpl_std/kamailio.cfg b/net/templates/kamailio.cfg</span><br><span>similarity index 100%</span><br><span>rename from net/tmpl_std/kamailio.cfg</span><br><span>rename to net/templates/kamailio.cfg</span><br><span>diff --git a/net/templates/nano3G_dmi.txt b/net/templates/nano3G_dmi.txt</span><br><span>new file mode 100644</span><br><span>index 0000000..ea47f29</span><br><span>--- /dev/null</span><br><span>+++ b/net/templates/nano3G_dmi.txt</span><br><span>@@ -0,0 +1,20 @@</span><br><span style="color: hsl(120, 100%, 40%);">+${foreach(HNODEB)}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+### nano3G ${HNODEBn}</span><br><span style="color: hsl(120, 100%, 40%);">+ssh -oKexAlgorithms=+diffie-hellman-group1-sha1 -c aes128-cbc root@${HNODEBn_IP}</span><br><span style="color: hsl(120, 100%, 40%);">+telnet ${HNODEBn_IP} 8090</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+set rfParamsCandidateList=({${HNODEBn_UARFCN}, ${HNODEBn_SCRAMBLE}, 1})</span><br><span style="color: hsl(120, 100%, 40%);">+set lacRacCandidateList=({${HNODEBn_LAC}, (${HNODEBn_RAC})})</span><br><span style="color: hsl(120, 100%, 40%);">+set hnbGwAddress="${HNBGW_IP}"</span><br><span style="color: hsl(120, 100%, 40%);">+set mcc="${MCC}"</span><br><span style="color: hsl(120, 100%, 40%);">+set mnc="${MNC}"</span><br><span style="color: hsl(120, 100%, 40%);">+action 2061</span><br><span style="color: hsl(120, 100%, 40%);">+action 1216</span><br><span style="color: hsl(120, 100%, 40%);">+action establishPermanentHnbGwConnection</span><br><span style="color: hsl(120, 100%, 40%);">+set csgAccessMode=CSG_ACCESS_MODE_CLOSED_ACCESS</span><br><span style="color: hsl(120, 100%, 40%);">+set accessControlList = ({"901700000014701",1,"14701"},{"901700000014701",1,"14701"},{"901700000014705",1,"14705"},{"901700000014706",1,"14706"},{"204046848488900",1,"88900"},{"204046848488903",1,"88903"})</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+${foreach_end}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+set csgAccessMode=CSG_ACCESS_MODE_OPEN_ACCESS</span><br><span>diff --git a/net/templates/osmo-bsc.cfg b/net/templates/osmo-bsc.cfg</span><br><span>new file mode 100644</span><br><span>index 0000000..d0995d5</span><br><span>--- /dev/null</span><br><span>+++ b/net/templates/osmo-bsc.cfg</span><br><span>@@ -0,0 +1,102 @@</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_template_warning)}</span><br><span style="color: hsl(120, 100%, 40%);">+stats interval 5</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+stats reporter statsd</span><br><span style="color: hsl(120, 100%, 40%);">+ disable</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip ${STATSD_IP}</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-port 9125</span><br><span style="color: hsl(120, 100%, 40%);">+ level global</span><br><span style="color: hsl(120, 100%, 40%);">+ no prefix</span><br><span style="color: hsl(120, 100%, 40%);">+ enable</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+line vty</span><br><span style="color: hsl(120, 100%, 40%);">+ no login</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+e1_input</span><br><span style="color: hsl(120, 100%, 40%);">+ e1_line 0 driver ipa</span><br><span style="color: hsl(120, 100%, 40%);">+ e1_line 0 port 0</span><br><span style="color: hsl(120, 100%, 40%);">+ no e1_line 0 keepalive</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa bind ${BSC_IP}</span><br><span style="color: hsl(120, 100%, 40%);">+cs7 instance 0</span><br><span style="color: hsl(120, 100%, 40%);">+ point-code ${BSC_PC}</span><br><span style="color: hsl(120, 100%, 40%);">+ asp asp-clnt-msc-0 2905 0 m3ua</span><br><span style="color: hsl(120, 100%, 40%);">+ as as-clnt-msc-0 m3ua</span><br><span style="color: hsl(120, 100%, 40%);">+ asp asp-clnt-msc-0</span><br><span style="color: hsl(120, 100%, 40%);">+ routing-key 4 ${BSC_PC}</span><br><span style="color: hsl(120, 100%, 40%);">+network</span><br><span style="color: hsl(120, 100%, 40%);">+ network country code ${MCC}</span><br><span style="color: hsl(120, 100%, 40%);">+ mobile network code ${MNC}</span><br><span style="color: hsl(120, 100%, 40%);">+ encryption a5 ${ENCR_A5}</span><br><span style="color: hsl(120, 100%, 40%);">+ neci 1</span><br><span style="color: hsl(120, 100%, 40%);">+ paging any use tch 0</span><br><span style="color: hsl(120, 100%, 40%);">+ handover 0</span><br><span style="color: hsl(120, 100%, 40%);">+ periodic location update 12</span><br><span style="color: hsl(120, 100%, 40%);">+ meas-feed destination 127.0.0.1 8888</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+${foreach(BTS)}</span><br><span style="color: hsl(120, 100%, 40%);">+ bts ${BTSn}</span><br><span style="color: hsl(120, 100%, 40%);">+ description ${BTSn_DESCRIPTION}</span><br><span style="color: hsl(120, 100%, 40%);">+ type sysmobts</span><br><span style="color: hsl(120, 100%, 40%);">+ band ${BTS_BAND}</span><br><span style="color: hsl(120, 100%, 40%);">+ ip.access unit_id ${BTSn_IPA_UNIT}</span><br><span style="color: hsl(120, 100%, 40%);">+ location_area_code ${BTSn_LAC}</span><br><span style="color: hsl(120, 100%, 40%);">+ cell_identity ${BTSn_CI}</span><br><span style="color: hsl(120, 100%, 40%);">+ base_station_id_code ${BTSn_BSIC}</span><br><span style="color: hsl(120, 100%, 40%);">+ codec-support ${BTSn_CODEC_SUPPORT}</span><br><span style="color: hsl(120, 100%, 40%);">+ amr tch-f modes 3</span><br><span style="color: hsl(120, 100%, 40%);">+ amr tch-f start-mode 3</span><br><span style="color: hsl(120, 100%, 40%);">+ amr tch-h modes 3</span><br><span style="color: hsl(120, 100%, 40%);">+ amr tch-h start-mode 3</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs mode ${BTSn_GPRS_MODE}</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs nsvc 0 remote ip ${BTSn_GB_REMOTE_IP}</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs nsvc 0 remote udp port ${BTSn_GB_REMOTE_PORT}</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs nsvc 0 local udp port ${PCU_GB_LOCAL_PORT}</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs nsvc 0 nsvci ${BTSn_NSVCI}</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs nsei ${BTSn_NSEI}</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs cell bvci ${BTSn_BVCI}</span><br><span style="color: hsl(120, 100%, 40%);">+ trx 0</span><br><span style="color: hsl(120, 100%, 40%);">+ arfcn ${BTSn_ARFCN}</span><br><span style="color: hsl(120, 100%, 40%);">+ description ${BTSn_DESCRIPTION}</span><br><span style="color: hsl(120, 100%, 40%);">+ rf_locked 0</span><br><span style="color: hsl(120, 100%, 40%);">+ nominal power ${BTSn_NOMINAL_POWER}</span><br><span style="color: hsl(120, 100%, 40%);">+ max_power_red ${BTSn_MAX_POWER_RED}</span><br><span style="color: hsl(120, 100%, 40%);">+ timeslot 0</span><br><span style="color: hsl(120, 100%, 40%);">+ phys_chan_config CCCH+SDCCH4</span><br><span style="color: hsl(120, 100%, 40%);">+ timeslot 1</span><br><span style="color: hsl(120, 100%, 40%);">+ phys_chan_config SDCCH8</span><br><span style="color: hsl(120, 100%, 40%);">+ timeslot 2</span><br><span style="color: hsl(120, 100%, 40%);">+ phys_chan_config ${TCH_TYPE}</span><br><span style="color: hsl(120, 100%, 40%);">+ timeslot 3</span><br><span style="color: hsl(120, 100%, 40%);">+ phys_chan_config ${TCH_TYPE}</span><br><span style="color: hsl(120, 100%, 40%);">+ timeslot 4</span><br><span style="color: hsl(120, 100%, 40%);">+ phys_chan_config ${TCH_TYPE}</span><br><span style="color: hsl(120, 100%, 40%);">+ timeslot 5</span><br><span style="color: hsl(120, 100%, 40%);">+ phys_chan_config ${TCH_TYPE}</span><br><span style="color: hsl(120, 100%, 40%);">+ timeslot 6</span><br><span style="color: hsl(120, 100%, 40%);">+ phys_chan_config ${TCH_TYPE}</span><br><span style="color: hsl(120, 100%, 40%);">+ timeslot 7</span><br><span style="color: hsl(120, 100%, 40%);">+ phys_chan_config PDCH</span><br><span style="color: hsl(120, 100%, 40%);">+${foreach_end}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+msc 0</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw remote-ip ${MGW4BSC_IP}</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw remote-port ${MGW4BSC_PORT}</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw endpoint-domain bsc</span><br><span style="color: hsl(120, 100%, 40%);">+ allow-emergency deny</span><br><span style="color: hsl(120, 100%, 40%);">+ codec-list ${BSC_CODEC_LIST}</span><br><span style="color: hsl(120, 100%, 40%);">+ amr-config 12_2k forbidden</span><br><span style="color: hsl(120, 100%, 40%);">+ amr-config 10_2k forbidden</span><br><span style="color: hsl(120, 100%, 40%);">+ amr-config 7_95k forbidden</span><br><span style="color: hsl(120, 100%, 40%);">+ amr-config 7_40k forbidden</span><br><span style="color: hsl(120, 100%, 40%);">+ amr-config 6_70k allowed</span><br><span style="color: hsl(120, 100%, 40%);">+ amr-config 5_90k allowed</span><br><span style="color: hsl(120, 100%, 40%);">+ amr-config 5_15k forbidden</span><br><span style="color: hsl(120, 100%, 40%);">+ amr-config 4_75k forbidden</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_stderr)}</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_bsc)}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_gsmtap)}</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_bsc)}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_statsd)}</span><br><span>diff --git a/net/tmpl_std/osmo-gbproxy.cfg b/net/templates/osmo-gbproxy.cfg</span><br><span>similarity index 100%</span><br><span>rename from net/tmpl_std/osmo-gbproxy.cfg</span><br><span>rename to net/templates/osmo-gbproxy.cfg</span><br><span>diff --git a/net/templates/osmo-ggsn.cfg b/net/templates/osmo-ggsn.cfg</span><br><span>new file mode 100644</span><br><span>index 0000000..7492761</span><br><span>--- /dev/null</span><br><span>+++ b/net/templates/osmo-ggsn.cfg</span><br><span>@@ -0,0 +1,18 @@</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_template_warning)}</span><br><span style="color: hsl(120, 100%, 40%);">+ggsn ggsn0</span><br><span style="color: hsl(120, 100%, 40%);">+ gtp state-dir ${GGSN_GTP_STATE_DIR}</span><br><span style="color: hsl(120, 100%, 40%);">+ gtp bind-ip ${GGSN_IP}</span><br><span style="color: hsl(120, 100%, 40%);">+ apn internet</span><br><span style="color: hsl(120, 100%, 40%);">+ gtpu-mode tun</span><br><span style="color: hsl(120, 100%, 40%);">+ tun-device ${APN_DEV}</span><br><span style="color: hsl(120, 100%, 40%);">+ type-support v4</span><br><span style="color: hsl(120, 100%, 40%);">+ ip dns 0 ${GGSN_DNS0}</span><br><span style="color: hsl(120, 100%, 40%);">+ ip dns 1 ${GGSN_DNS1}</span><br><span style="color: hsl(120, 100%, 40%);">+ ip prefix dynamic ${GGSN_NET}</span><br><span style="color: hsl(120, 100%, 40%);">+ no shutdown</span><br><span style="color: hsl(120, 100%, 40%);">+ default-apn internet</span><br><span style="color: hsl(120, 100%, 40%);">+ no shutdown ggsn</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_stderr)}</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_gsmtap)}</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_statsd)}</span><br><span>diff --git a/net/templates/osmo-hlr.cfg b/net/templates/osmo-hlr.cfg</span><br><span>new file mode 100644</span><br><span>index 0000000..bacad7a</span><br><span>--- /dev/null</span><br><span>+++ b/net/templates/osmo-hlr.cfg</span><br><span>@@ -0,0 +1,11 @@</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_template_warning)}</span><br><span style="color: hsl(120, 100%, 40%);">+hlr</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup</span><br><span style="color: hsl(120, 100%, 40%);">+ bind ip ${HLR_IP}</span><br><span style="color: hsl(120, 100%, 40%);">+ ussd route prefix *0# internal own-msisdn</span><br><span style="color: hsl(120, 100%, 40%);">+ ussd route prefix *1# internal own-imsi</span><br><span style="color: hsl(120, 100%, 40%);">+ ussd route prefix *#100# internal own-msisdn</span><br><span style="color: hsl(120, 100%, 40%);">+ ussd route prefix *#101# internal own-imsi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_stderr)}</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_gsmtap)}</span><br><span>diff --git a/net/templates/osmo-hnbgw.cfg b/net/templates/osmo-hnbgw.cfg</span><br><span>new file mode 100644</span><br><span>index 0000000..66516ce</span><br><span>--- /dev/null</span><br><span>+++ b/net/templates/osmo-hnbgw.cfg</span><br><span>@@ -0,0 +1,8 @@</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_template_warning)}</span><br><span style="color: hsl(120, 100%, 40%);">+hnbgw</span><br><span style="color: hsl(120, 100%, 40%);">+ iuh</span><br><span style="color: hsl(120, 100%, 40%);">+ local-ip ${HNBGW_IP}</span><br><span style="color: hsl(120, 100%, 40%);">+ hnbap-allow-tmsi 1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_stderr)}</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_gsmtap)}</span><br><span>diff --git a/net/templates/osmo-mgw-for-bsc.cfg b/net/templates/osmo-mgw-for-bsc.cfg</span><br><span>new file mode 100644</span><br><span>index 0000000..be67d0c</span><br><span>--- /dev/null</span><br><span>+++ b/net/templates/osmo-mgw-for-bsc.cfg</span><br><span>@@ -0,0 +1,12 @@</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_template_warning)}</span><br><span style="color: hsl(120, 100%, 40%);">+mgcp</span><br><span style="color: hsl(120, 100%, 40%);">+ domain bsc</span><br><span style="color: hsl(120, 100%, 40%);">+ bind ip ${MGW4BSC_IP}</span><br><span style="color: hsl(120, 100%, 40%);">+ bind port ${MGW4BSC_PORT}</span><br><span style="color: hsl(120, 100%, 40%);">+ rtp net-range 50004 60000</span><br><span style="color: hsl(120, 100%, 40%);">+ number endpoints 1024</span><br><span style="color: hsl(120, 100%, 40%);">+line vty</span><br><span style="color: hsl(120, 100%, 40%);">+ bind ${MGW4BSC_VTY_IP}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_stderr)}</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_gsmtap)}</span><br><span>diff --git a/net/templates/osmo-mgw-for-msc.cfg b/net/templates/osmo-mgw-for-msc.cfg</span><br><span>new file mode 100644</span><br><span>index 0000000..a69ec93</span><br><span>--- /dev/null</span><br><span>+++ b/net/templates/osmo-mgw-for-msc.cfg</span><br><span>@@ -0,0 +1,12 @@</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_template_warning)}</span><br><span style="color: hsl(120, 100%, 40%);">+mgcp</span><br><span style="color: hsl(120, 100%, 40%);">+ domain msc</span><br><span style="color: hsl(120, 100%, 40%);">+ bind ip ${MGW4MSC_IP}</span><br><span style="color: hsl(120, 100%, 40%);">+ bind port ${MGW4MSC_PORT}</span><br><span style="color: hsl(120, 100%, 40%);">+ rtp net-range 50004 60000</span><br><span style="color: hsl(120, 100%, 40%);">+ number endpoints 1024</span><br><span style="color: hsl(120, 100%, 40%);">+line vty</span><br><span style="color: hsl(120, 100%, 40%);">+ bind ${MGW4MSC_VTY_IP}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_stderr)}</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_gsmtap)}</span><br><span>diff --git a/net/templates/osmo-msc.cfg b/net/templates/osmo-msc.cfg</span><br><span>new file mode 100644</span><br><span>index 0000000..a9798c9</span><br><span>--- /dev/null</span><br><span>+++ b/net/templates/osmo-msc.cfg</span><br><span>@@ -0,0 +1,32 @@</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_template_warning)}</span><br><span style="color: hsl(120, 100%, 40%);">+network</span><br><span style="color: hsl(120, 100%, 40%);">+ network country code ${MCC}</span><br><span style="color: hsl(120, 100%, 40%);">+ mobile network code ${MNC}</span><br><span style="color: hsl(120, 100%, 40%);">+ authentication ${AUTH}</span><br><span style="color: hsl(120, 100%, 40%);">+ encryption a5 ${ENCR_A5}</span><br><span style="color: hsl(120, 100%, 40%);">+ short name 35c3</span><br><span style="color: hsl(120, 100%, 40%);">+ long name 35c3</span><br><span style="color: hsl(120, 100%, 40%);">+ mm info 1</span><br><span style="color: hsl(120, 100%, 40%);">+msc</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc ${MSC_MNCC}</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw remote-ip ${MGW4MSC_IP}</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw remote-port ${MGW4MSC_PORT}</span><br><span style="color: hsl(120, 100%, 40%);">+ mgw endpoint-domain msc</span><br><span style="color: hsl(120, 100%, 40%);">+ # For nano3G:</span><br><span style="color: hsl(120, 100%, 40%);">+ iu rab-assign-addr-enc x213</span><br><span style="color: hsl(120, 100%, 40%);">+mncc-int</span><br><span style="color: hsl(120, 100%, 40%);">+ default-codec tch-f fr</span><br><span style="color: hsl(120, 100%, 40%);">+ default-codec tch-h amr</span><br><span style="color: hsl(120, 100%, 40%);">+smpp</span><br><span style="color: hsl(120, 100%, 40%);">+ local-tcp-ip 127.0.0.1 2775</span><br><span style="color: hsl(120, 100%, 40%);">+ system-id test-msc</span><br><span style="color: hsl(120, 100%, 40%);">+ policy closed</span><br><span style="color: hsl(120, 100%, 40%);">+ no smpp-first</span><br><span style="color: hsl(120, 100%, 40%);">+hlr</span><br><span style="color: hsl(120, 100%, 40%);">+ remote-ip ${HLR_IP}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_stderr)}</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_msc)}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_gsmtap)}</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_msc)}</span><br><span>diff --git a/net/tmpl_std/osmo-sgsn.cfg b/net/templates/osmo-sgsn.cfg</span><br><span>similarity index 70%</span><br><span>rename from net/tmpl_std/osmo-sgsn.cfg</span><br><span>rename to net/templates/osmo-sgsn.cfg</span><br><span>index 3b61ef3..f6ee1df 100644</span><br><span>--- a/net/tmpl_std/osmo-sgsn.cfg</span><br><span>+++ b/net/templates/osmo-sgsn.cfg</span><br><span>@@ -1,3 +1,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_template_warning)}</span><br><span> sgsn</span><br><span> gtp local-ip ${SGSN_IP}</span><br><span> ggsn 0 remote-ip ${GGSN_IP}</span><br><span>@@ -9,4 +10,5 @@</span><br><span> encapsulation udp local-port ${SGSN_GB_PORT}</span><br><span> encapsulation framerelay-gre enabled 0</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-${include(../common_logging)}</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_stderr)}</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_gsmtap)}</span><br><span>diff --git a/net/templates/osmo-sip-connector.cfg b/net/templates/osmo-sip-connector.cfg</span><br><span>new file mode 100644</span><br><span>index 0000000..bac1385</span><br><span>--- /dev/null</span><br><span>+++ b/net/templates/osmo-sip-connector.cfg</span><br><span>@@ -0,0 +1,10 @@</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_template_warning)}</span><br><span style="color: hsl(120, 100%, 40%);">+app</span><br><span style="color: hsl(120, 100%, 40%);">+mncc</span><br><span style="color: hsl(120, 100%, 40%);">+ socket-path ${MSC_MNCC_SOCKET}</span><br><span style="color: hsl(120, 100%, 40%);">+sip</span><br><span style="color: hsl(120, 100%, 40%);">+ local ${SIPCON_LOCAL} ${SIPCON_LOCAL_PORT}</span><br><span style="color: hsl(120, 100%, 40%);">+ remote ${SIPCON_REMOTE} ${SIPCON_REMOTE_PORT}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_stderr)}</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_gsmtap)}</span><br><span>diff --git a/net/templates/osmo-stp.cfg b/net/templates/osmo-stp.cfg</span><br><span>new file mode 100644</span><br><span>index 0000000..35eb4e7</span><br><span>--- /dev/null</span><br><span>+++ b/net/templates/osmo-stp.cfg</span><br><span>@@ -0,0 +1,8 @@</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_template_warning)}</span><br><span style="color: hsl(120, 100%, 40%);">+cs7 instance 0</span><br><span style="color: hsl(120, 100%, 40%);">+ xua rkm routing-key-allocation dynamic-permitted</span><br><span style="color: hsl(120, 100%, 40%);">+ listen m3ua 2905</span><br><span style="color: hsl(120, 100%, 40%);">+ accept-asp-connections dynamic-permitted</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_stderr)}</span><br><span style="color: hsl(120, 100%, 40%);">+${include(common_logging_gsmtap)}</span><br><span>diff --git a/net/tmpl_std/run.sh b/net/templates/run.sh</span><br><span>similarity index 89%</span><br><span>rename from net/tmpl_std/run.sh</span><br><span>rename to net/templates/run.sh</span><br><span>index 03f75c1..fcb410b 100755</span><br><span>--- a/net/tmpl_std/run.sh</span><br><span>+++ b/net/templates/run.sh</span><br><span>@@ -9,7 +9,6 @@</span><br><span> fi</span><br><span> </span><br><span> dev="${ETH_DEV}"</span><br><span style="color: hsl(0, 100%, 40%);">-ip2="${PUBLIC_IP2}"</span><br><span> apn="${APN_DEV}"</span><br><span> </span><br><span> sudo true || exit 1</span><br><span>@@ -28,14 +27,14 @@</span><br><span> sudo ip link set $apn up</span><br><span> fi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-if [ -z "$(ip addr show | grep "$PUBLIC_IP")" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">- echo "No interface has IP address $PUBLIC_IP! Hit enter to continue anyway."</span><br><span style="color: hsl(120, 100%, 40%);">+if [ -z "$(ip addr show | grep "$TO_RAN_IP")" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "No interface has IP address $TO_RAN_IP! Hit enter to continue anyway."</span><br><span> read enter_to_continue</span><br><span> fi</span><br><span style="color: hsl(0, 100%, 40%);">-if [ -z "$(ip addr show | grep "$ip2")" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">- echo "No interface has IP address $ip2! Hit enter to 'ip addr add $ip2/32 dev $dev'"</span><br><span style="color: hsl(120, 100%, 40%);">+if [ -z "$(ip addr show | grep "$TO_RAN_IP2")" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "No interface has IP address $TO_RAN_IP2! Hit enter to 'ip addr add $TO_RAN_IP2/32 dev $dev'"</span><br><span> read enter_to_continue</span><br><span style="color: hsl(0, 100%, 40%);">- sudo ip addr add $ip2/32 dev $dev</span><br><span style="color: hsl(120, 100%, 40%);">+ sudo ip addr add $TO_RAN_IP2/32 dev $dev</span><br><span> fi</span><br><span> </span><br><span> logdir="current_log"</span><br><span>@@ -78,14 +77,14 @@</span><br><span> stp="osmo-stp"</span><br><span> bsc="LD_LIBRARY_PATH=/usr/local/lib gdb -ex run --args osmo-bsc -c osmo-bsc.cfg"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-if [ "${SIPCON_ENABLE}" == "true" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+if [ "x${MSC_MNCC}" != "xinternal" ]; then</span><br><span> sipcon="osmo-sip-connector -c osmo-sip-connector.cfg"</span><br><span> msc="$msc -M ${MSC_MNCC_SOCKET}"</span><br><span> </span><br><span> # Require kamailio (PATH hack is needed for Debian)</span><br><span> kamailio="$(PATH="$PATH:/usr/sbin:/sbin" which kamailio)"</span><br><span> if [ -z "$kamailio" ]; then</span><br><span style="color: hsl(0, 100%, 40%);">- echo "ERROR: kamailio is not installed, but it's required for SIPCON_ENABLE."</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "ERROR: kamailio is not installed, but it's required for external MNCC."</span><br><span> echo "After installing it, make sure that it does *not* run as daemon."</span><br><span> exit 1</span><br><span> fi</span><br><span>@@ -115,7 +114,7 @@</span><br><span> sleep .2</span><br><span> term "$bsc" BSC &</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-if [ "${SIPCON_ENABLE}" == "true" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+if [ "x${MSC_MNCC}" != "xinternal" ]; then</span><br><span> sleep .2</span><br><span> term "$sipcon" SIPCON &</span><br><span> sleep .2</span><br><span>@@ -129,7 +128,7 @@</span><br><span> read enter_to_close</span><br><span> echo Closing...</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-if [ "${SIPCON_ENABLE}" == "true" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+if [ "x${MSC_MNCC}" != "xinternal" ]; then</span><br><span> kill %13 %14</span><br><span> killall osmo-sip-connector</span><br><span> killall kamailio</span><br><span>diff --git a/net/tmpl_std/nano3G.txt b/net/tmpl_std/nano3G.txt</span><br><span>deleted file mode 100644</span><br><span>index df6feb6..0000000</span><br><span>--- a/net/tmpl_std/nano3G.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,18 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-ssh -oKexAlgorithms=+diffie-hellman-group1-sha1 -c aes128-cbc root@${HNODEB_IP}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-telnet ${HNODEB_IP} 8090</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-set mcc="${MCC}"</span><br><span style="color: hsl(0, 100%, 40%);">-set mnc="${MNC}"</span><br><span style="color: hsl(0, 100%, 40%);">-set rfParamsCandidateList=({${UARFCN}, ${SCRAMBLE}, 1})</span><br><span style="color: hsl(0, 100%, 40%);">-set lacRacCandidateList=({${LAC}, (${RAC})})</span><br><span style="color: hsl(0, 100%, 40%);">-set hnbGwAddress="${HNBGW_IP}"</span><br><span style="color: hsl(0, 100%, 40%);">-action 2061</span><br><span style="color: hsl(0, 100%, 40%);">-action 1216</span><br><span style="color: hsl(0, 100%, 40%);">-action establishPermanentHnbGwConnection</span><br><span style="color: hsl(0, 100%, 40%);">-set csgAccessMode=CSG_ACCESS_MODE_CLOSED_ACCESS</span><br><span style="color: hsl(0, 100%, 40%);">-set accessControlList = ({"901700000014701",1,"14701"})</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-set accessControlList = ({"901700000014701",1,"14701"},{"901700000014702",1,"14702"})</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-set csgAccessMode=CSG_ACCESS_MODE_OPEN_ACCESS</span><br><span>diff --git a/net/tmpl_std/nano3G2.txt b/net/tmpl_std/nano3G2.txt</span><br><span>deleted file mode 100644</span><br><span>index a5be62d..0000000</span><br><span>--- a/net/tmpl_std/nano3G2.txt</span><br><span>+++ /dev/null</span><br><span>@@ -1,18 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-ssh -oKexAlgorithms=+diffie-hellman-group1-sha1 -c aes128-cbc root@${HNODEB_IP2}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-telnet ${HNODEB_IP2} 8090</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-set mcc="${MCC}"</span><br><span style="color: hsl(0, 100%, 40%);">-set mnc="${MNC}"</span><br><span style="color: hsl(0, 100%, 40%);">-set rfParamsCandidateList=({${UARFCN2}, ${SCRAMBLE2}, 1})</span><br><span style="color: hsl(0, 100%, 40%);">-set lacRacCandidateList=({${LAC2}, (${RAC2})})</span><br><span style="color: hsl(0, 100%, 40%);">-set hnbGwAddress="${HNBGW_IP}"</span><br><span style="color: hsl(0, 100%, 40%);">-action 2061</span><br><span style="color: hsl(0, 100%, 40%);">-action 1216</span><br><span style="color: hsl(0, 100%, 40%);">-action establishPermanentHnbGwConnection</span><br><span style="color: hsl(0, 100%, 40%);">-set csgAccessMode=CSG_ACCESS_MODE_CLOSED_ACCESS</span><br><span style="color: hsl(0, 100%, 40%);">-set accessControlList = ({"901700000014702",1,"14702"})</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-set accessControlList = ({"901700000014701",1,"14701"},{"901700000014702",1,"14702"})</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-set csgAccessMode=CSG_ACCESS_MODE_OPEN_ACCESS</span><br><span>diff --git a/net/tmpl_std/osmo-bsc.cfg b/net/tmpl_std/osmo-bsc.cfg</span><br><span>deleted file mode 100644</span><br><span>index cfaf8b7..0000000</span><br><span>--- a/net/tmpl_std/osmo-bsc.cfg</span><br><span>+++ /dev/null</span><br><span>@@ -1,86 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-network</span><br><span style="color: hsl(0, 100%, 40%);">- #meas-feed destination 172.18.18.18 8888</span><br><span style="color: hsl(0, 100%, 40%);">- #meas-feed scenario foo23</span><br><span style="color: hsl(0, 100%, 40%);">- network country code ${MCC}</span><br><span style="color: hsl(0, 100%, 40%);">- mobile network code ${MNC}</span><br><span style="color: hsl(0, 100%, 40%);">- encryption a5 ${ENCR_A5}</span><br><span style="color: hsl(0, 100%, 40%);">- bts 0</span><br><span style="color: hsl(0, 100%, 40%);">- type sysmobts</span><br><span style="color: hsl(0, 100%, 40%);">- band ${BTS0_BAND}</span><br><span style="color: hsl(0, 100%, 40%);">- location_area_code ${BTS0_LAC}</span><br><span style="color: hsl(0, 100%, 40%);">- cell_identity ${BTS0_CI}</span><br><span style="color: hsl(0, 100%, 40%);">- cell reselection hysteresis 14</span><br><span style="color: hsl(0, 100%, 40%);">- ip.access unit_id ${BTS0_IPA_UNIT}</span><br><span style="color: hsl(0, 100%, 40%);">- gprs mode gprs</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 0 remote ip ${GBPROXY_IP}</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 0 remote udp port ${GBPROXY_GB_PORT}</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 0 local udp port ${PCU_GB_PORT}</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 0 nsvci ${BTS0_NSVCI}</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsei ${BTS0_NSEI}</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell bvci ${BTS0_BVCI}</span><br><span style="color: hsl(0, 100%, 40%);">- trx 0</span><br><span style="color: hsl(0, 100%, 40%);">- rf_locked 0</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn ${BTS0_ARFCN}</span><br><span style="color: hsl(0, 100%, 40%);">- nominal power 23</span><br><span style="color: hsl(0, 100%, 40%);">- max_power_red ${BTS0_MAX_POWER_RED}</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 0</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config CCCH+SDCCH4</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 1</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config SDCCH8</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 2</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 3</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 4</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 5</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 6</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 7</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- bts 1</span><br><span style="color: hsl(0, 100%, 40%);">- type sysmobts</span><br><span style="color: hsl(0, 100%, 40%);">- band ${BTS1_BAND}</span><br><span style="color: hsl(0, 100%, 40%);">- location_area_code ${BTS1_LAC}</span><br><span style="color: hsl(0, 100%, 40%);">- cell_identity ${BTS1_CI}</span><br><span style="color: hsl(0, 100%, 40%);">- cell reselection hysteresis 14</span><br><span style="color: hsl(0, 100%, 40%);">- ip.access unit_id ${BTS1_IPA_UNIT}</span><br><span style="color: hsl(0, 100%, 40%);">- gprs mode gprs</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 0 remote ip ${GBPROXY_IP}</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 0 remote udp port ${GBPROXY_GB_PORT}</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 0 local udp port ${PCU_GB_PORT}</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsvc 0 nsvci ${BTS1_NSVCI}</span><br><span style="color: hsl(0, 100%, 40%);">- gprs nsei ${BTS1_NSEI}</span><br><span style="color: hsl(0, 100%, 40%);">- gprs cell bvci ${BTS1_BVCI}</span><br><span style="color: hsl(0, 100%, 40%);">- trx 0</span><br><span style="color: hsl(0, 100%, 40%);">- rf_locked 0</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn ${BTS1_ARFCN}</span><br><span style="color: hsl(0, 100%, 40%);">- nominal power 23</span><br><span style="color: hsl(0, 100%, 40%);">- max_power_red ${BTS1_MAX_POWER_RED}</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 0</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config CCCH+SDCCH4</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 1</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config SDCCH8</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 2</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 3</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 4</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config TCH/F</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 5</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 6</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config PDCH</span><br><span style="color: hsl(0, 100%, 40%);">- timeslot 7</span><br><span style="color: hsl(0, 100%, 40%);">- phys_chan_config PDCH</span><br><span style="color: hsl(0, 100%, 40%);">-e1_input</span><br><span style="color: hsl(0, 100%, 40%);">- e1_line 0 driver ipa</span><br><span style="color: hsl(0, 100%, 40%);">-msc 0</span><br><span style="color: hsl(0, 100%, 40%);">- mgw remote-ip ${MGW4BSC_IP}</span><br><span style="color: hsl(0, 100%, 40%);">- mgw remote-port ${MGW4BSC_PORT}</span><br><span style="color: hsl(0, 100%, 40%);">- mgw endpoint-range 33 64</span><br><span style="color: hsl(0, 100%, 40%);">- allow-emergency deny</span><br><span style="color: hsl(0, 100%, 40%);">- codec-list ${BSC_CODEC_LIST}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-${include(../common_bsc_logging)}</span><br><span>diff --git a/net/tmpl_std/osmo-ggsn.cfg b/net/tmpl_std/osmo-ggsn.cfg</span><br><span>deleted file mode 100644</span><br><span>index 1e69f65..0000000</span><br><span>--- a/net/tmpl_std/osmo-ggsn.cfg</span><br><span>+++ /dev/null</span><br><span>@@ -1,17 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-log stderr</span><br><span style="color: hsl(0, 100%, 40%);">- logging level all debug</span><br><span style="color: hsl(0, 100%, 40%);">- logging filter all 1</span><br><span style="color: hsl(0, 100%, 40%);">- logging print category 1</span><br><span style="color: hsl(0, 100%, 40%);">-ggsn ggsn0</span><br><span style="color: hsl(0, 100%, 40%);">- gtp bind-ip ${GGSN_IP}</span><br><span style="color: hsl(0, 100%, 40%);">- apn internet</span><br><span style="color: hsl(0, 100%, 40%);">- tun-device ${APN_DEV}</span><br><span style="color: hsl(0, 100%, 40%);">- type-support v4</span><br><span style="color: hsl(0, 100%, 40%);">- ip dns 0 ${GGSN_DNS0}</span><br><span style="color: hsl(0, 100%, 40%);">- ip dns 1 ${GGSN_DNS1}</span><br><span style="color: hsl(0, 100%, 40%);">- #ip ifconfig ${GGSN_NET}</span><br><span style="color: hsl(0, 100%, 40%);">- ip prefix dynamic ${GGSN_NET}</span><br><span style="color: hsl(0, 100%, 40%);">- no shutdown</span><br><span style="color: hsl(0, 100%, 40%);">- default-apn internet</span><br><span style="color: hsl(0, 100%, 40%);">- no shutdown ggsn</span><br><span style="color: hsl(0, 100%, 40%);">-${include(../common_logging)}</span><br><span>diff --git a/net/tmpl_std/osmo-hlr.cfg b/net/tmpl_std/osmo-hlr.cfg</span><br><span>deleted file mode 100644</span><br><span>index 4f8a14a..0000000</span><br><span>--- a/net/tmpl_std/osmo-hlr.cfg</span><br><span>+++ /dev/null</span><br><span>@@ -1,7 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-hlr</span><br><span style="color: hsl(0, 100%, 40%);">- ussd route prefix *1# internal own-msisdn</span><br><span style="color: hsl(0, 100%, 40%);">- ussd route prefix *2# internal own-imsi</span><br><span style="color: hsl(0, 100%, 40%);">- ussd route prefix *#100# internal own-msisdn</span><br><span style="color: hsl(0, 100%, 40%);">- ussd route prefix *#101# internal own-imsi</span><br><span style="color: hsl(0, 100%, 40%);">- store-imei</span><br><span style="color: hsl(0, 100%, 40%);">-${include(../common_logging)}</span><br><span>diff --git a/net/tmpl_std/osmo-hnbgw.cfg b/net/tmpl_std/osmo-hnbgw.cfg</span><br><span>deleted file mode 100644</span><br><span>index a918b10..0000000</span><br><span>--- a/net/tmpl_std/osmo-hnbgw.cfg</span><br><span>+++ /dev/null</span><br><span>@@ -1,5 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-hnbgw</span><br><span style="color: hsl(0, 100%, 40%);">- iuh</span><br><span style="color: hsl(0, 100%, 40%);">- local-ip ${HNBGW_IP}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-${include(../common_logging)}</span><br><span>diff --git a/net/tmpl_std/osmo-mgw-for-bsc.cfg b/net/tmpl_std/osmo-mgw-for-bsc.cfg</span><br><span>deleted file mode 100644</span><br><span>index a6eddbf..0000000</span><br><span>--- a/net/tmpl_std/osmo-mgw-for-bsc.cfg</span><br><span>+++ /dev/null</span><br><span>@@ -1,11 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-mgcp</span><br><span style="color: hsl(0, 100%, 40%);">- bind ip ${MGW4BSC_IP}</span><br><span style="color: hsl(0, 100%, 40%);">- # default port is 2427 (is used for MSC's MGW)</span><br><span style="color: hsl(0, 100%, 40%);">- bind port ${MGW4BSC_PORT}</span><br><span style="color: hsl(0, 100%, 40%);">- number endpoints 64</span><br><span style="color: hsl(0, 100%, 40%);">-line vty</span><br><span style="color: hsl(0, 100%, 40%);">- # default VTY interface is on 127.0.0.1 (used for MSC's MGW)</span><br><span style="color: hsl(0, 100%, 40%);">- bind ${MGW4BSC_VTY_IP}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-${include(../common_logging)}</span><br><span style="color: hsl(0, 100%, 40%);">- logging level all info</span><br><span>diff --git a/net/tmpl_std/osmo-mgw-for-msc.cfg b/net/tmpl_std/osmo-mgw-for-msc.cfg</span><br><span>deleted file mode 100644</span><br><span>index 5803932..0000000</span><br><span>--- a/net/tmpl_std/osmo-mgw-for-msc.cfg</span><br><span>+++ /dev/null</span><br><span>@@ -1,8 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-mgcp</span><br><span style="color: hsl(0, 100%, 40%);">- bind ip ${MGW4MSC_IP}</span><br><span style="color: hsl(0, 100%, 40%);">- number endpoints 64</span><br><span style="color: hsl(0, 100%, 40%);">-line vty</span><br><span style="color: hsl(0, 100%, 40%);">- bind ${MGW4MSC_VTY_IP}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-${include(../common_logging)}</span><br><span style="color: hsl(0, 100%, 40%);">- logging level all info</span><br><span>diff --git a/net/tmpl_std/osmo-msc.cfg b/net/tmpl_std/osmo-msc.cfg</span><br><span>deleted file mode 100644</span><br><span>index 99c1b00..0000000</span><br><span>--- a/net/tmpl_std/osmo-msc.cfg</span><br><span>+++ /dev/null</span><br><span>@@ -1,18 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-network</span><br><span style="color: hsl(0, 100%, 40%);">- network country code ${MCC}</span><br><span style="color: hsl(0, 100%, 40%);">- mobile network code ${MNC}</span><br><span style="color: hsl(0, 100%, 40%);">- authentication ${AUTH}</span><br><span style="color: hsl(0, 100%, 40%);">- encryption a5 ${ENCR_A5}</span><br><span style="color: hsl(0, 100%, 40%);">-msc</span><br><span style="color: hsl(0, 100%, 40%);">- mgw remote-ip ${MGW4MSC_IP}</span><br><span style="color: hsl(0, 100%, 40%);">- # For nano3G:</span><br><span style="color: hsl(0, 100%, 40%);">- iu rab-assign-addr-enc x213</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- check-imei-rqd 1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-${include(../common_logging)}</span><br><span style="color: hsl(0, 100%, 40%);">- logging level ref debug</span><br><span style="color: hsl(0, 100%, 40%);">- logging level vlr debug</span><br><span style="color: hsl(0, 100%, 40%);">-log stderr</span><br><span style="color: hsl(0, 100%, 40%);">- logging level ref debug</span><br><span style="color: hsl(0, 100%, 40%);">- logging level vlr debug</span><br><span>diff --git a/net/tmpl_std/osmo-sip-connector.cfg b/net/tmpl_std/osmo-sip-connector.cfg</span><br><span>deleted file mode 100644</span><br><span>index 953eccd..0000000</span><br><span>--- a/net/tmpl_std/osmo-sip-connector.cfg</span><br><span>+++ /dev/null</span><br><span>@@ -1,6 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-app</span><br><span style="color: hsl(0, 100%, 40%);">-mncc</span><br><span style="color: hsl(0, 100%, 40%);">- socket-path ${MSC_MNCC_SOCKET}</span><br><span style="color: hsl(0, 100%, 40%);">-sip</span><br><span style="color: hsl(0, 100%, 40%);">- local ${SIPCON_LOCAL} ${SIPCON_LOCAL_PORT}</span><br><span style="color: hsl(0, 100%, 40%);">- remote ${SIPCON_REMOTE} ${SIPCON_REMOTE_PORT}</span><br><span>diff --git a/net/tmpl_std/osmo-stp.cfg b/net/tmpl_std/osmo-stp.cfg</span><br><span>deleted file mode 100644</span><br><span>index 093bf86..0000000</span><br><span>--- a/net/tmpl_std/osmo-stp.cfg</span><br><span>+++ /dev/null</span><br><span>@@ -1,6 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-cs7 instance 0</span><br><span style="color: hsl(0, 100%, 40%);">- xua rkm routing-key-allocation dynamic-permitted</span><br><span style="color: hsl(0, 100%, 40%);">- listen m3ua 2905</span><br><span style="color: hsl(0, 100%, 40%);">- accept-asp-connections dynamic-permitted</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-${include(../common_logging)}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13108">change 13108</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13108"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-dev </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ie6352c584c0fce57c617387160c285abf40a5f90 </div>
<div style="display:none"> Gerrit-Change-Number: 13108 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>