Merge branch 'master' into v2.14

app.config

@@ -0,0 +1,15 @@
+[
+ {lager, [
+          {handlers, [
+                      {lager_console_backend, info}
+                      ,{lager_file_backend, [
+                                             {file, "log/error.log"}, {level, error}, {size, 10485760}, {date, "$D0"}, {count, 5}
+                                            ]}
+                      ,{lager_file_backend, [
+                                             {file, "log/console.log"}, {level, info}, {size, 10485760}, {date, "$D0"}, {count, 5}
+                                            ]}
+                      ,{lager_syslog_backend, ["2600hz", local0, debug, {lager_kazoo_formatter,["|", {callid, <<"0000000000">>}, "|", module, ":", line, " (",pid, ") ", message, "\n"]}]}
+                     ]},
+          {colored, false}
+         ]}
+].

kamailio/kamailio.cfg

@@ -18,7 +18,7 @@
 ####### Global Parameters #########
 fork = yes
 children = 25
-group = kamailio
+group = daemon
 user = kamailio
 server_signature = no
 server_header = "Server: Kazoo"
@@ -113,6 +113,16 @@ flags
 #!define FLB_NATB 6
 #!define FLB_NATSIPPING 7
 
+# ----- presence
+loadmodule "pua_dialoginfo.so"
+modparam("pua_dialoginfo", "library_mode", 1)
+
+# TODO: ARE THESE NECESSARY
+loadmodule "corex.so"
+loadmodule "ctl.so"
+loadmodule "cfg_rpc.so"
+loadmodule "mi_rpc.so"
+
 ######## Kamailio core extensions module ########
 loadmodule "kex.so"
 
@@ -161,6 +171,9 @@ loadmodule "htable.so"
 modparam("htable", "htable", "associations=>size=10;")
 modparam("htable", "htable", "auth_cache=>size=10;")
 
+# TODO: IS THIS NECESSARY
+modparam("htable", "htable", "dbkp=>size=4;autoexpire=7200")
+
 ######## Pseudo-Variables module ########
 loadmodule "pv.so"
 
@@ -197,7 +210,7 @@ loadmodule "uac_redirect.so"
 ####### Kazoo Integration module ##########
 loadmodule "db_kazoo.so"
 # FIXME: uncomment the next line and set the correct hostname that should be advertised to Kazoo
-#modparam("db_kazoo", "node_hostname",  "kamailio.kazoo.com")
+modparam("db_kazoo", "node_hostname",  "kamailio.2600hz.com")
 # If you want a certain fs_path to be sent Kazoo, uncomment the next line and set the right value
 #modparam("db_kazoo", "register_fs_path", "127.0.0.1:5060")
 
@@ -230,6 +243,12 @@ modparam("nathelper", "sipping_bflag", FLB_NATSIPPING)
 modparam("nathelper", "sipping_from", "sip:sipcheck@127.0.0.1")
 #modparam("nathelper", "natping_socket", "127.0.0.1:5060")
 
+# ----- presence params -----
+loadmodule "presence.so"
+loadmodule "presence_dialoginfo.so"
+modparam("presence", "subs_db_mode", 1)
+modparam("presence", "db_url", "kazoo://guest:guest@127.0.0.1:5672/dialoginfo")
+
 ####### Common Module Parameters ##########
 modparam("auth_db|usrloc", "db_url", "kazoo://guest:guest@127.0.0.1:5672/callmgr")
 
@@ -251,6 +270,8 @@ route
 
     route(HANDLE_IN_DIALOG_REQUESTS);
 
+    route(HANDLE_PRESENCE);
+
     route(PREPARE_INITIAL_REQUESTS);
 
     if (isflagset(FLAG_INTERNALLY_SOURCED)) {
@@ -303,6 +324,29 @@ route[HANDLE_OPTIONS]
     }
 }
 
+route[HANDLE_PRESENCE]
+{
+    if (is_method("SUBSCRIBE")) {
+        if (!t_newtran()) {
+            sl_reply_error();
+            exit;
+        }
+        handle_subscribe();
+        t_release();
+        exit;
+    }
+
+    if (is_method("PUBLISH")) {
+        if (!t_newtran()) {
+            sl_reply_error();
+            exit;
+        }
+        handle_publish();
+        t_release();
+        exit;
+    }
+}
+
 route[HANDLE_IN_DIALOG_REQUESTS] 
 {
     if (has_totag()) {

vm.args

@@ -0,0 +1,15 @@
+# Tell SASL not to log progress reports, and log SASL errors to a file
+-sasl errlog_type error
+-sasl sasl_error_logger '{file, "log/error_log.sasl"}'
+-boot start_sasl
+
+-config /etc/kazoo/app.config
+
+# Use kernel poll functionality if supported by emulator
++K true
+
+# Start a pool of asynchronous IO threads
++A 2
+
+# Comment this line out if you want the Erlang shell
++Bd