Change in ...osmo-dev[master]: kamailio: fixes and tweaks
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/15077 Change subject: kamailio: fixes and tweaks .. 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 --- M net/templates/kamailio.cfg M net/templates/run.sh 2 files changed, 10 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/77/15077/1 diff --git a/net/templates/kamailio.cfg b/net/templates/kamailio.cfg index c5b0bf2..b0e2bf3 100644 --- a/net/templates/kamailio.cfg +++ b/net/templates/kamailio.cfg @@ -102,8 +102,8 @@ loadmodule "xlog.so" loadmodule "sanity.so" # loadmodule "ctl.so" -loadmodule "cfg_rpc.so" -loadmodule "mi_rpc.so" +# loadmodule "cfg_rpc.so" +# loadmodule "mi_rpc.so" loadmodule "acc.so" #!ifdef WITH_NAT diff --git a/net/templates/run.sh b/net/templates/run.sh index 6b0d065..c50cfca 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -130,15 +130,9 @@ read enter_to_close echo Closing... -if [ "x${MSC_MNCC}" != "xinternal" ]; then - kill %13 %14 - killall osmo-sip-connector - killall kamailio -fi - #ssh bts neels/stop_remote.sh -kill %1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12 +kill %1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12 %13 %14 killall osmo-msc killall osmo-bsc killall osmo-gbproxy @@ -150,6 +144,13 @@ sudo killall tcpdump killall osmo-ggsn +if [ "x${MSC_MNCC}" != "xinternal" ]; then + # 'killall' seems to work only with the shortened name + killall osmo-sip-connec + killall kamailio +fi + + set +e cp *.cfg "$logdir"/ -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I18c991bf914dedeb69cb8a2fcde117633e51a899 Gerrit-Change-Number: 15077 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange
Change in ...osmo-dev[master]: kamailio: fixes and tweaks
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/15077 ) Change subject: kamailio: fixes and tweaks .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I18c991bf914dedeb69cb8a2fcde117633e51a899 Gerrit-Change-Number: 15077 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 09:19:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-dev[master]: kamailio: fixes and tweaks
keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/15077 ) Change subject: kamailio: fixes and tweaks .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I18c991bf914dedeb69cb8a2fcde117633e51a899 Gerrit-Change-Number: 15077 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: keith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 11:19:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-dev[master]: kamailio: fixes and tweaks
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/15077 ) Change subject: kamailio: fixes and tweaks .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I18c991bf914dedeb69cb8a2fcde117633e51a899 Gerrit-Change-Number: 15077 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 07 Aug 2019 15:55:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-dev[master]: kamailio: fixes and tweaks
neels has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-dev/+/15077 ) Change subject: kamailio: fixes and tweaks .. 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 --- M net/templates/kamailio.cfg M net/templates/run.sh 2 files changed, 10 insertions(+), 9 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve keith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/net/templates/kamailio.cfg b/net/templates/kamailio.cfg index c5b0bf2..b0e2bf3 100644 --- a/net/templates/kamailio.cfg +++ b/net/templates/kamailio.cfg @@ -102,8 +102,8 @@ loadmodule "xlog.so" loadmodule "sanity.so" # loadmodule "ctl.so" -loadmodule "cfg_rpc.so" -loadmodule "mi_rpc.so" +# loadmodule "cfg_rpc.so" +# loadmodule "mi_rpc.so" loadmodule "acc.so" #!ifdef WITH_NAT diff --git a/net/templates/run.sh b/net/templates/run.sh index 1697429..a42ec52 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -133,15 +133,9 @@ read enter_to_close echo Closing... -if [ "x${MSC_MNCC}" != "xinternal" ]; then - kill %13 %14 - killall osmo-sip-connector - killall kamailio -fi - #ssh bts neels/stop_remote.sh -kill %1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12 +kill %1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12 %13 %14 killall osmo-msc killall osmo-bsc killall osmo-gbproxy @@ -153,6 +147,13 @@ sudo killall tcpdump killall osmo-ggsn +if [ "x${MSC_MNCC}" != "xinternal" ]; then + # 'killall' seems to work only with the shortened name + killall osmo-sip-connec + killall kamailio +fi + + set +e cp *.cfg "$logdir"/ -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/15077 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I18c991bf914dedeb69cb8a2fcde117633e51a899 Gerrit-Change-Number: 15077 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged