KAZOO-1513: prepare for merge

kamailio/default.cfg

@@ -78,8 +78,6 @@ dns_srv_lb = off
 ####### SCTP Parameters #########
 disable_sctp = yes
 
-####### Binding Parameters #########
-
 ####### Modules Section ########
 mpath="/usr/lib64/kamailio/modules/"
 
@@ -325,11 +323,14 @@ route[HANDLE_IN_DIALOG_REQUESTS]
             record_route();
         }
         if (loose_route()) {
+            #!ifdef WEBSOCKETS-ROLE
             if (isdsturiset() && !handle_ruri_alias()) {
-                xlog("L_INFO", "$ci|stop|Bad alias <$ru>\n");
+                xlog("L_INFO", "$ci|stop|bad alias <$ru>\n");
                 sl_send_reply("400", "Bad Request");
                 exit;
             }
+            #!endif
+
             xlog("L_INFO", "$ci|log|loose_route in-dialog message");
             # Called on in-dialog requests
             # If the request in an Invite for on hold from external to internal,

kamailio/websockets-role.cfg

@@ -5,6 +5,12 @@ listen=TCP_WS
 listen=TLS_WSS
 #!endif
 
+######## NAT Traversal module - signaling functions ########
+#!ifndef NATHELPER-LOADED
+#!trydef NATHELPER-LOADED
+loadmodule "nathelper.so"
+#!endif
+
 ######## Generic Hash Table container in shared memory ########
 modparam("htable", "htable", "websockets=>size=16;autoexpire=7200")
 
@@ -20,6 +26,7 @@ modparam("websocket", "keepalive_interval", 1)
 modparam("websocket", "ping_application_data", "Kazoo encourages you to keep alive")
 modparam("websocket", "sub_protocols", 1)
 
+####### Websocket Logic ########
 route[HANDLE_WEBSOCKETS]
 {
     # Do NAT traversal stuff for requests from a WebSocket