From c4be6870a71fce6d479475918dff754f3378927f Mon Sep 17 00:00:00 2001 From: lazedo Date: Thu, 27 Feb 2020 21:33:05 +0000 Subject: [PATCH] allow disable of detection mechanism --- system/sbin/kazoo-kamailio | 44 +++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/system/sbin/kazoo-kamailio b/system/sbin/kazoo-kamailio index cbf0813..1eb743b 100755 --- a/system/sbin/kazoo-kamailio +++ b/system/sbin/kazoo-kamailio @@ -49,28 +49,32 @@ LOCAL_IP_INTERFACE=${LOCAL_IP_INTERFACE:-none} MY_LOCAL_IP=${LISTENER_LOCAL_IP:-none} MY_PUBLIC_IP=${LISTENER_PUBLIC_IP:-none} -if [[ "${MY_LOCAL_IP}" != "none" ]]; then - EXTRA_OPTIONS+=" -A MY_LOCAL_IP=${MY_LOCAL_IP} -A LOCAL_IP_ARG" -else - if [[ "${LOCAL_IP_INTERFACE}" != "none" ]]; then - MY_LOCAL_IP=$(ip -4 addr show ${LOCAL_IP_INTERFACE} | grep -oP '(?<=inet\s)\d+(\.\d+){3}') +if [[ "${MY_LOCAL_IP}" != "disable" ]]; then + if [[ "${MY_LOCAL_IP}" != "none" ]]; then + EXTRA_OPTIONS+=" -A MY_LOCAL_IP=${MY_LOCAL_IP} -A LOCAL_IP_ARG" else - MY_LOCAL_IP=$(ip route get 8.8.8.8 2> /dev/null | awk '{print ""$7""; exit}') - fi - - if is_ipaddress ${MY_LOCAL_IP}; then - EXTRA_OPTIONS+=" -A MY_LOCAL_IP=${MY_LOCAL_IP} -A LOCAL_IP_AUTO" + if [[ "${LOCAL_IP_INTERFACE}" != "none" ]]; then + MY_LOCAL_IP=$(ip -4 addr show ${LOCAL_IP_INTERFACE} | grep -oP '(?<=inet\s)\d+(\.\d+){3}') + else + MY_LOCAL_IP=$(ip route get 8.8.8.8 2> /dev/null | awk '{print ""$7""; exit}') + fi + + if is_ipaddress ${MY_LOCAL_IP}; then + EXTRA_OPTIONS+=" -A MY_LOCAL_IP=${MY_LOCAL_IP} -A LOCAL_IP_AUTO" + fi fi fi -if [[ "${MY_PUBLIC_IP}" != "none" ]]; then - EXTRA_OPTIONS+=" -A MY_PUBLIC_IP=${MY_PUBLIC_IP} -A PUBLIC_IP_ARG" -else - MY_PUBLIC_IP=$(dig @ns1.google.com TXT o-o.myaddr.l.google.com +short -4 2> /dev/null | sed s/\"//g ) - if [[ ! -z ${MY_PUBLIC_IP} ]]; then - if is_ipaddress ${MY_PUBLIC_IP}; then - EXTRA_OPTIONS+=" -A MY_PUBLIC_IP=${MY_PUBLIC_IP} -A PUBLIC_IP_AUTO" - fi +if [[ "${MY_PUBLIC_IP}" != "disable" ]]; then + if [[ "${MY_PUBLIC_IP}" != "none" ]]; then + EXTRA_OPTIONS+=" -A MY_PUBLIC_IP=${MY_PUBLIC_IP} -A PUBLIC_IP_ARG" + else + MY_PUBLIC_IP=$(dig @ns1.google.com TXT o-o.myaddr.l.google.com +short -4 2> /dev/null | sed s/\"//g ) + if [[ ! -z ${MY_PUBLIC_IP} ]]; then + if is_ipaddress ${MY_PUBLIC_IP}; then + EXTRA_OPTIONS+=" -A MY_PUBLIC_IP=${MY_PUBLIC_IP} -A PUBLIC_IP_AUTO" + fi + fi fi fi @@ -226,7 +230,7 @@ start() { echo "check config failed on starting Kamailio!" return fi - + check_fork if [ ${RETVAL} -ne 0 ]; then echo "check fork failed on starting Kamailio!" @@ -342,7 +346,7 @@ case "$1" in start -E -DD $@ ;; *) - echo $"Usage: $0 {prepare|start|background|boot|stop|restart|reset-restart|status|check|pid}" + echo $"Usage: $0 {prepare|start|background|foreground|boot|boot-foreground|stop|restart|reset-restart|status|check|pid}" esac exit ${RETVAL}