more defaults and squashed fast pickup into presence

kamailio/defs.cfg

@@ -7,11 +7,11 @@
 #!substdef "!MY_HOSTNAME!$HN(f)!g"
 #!endif
 
-#!ifndef MY_HOSTNAME
+#!ifndef MY_IP_ADDRESS
 #!substdef "!MY_IP_ADDRESS!$HN(i)!g"
 #!endif
 
-#!ifndef MY_HOSTNAME
+#!ifndef MY_WEBSOCKET_DOMAIN
 #!substdef "!MY_WEBSOCKET_DOMAIN!$HN(d)!g"
 #!endif
 
@@ -74,6 +74,7 @@
 ## Defs related to SIP_TRACE_ROLE
 ##
 #!ifdef SIP_TRACE_ROLE
+
 #!trydef KZ_TRACE 0
 #!trydef KZ_TRACE_INTERNAL 1
 #!trydef KZ_TRACE_EXTERNAL 1
@@ -83,7 +84,8 @@
 #!trydef KZ_TRACE_EXTERNAL_OUTGOING 1
 #!trydef SIP_TRACE_URI "sip:127.0.0.1:9060"
 #!trydef HEP_CAPTURE_ID 1
-#!endif
+
+
 #!endif
 
 #!ifndef KZ_DISABLE_WEBSOCKETS_REGISTRAR_PORT
@@ -104,7 +106,7 @@
 #!trydef KZ_TLS_REGISTRAR_PORT 7000
 #!endif
 
-#!trydef KZ_FAST_PICKUP_COOKIES 1
-#!trydef KZ_FAST_PICKUP_REALTIME 1
+#!trydef KZ_PRESENCE_FAST_PICKUP_COOKIES 1
+#!trydef KZ_PRESENCE_FAST_PICKUP_REALTIME 1
 
 # vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab

kamailio/dispatcher-role.cfg

@@ -109,8 +109,8 @@ route[DISPATCHER_FIND_ROUTES]
     }
     #!endif
 
-    #!ifdef FAST_PICKUP_ROLE
-    route(FAST_PICKUP_ATTEMPT);
+    #!ifdef PRESENCE_ROLE
+    route(PRESENCE_FAST_PICKUP_ATTEMPT);
     #!endif
 
     #!import_file "dispatcher-network-find.cfg"

kamailio/local.cfg

@@ -8,8 +8,6 @@
 #!trydef PRESENCE_ROLE
 #!trydef RESPONDER_ROLE
 #!trydef NODES_ROLE
-#!trydef FAST_PICKUP_ROLE
-#!trydef PRESENCE_QUERY_ROLE
 
 ## Disabled Roles - remove all but the last '#' to enable
 # # #!trydef TRAFFIC_FILTER_ROLE
@@ -39,7 +37,7 @@
 ## CHANGE "kazoo://guest:guest@127.0.0.1:5672" TO THE AMQP URL
 ##     This should be the primary RabbitMQ server
 ##     in the zone that this server will service.
-#!substdef "!MY_AMQP_URL!kazoo://guest:guest@127.0.0.1:5672!g"
+#!substdef "!MY_AMQP_URL!amqp://guest:guest@127.0.0.1:5672!g"
 
 ## This parameter is only required if you are using websockets
 ##     This value must be present in the HTTP

kamailio/nodes-role.cfg

@@ -177,8 +177,8 @@ route[MEDIA_SERVER_UP]
    route(DISPATCHER_CHECK_MEDIA_SERVER);
 #!endif
 
-#!ifdef FAST_PICKUP_ROLE
-   route(FAST_PICKUP_START);
+#!ifdef PRESENCE_ROLE
+   route(PRESENCE_FAST_PICKUP_START);
 #!endif
 
 }

kamailio/presence-role.cfg

@@ -67,13 +67,10 @@ kazoo.presence_request_resubscribe_probe = KZ_PRESENCE_REQUEST_RESUBSCRIBE_PROBE
 kazoo.presence_ignore_status_probe_resp = KZ_PRESENCE_IGNORE_STATUS_PROBE_RESP descr "ignore online/offline probe replies"
 kazoo.presence_max_call_per_presentity = KZ_PRESENCE_MAX_CALL_PER_PRESENTITY descr "max number of calls per presentity"
 
-#!ifdef FAST_PICKUP_ROLE
-#!include_file "fast-pickup-role.cfg"
-#!endif
-
 #!include_file "presence-query.cfg"
 #!include_file "presence-notify.cfg"
 #!include_file "presence-reset.cfg"
+#!include_file "presence-fast-pickup.cfg"
 
 ####### Presence Logic ########
 
@@ -345,9 +342,7 @@ event_route[kazoo:consumer-event-presence-dialog-update]
    xlog("L_DEBUG", "$(kzE{kz.json,Call-ID})|log|received $(kzE{kz.json,Event-Package}) update for $(kzE{kz.json,From}) state $(kzE{kz.json,State}) from $(kzE{kz.json,AMQP-Broker-Zone}) => $(kzE{kz.json,Switch-URI}) (Δ1 $(kzE{kz.json,AMQP-Elapsed-Micro}) μs , Δ2 $var(delta_to_start) μs)\n");
 
    $var(JObj) = $kzE;
-   #!ifdef FAST_PICKUP_ROLE
-   route(FAST_PICKUP_INIT);
-   #!endif
+   route(PRESENCE_FAST_PICKUP_INIT);
 
    $var(presentity) = $(kzE{kz.json,From});
    $var(payload) = $kzE;
@@ -505,9 +500,7 @@ route[PRESENCE_BINDINGS]
 
    route(PRESENCE_API_BINDINGS);
 
-   #!ifdef FAST_PICKUP_ROLE
-   route(FAST_PICKUP_START);
-   #!endif
+   route(PRESENCE_FAST_PICKUP_START);
 
 }
 

kamailio/websockets-role.cfg

@@ -80,7 +80,7 @@ event_route[xhttp:request]
 
     #!ifdef MY_WEBSOCKET_DOMAIN
     if (!($hdr(Origin) =~ "MY_WEBSOCKET_DOMAIN")) {
-        xlog("L_INFO", "websocket|log|rejecting HTTP request with unknown origin $hdr(Origin) from $si:$sp\n");
+        xlog("L_INFO", "websocket|log|rejecting HTTP request with unauthorized origin $hdr(Origin) from $si:$sp, allowed origin is MY_WEBSOCKET_DOMAIN\n");
         xhttp_reply("400", "Bad Request", "", "");
         exit;
     }