diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2015-01-21 17:01:19 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2015-01-21 17:01:19 +0100 |
| commit | fd5aefb73ec944e138d53488916b58421bf44992 (patch) | |
| tree | b2bbb32ac0bebd5ea9a0b6ef71cdbacad843c219 /openbsc | |
| parent | fdf4adee32a51001eb2b4aeb0209c7529fa07cd3 (diff) | |
| parent | 9d1a17e15f6902bc9591680da3375b2d14db16ab (diff) | |
Merge remote-tracking branch 'origin/master' into hfreyther/packages
Diffstat (limited to 'openbsc')
| -rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_nat_vty.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c index 5229976af..5f4ad284e 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c @@ -1192,12 +1192,14 @@ DEFUN(cfg_bsc_osmux, else if (strcmp(argv[0], "off") == 0) conf->osmux = 0; - if (old == 0 && conf->osmux == 1) { + if (old == 0 && conf->osmux == 1 && !conf->nat->mgcp_cfg->osmux_init) { + LOGP(DMGCP, LOGL_NOTICE, "Setting up OSMUX socket\n"); if (osmux_init(OSMUX_ROLE_BSC_NAT, conf->nat->mgcp_cfg) < 0) { LOGP(DMGCP, LOGL_ERROR, "Cannot init OSMUX\n"); - return -1; + vty_out(vty, "%% failed to create Osmux socket%s", + VTY_NEWLINE); + return CMD_WARNING; } - LOGP(DMGCP, LOGL_NOTICE, "Setting up OSMUX socket\n"); } else if (old == 1 && conf->osmux == 0) { LOGP(DMGCP, LOGL_NOTICE, "Disabling OSMUX socket\n"); /* Don't stop the socket, we may already have ongoing voice |