Merge branch 'master' into 4.0

2600hz-archive · Dec 6, 2016 · 8596b91 · 8596b91
2 parents bda790d + 6dac34b
commit 8596b91
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/core/sys.config b/core/sys.config
@@ -1,8 +1,7 @@
 [
  {lager, [
           {handlers, [
-                      {lager_console_backend, info}
-                      ,{lager_file_backend, [
+                      {lager_file_backend, [
                                              {file, "log/error.log"}, {level, error}, {size, 10485760}, {date, "$D0"}, {count, 5}
                                              ,{formatter, lager_default_formatter}
                                              ,{formatter_config, [time," [",severity,"] ", "|", {callid, <<"0000000000">>}, "|", module, ":", line, " (",pid, ") ", message, "\n"]}

diff --git a/kamailio/default.cfg b/kamailio/default.cfg
@@ -377,7 +377,9 @@ route[HANDLE_OPTIONS]
             route(INTERNAL_TO_EXTERNAL_RELAY);
         } else {
             #!ifdef TRAFFIC_FILTER_ROLE
-            route(FILTER_REQUEST_DOMAIN);
+            if (!isflagset(FLAG_TRUSTED_SOURCE)) {
+                route(FILTER_REQUEST_DOMAIN);
+            }
             #!endif
 
             #!ifdef NAT_TRAVERSAL_ROLE
@@ -405,7 +407,9 @@ route[HANDLE_NOTIFY]
             route(INTERNAL_TO_EXTERNAL_RELAY);
         } else {
             #!ifdef TRAFFIC_FILTER_ROLE
-            route(FILTER_REQUEST_DOMAIN);
+            if (!isflagset(FLAG_TRUSTED_SOURCE)) {
+                route(FILTER_REQUEST_DOMAIN);
+            }
             #!endif
 
             #!ifdef WEBSOCKETS_ROLE

diff --git a/kamailio/registrar-role.cfg b/kamailio/registrar-role.cfg
@@ -285,7 +285,7 @@ route[SAVE_LOCATION]
        $var(ip) = "[" + $Ri + "]";
     }
 
-    $var(amqp_payload_request) = '{"Event-Category" : "directory", "Event-Name" : "reg_success", "Status" : "$var(Status)", "Event-Timestamp" : $TS, "Expires" : $(var(expires){s.int}), "First-Registration" : $var(new_reg), "Contact" : "$(ct{s.escape.common})", "Call-ID" : "$ci", "Realm" : "$fd", "Username" : "$fU", "From-User" : "$fU", "From-Host" : "$fd", "To-User" : "$tU", "To-Host" : "$td", "User-Agent" : "$(ua{s.escape.common})" , "Custom-Channel-Vars" : $xavp(ulattrs=>custom_channel_vars), "Proxy-Path" : "sip:$var(ip)", "RUID" : "$xavp(ulrcd=>ruid)" }';
+    $var(amqp_payload_request) = '{"Event-Category" : "directory", "Event-Name" : "reg_success", "Status" : "$var(Status)", "Event-Timestamp" : $TS, "Expires" : $(var(expires){s.int}), "First-Registration" : $var(new_reg), "Contact" : "$(ct{s.escape.common})", "Call-ID" : "$ci", "Realm" : "$fd", "Username" : "$fU", "From-User" : "$fU", "From-Host" : "$fd", "To-User" : "$tU", "To-Host" : "$td", "User-Agent" : "$(ua{s.escape.common})" , "Custom-Channel-Vars" : $xavp(ulattrs=>custom_channel_vars), "Proxy-Path" : "sip:$var(ip)", "RUID" : "$xavp(ulrcd=>ruid)", "Source-IP": "$si", "Source-Port": "$sp" }';
     $var(amqp_routing_key) = "registration.success." + $(fd{kz.encode}) + "." + $(fU{kz.encode});
     kazoo_publish("registrar", $var(amqp_routing_key), $var(amqp_payload_request));
 

diff --git a/system/systemd/kazoo-freeswitch.service b/system/systemd/kazoo-freeswitch.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=FreeSWITCH Configured for Kazoo
-After=syslog.target network.target
-After=postgresql.service postgresql-9.3.service postgresql-9.4.service mysqld.service httpd.service
+After=syslog.target network-online.target
 
 [Service]
 User=freeswitch

diff --git a/system/systemd/kazoo-rabbitmq.service b/system/systemd/kazoo-rabbitmq.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=RabbitMQ Broker Configured for Kazoo
-After=syslog.target network.target
+After=syslog.target network-online.target
 
 [Service]
 Type=notify