Commit Graph

15 Commits

Author SHA1 Message Date
Oliver Smith fdaf2280ba 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
2021-12-14 18:42:42 +01:00
Neels Hofmeyr 03f42edb2c add osmo-bts.cfg 2021-10-23 20:45:12 +02:00
Neels Hofmeyr 0c83295236 osmo-bsc.cfg: use 'type osmo-bts', not 'sysmobts' 2021-10-23 20:45:12 +02:00
Oliver Smith 4186b95259 net/templates/run.sh: tweak masquerade
Replace the old check with an exact check for the given rule. The old
check doesn't work on my system if docker is running and sets up other
masquerading rules.

Change -A to -I, so it is less likely to be affected by whatever other
rules may already be above in the chain.

Change-Id: I30c22fe4e7683611e8dada329dbf7d51f78b6016
2021-07-12 08:35:49 +00:00
Oliver Smith 710107a459 net/templates/osmo-gbproxy.cfg: update format
Update to changes in osmo-gbproxy
* Id67592aa7712e5e04e7264b2fb8f26d57eb7e69e
* I2a18dcf035f1fc7304a0c7c7c83b5e8e15429d2b

Change-Id: Ia7008d6d2d26030aa4c35439f1525a53957443a1
2021-03-19 13:13:02 +01:00
Oliver Smith 964539c416 net/templates/osmo-sgsn.cfg: update format
Migrate to the new gprs_ns2_vty configuration introduced in osmo-sgsn
Ie9306ab4d4738c2c57a69987086e22771b30657e.

Change-Id: Ie0a6d4a55f725ebcc6a55b6bd71c52ad72accbd2
2021-03-19 13:12:55 +01:00
Neels Hofmeyr 96a12a1681 make freeswitch template configurable
move some freeswitch config files out of the freeswitch/ tree and symlink so
that they become configurable

Apply new PBX_* variable naming

fill_config: enable symlinks;
ignore template function 'strftime' because freeswith cfg uses that.

Change-Id: I97d3db87398c743637f7eb13629e21b149bcc8fa
2019-12-04 04:09:05 +01:00
Neels Hofmeyr ba0a8280a9 clean up naming: s/SIPCON_REMOTE/PBX_SIP etc
Change-Id: Ie66b32466f80d930150ea940d236cfbbe026fc50
2019-12-04 03:58:17 +01:00
Oliver Smith 667f19b199 add freeswitch
Change-Id: If948de9e9e7e288b0a031ab973f453cd91a9e99b
2019-12-04 03:16:59 +01:00
Neels Hofmeyr fecf156c11 kamailio: fixes and tweaks
This is what I did to get external MNCC with kamailio to work.

(As before, only change MSC_MNCC from "internal" to "external ..." in config_*
to enable use of kamailio as external MNCC.)

Change-Id: I18c991bf914dedeb69cb8a2fcde117633e51a899
2019-08-08 15:43:54 +02:00
Neels Hofmeyr 768303432f osmo-bsc.cfg: remove 'as' config from cs7
It's not needed and causes confusion with routing-keys when more BSCs show up.

Change-Id: I6b3717a29ae832d61710abc58d922c00ae8f4dc0
2019-08-08 15:43:54 +02:00
Neels Hofmeyr 0dc7326b0f run.sh: drop -M mncc-socket option from osmo-msc cmdline
Since commit [1], the MNCC socket path is configured in the .cfg file. There is
no need to pass the -M option to osmo-msc on the cmdline anymore.

Also, the udtrace example to launch osmo-msc in run.sh includes a '| tee' so
that the -M would be passed as option to tee and breaks that example.

[1] cbdd7180a6 / Ie6352c584c0fce57c617387160c285abf40a5f90

Change-Id: Id5c177a7fe98b752881ddd0d98152a2e30380d0e
2019-08-08 15:43:54 +02:00
Neels Hofmeyr 8e4948421c run.sh: add comment to show how to enable MNCC udtrace
Change-Id: I94fdc87e8adea345ad735449558b75a56953fcc5
2019-08-08 15:20:38 +02:00
Oliver Smith 2490f69804 run.sh: fix $TO_RAN_IP and $TO_RAN_IU_IP usage
Add curly braces around both variables, so they get replaced properly
again.

Change-Id: I1f0f749b74fe5fd3982e045283735151f69c2487
2019-03-13 15:16:16 +01:00
Neels Hofmeyr cbdd7180a6 net/: refactor cfg templates
Adopt "foreach" and "common_" features and generally take in the improved
templates as used at 35c3.

If your config file relies on the tmpl_std that is now removed, you can locally
resurrect it with

  git checkout 2c6a55baa7 -- tmpl_std

but it's probably better to make a new copy of config_2g3g and insert your
local config there.

Change-Id: Ie6352c584c0fce57c617387160c285abf40a5f90
2019-03-07 16:28:06 +01:00