3 files changed, 75 insertions, 6 deletions
diff --git a/misc/freeswitch/scripts/common/intruder.lua b/misc/freeswitch/scripts/common/intruder.lua
index 083ec37..7d12155 100644
--- a/misc/freeswitch/scripts/common/intruder.lua
+++ b/misc/freeswitch/scripts/common/intruder.lua
@@ -49,3 +49,46 @@ function Intruder.update_blacklist(self, event)
 
   self.database:insert_or_update('intruders', intruder_record, { created_at = false, comment = false });
 end
+
+
+function Intruder.sources_list(self, key)
+  local sql_query = nil;
+
+  if key then
+    sql_query = 'SELECT * FROM `intruders` WHERE `key` = ' .. self.database:escape(key, '"') .. ' LIMIT 1';
+  else
+    sql_query = 'SELECT * FROM `intruders`';
+  end
+
+  local sources = {};
+  local sources_count = 0;
+  local blacklist_count = 0;
+  local whitelist_count = 0;
+
+  self.database:query(sql_query, function(record)
+    sources[record.key] = {
+      ignore = (record.list_type == 'whitelist'),
+      contact_first = 0,
+      contact_last = 0,
+      contact_count = tonumber(record.contact_count) or 0,
+      span_contact_count = 0,
+      span_start = 0,
+      points = tonumber(record.points) or 0,
+      banned = tonumber(record.bans) or 0,
+    };
+    sources_count = sources_count + 1;
+    if record.list_type == 'whitelist' then
+      whitelist_count = whitelist_count + 1;
+    elseif record.list_type == 'blacklist' then
+      blacklist_count = blacklist_count + 1;
+    end
+  end);
+
+  self.log:info('[intruder] INTRUDER_LIST - entries loaded: ', sources_count, ', blacklist: ', blacklist_count, ', whitelist: ', whitelist_count);
+  
+  if key then
+    return sources[key];
+  end
+
+  return sources;
+end
diff --git a/misc/freeswitch/scripts/common/perimeter.lua b/misc/freeswitch/scripts/common/perimeter.lua
index 0815d33..8ad38d3 100644
--- a/misc/freeswitch/scripts/common/perimeter.lua
+++ b/misc/freeswitch/scripts/common/perimeter.lua
@@ -94,12 +94,24 @@ end
 
 
 function Perimeter.check(self, event)
-  if not event or not event.key then
-    self.log:warning('[perimeter] PERIMETER_CHECK - no event/key');
+  if not type(event) == 'list' then
+    self.log:warning('[perimeter] PERIMETER_CHECK - no event data');
+    return;
+  end
+  if not event.key then
+    self.log:warning('[perimeter] PERIMETER_CHECK - no key');
+    for key, value in pairs() do
+      self.log:debug('[perimeter] PERIMETER_CHECK event_data - "', key, '" = "', value, '"');
+    end
     return;
   end
 
-  event.record = self:record_load(event); 
+  event.record = self:record_load(event);
+  
+  if event.record.ignore then
+    return
+  end
+
   if event.record.banned <= self.ban_tries then
     for check_name, check_points in pairs(self.checks[event.action]) do
       if self.checks_available[check_name] then
@@ -239,3 +251,17 @@ function Perimeter.expand_variables(self, line, variables)
     return variables[captured] or '';
   end))
 end
+
+
+function Perimeter.action_db_rescan(self, record)
+  require 'common.str';
+  require 'common.intruder';
+
+  if common.str.blank(record.key) then
+    self.log:info('[perimeter] PERIMETER rescan entire sources database');
+    self.sources = common.intruder.Intruder:new{ log = self.log, database = self.database }:sources_list();
+  else
+    self.log:info('[perimeter] PERIMETER rescan sources database - key: ', record.key);
+    self.sources[record.key] = common.intruder.Intruder:new{ log = self.log, database = self.database }:sources_list(record.key);
+  end
+end
diff --git a/misc/freeswitch/scripts/common/sip_account.lua b/misc/freeswitch/scripts/common/sip_account.lua
index 6cc7d25..e7ee0d7 100644
--- a/misc/freeswitch/scripts/common/sip_account.lua
+++ b/misc/freeswitch/scripts/common/sip_account.lua
@@ -130,9 +130,9 @@ end
 
 
 function SipAccount.call_state(self)
-  local sql_query = 'SELECT `callstate` FROM `detailed_calls` \
-    WHERE `presence_id` LIKE "' .. self.record.auth_name .. '@%" \
-    OR `b_presence_id` LIKE "' .. self.record.auth_name .. '@%" \
+  local sql_query = 'SELECT `callstate` FROM `calls_active` \
+    WHERE `sip_account_id` = ' .. self.id .. ' \
+    OR `b_sip_account_id` = ' .. self.id .. ' \
     LIMIT 1';
 
   return self.database:query_return_value(sql_query);