missing defs and tweaks

* node publish default-proxy ip address
* duplicate modparam

(cherry picked from commit 5940630)

Author: lazedo

kamailio/listener-defs.cfg

@@ -147,6 +147,16 @@
 #!substdef "!TLS_EXTERNAL_ADVERTISE_WSS!tls:$def(MY_EXTERNAL_LISTEN_IP):$def(WSS_EXTERNAL_PORT) advertise $def(MY_EXTERNAL_ADVERTISE_IP):$def(WSS_EXTERNAL_ADVERTISE_PORT)!g"
 #!substdef "!TCP_EXTERNAL_ADVERTISE_WS!tcp:$def(MY_EXTERNAL_LISTEN_IP):$def(WS_EXTERNAL_PORT) advertise $def(MY_EXTERNAL_ADVERTISE_IP):$def(WS_EXTERNAL_ADVERTISE_PORT)!g"
 
+### external with advertise socket
+#!substdef "!UDP_EXTERNAL_ADVERTISE_SOCKET_SIP!udp:$def(MY_EXTERNAL_LISTEN_IP):$def(SIP_EXTERNAL_PORT)!g"
+#!substdef "!TCP_EXTERNAL_ADVERTISE_SOCKET_SIP!tcp:$def(MY_EXTERNAL_LISTEN_IP):$def(SIP_EXTERNAL_PORT)!g"
+#!substdef "!TLS_EXTERNAL_ADVERTISE_SOCKET_SIP!tls:$def(MY_EXTERNAL_LISTEN_IP):$def(SIP_S_EXTERNAL_PORT)!g"
+#!substdef "!UDP_EXTERNAL_ADVERTISE_SOCKET_ALG!udp:$def(MY_EXTERNAL_LISTEN_IP):$def(ALG_EXTERNAL_PORT)!g"
+#!substdef "!TCP_EXTERNAL_ADVERTISE_SOCKET_ALG!tcp:$def(MY_EXTERNAL_LISTEN_IP):$def(ALG_EXTERNAL_PORT)!g"
+#!substdef "!TLS_EXTERNAL_ADVERTISE_SOCKET_ALG!tls:$def(MY_EXTERNAL_LISTEN_IP):$def(ALG_S_EXTERNAL_PORT)!g"
+#!substdef "!TLS_EXTERNAL_ADVERTISE_SOCKET_WSS!tls:$def(MY_EXTERNAL_LISTEN_IP):$def(WSS_EXTERNAL_PORT)!g"
+#!substdef "!TCP_EXTERNAL_ADVERTISE_SOCKET_WS!tcp:$def(MY_EXTERNAL_LISTEN_IP):$def(WS_EXTERNAL_PORT)!g"
+
 
 ### lb
 #!substdef "!UDP_LB_SIP!udp:$def(MY_LB_IP):$def(SIP_LB_PORT)!g"
@@ -158,6 +168,15 @@
 #!substdef "!TCP_LB_WS!tcp:$def(MY_LB_IP):$def(WS_LB_PORT)!g"
 #!substdef "!TLS_LB_WSS!tls:$def(MY_LB_IP):$def(WSS_LB_PORT)!g"
 
+### lb with advertise socket
+#!substdef "!UDP_LB_ADVERTISE_SOCKET_SIP!udp:$def(MY_LB_LISTEN_IP):$def(SIP_LB_PORT)!g"
+#!substdef "!TCP_LB_ADVERTISE_SOCKET_SIP!tcp:$def(MY_LB_LISTEN_IP):$def(SIP_LB_PORT)!g"
+#!substdef "!TLS_LB_ADVERTISE_SOCKET_SIP!tls:$def(MY_LB_LISTEN_IP):$def(SIP_S_LB_PORT)!g"
+#!substdef "!UDP_LB_ADVERTISE_SOCKET_ALG!udp:$def(MY_LB_LISTEN_IP):$def(ALG_LB_PORT)!g"
+#!substdef "!TCP_LB_ADVERTISE_SOCKET_ALG!tcp:$def(MY_LB_LISTEN_IP):$def(ALG_LB_PORT)!g"
+#!substdef "!TLS_LB_ADVERTISE_SOCKET_ALG!tls:$def(MY_LB_LISTEN_IP):$def(ALG_S_LB_PORT)!g"
+#!substdef "!TCP_LB_ADVERTISE_SOCKET_WS!tcp:$def(MY_LB_LISTEN_IP):$def(WS_LB_PORT)!g"
+#!substdef "!TLS_LB_ADVERTISE_SOCKET_WSS!tls:$def(MY_LB_LISTEN_IP):$def(WSS_LB_PORT)!g"
 
 ### lb with advertise
 #!substdef "!UDP_LB_ADVERTISE_SIP!udp:$def(MY_LB_LISTEN_IP):$def(SIP_LB_PORT) advertise $def(MY_LB_ADVERTISE_IP):$def(SIP_LB_ADVERTISE_PORT)!g"

kamailio/nodes-role.cfg

@@ -325,7 +325,7 @@ route[LISTENER_STATUS]
    }
 
    #!ifdef WITH_INTERNAL_LISTENER
-   $var(default_proxy) = $_s(, "proxy-default-uri" : "sip:MY_IP_ADDRESS:$def(INTERNAL_PORT);transport=$def(INTERNAL_PROTO)");
+   $var(default_proxy) = $_s(, "proxy-default-uri" : "sip:$def(MY_INTERNAL_IP):$def(INTERNAL_PORT);transport=$def(INTERNAL_PROTO)");
    #!else
    $var(default_proxy) = "";
    #!endif

kamailio/registrar-role.cfg

@@ -95,7 +95,6 @@ modparam("usrloc", "db_url", "KAZOO_DB_URL")
 modparam("usrloc", "db_mode", REGISTRAR_DB_MODE)
 
 modparam("usrloc", "db_timer_clean", REGISTRAR_DB_TIMER_CLEANUP)
-modparam("usrloc", "handle_lost_tcp", REGISTRAR_HANDLE_LOST_TCP)
 modparam("usrloc", "rm_expired_delay", REGISTRAR_DB_REMOVE_EXPIRED_DELAY)
 
 modparam("usrloc", "db_check_update", 1)
@@ -107,6 +106,7 @@ modparam("usrloc", "timer_interval", REGISTRAR_SYNC_TIMER_INTERVAL)
 modparam("usrloc", "timer_procs", REGISTRAR_SYNC_TIMER_PROCS)
 
 modparam("usrloc", "fetch_rows", 400)
+
 modparam("usrloc", "handle_lost_tcp", REGISTRAR_HANDLE_LOST_TCP)
 modparam("usrloc", "close_expired_tcp", REGISTRAR_CLOSE_EXPIRED_TCP)