1 files changed, 44 insertions, 7 deletions

diff --git a/misc/freeswitch/scripts/event/perimeter_defense.lua b/misc/freeswitch/scripts/event/perimeter_defense.lua
index c93eb13..acdfa8d 100644
--- a/misc/freeswitch/scripts/event/perimeter_defense.lua
+++ b/misc/freeswitch/scripts/event/perimeter_defense.lua
@@ -29,16 +29,20 @@ end
 
 
 function PerimeterDefense.event_handlers(self)
-  return { CUSTOM = { 
+  return { 
+    CUSTOM = { 
     ['sofia::pre_register'] = self.sofia_pre_register,
     ['sofia::register_attempt'] = self.sofia_register_attempt,
     ['sofia::register_failure'] = self.sofia_register_failure,
-  } }
+    },
+    CHANNEL_HANGUP = { [true] = self.channel_hangup },
+  };
 end
 
 
-function PerimeterDefense.to_record(self, event, class)
+function PerimeterDefense.to_register_record(self, event, class)
   return {
+    action = 'register',
     class = class,
     key = event:getHeader('network-ip'),
     sequence = tonumber(event:getHeader('Event-Sequence')),
@@ -50,7 +54,6 @@ function PerimeterDefense.to_record(self, event, class)
     to_user = event:getHeader('to-user'),
     to_host = event:getHeader('to-host'),
     user_agent = event:getHeader('user-agent'),
-    user_agent = event:getHeader('user-agent'),
     username = event:getHeader('username'),
     realm = event:getHeader('realm'),
     auth_result = event:getHeader('auth-result'),
@@ -59,19 +62,53 @@ function PerimeterDefense.to_record(self, event, class)
 end
 
 
+function PerimeterDefense.to_call_record(self, event, class)
+  return {
+    action = 'call',
+    class = class,
+    key = event:getHeader('Caller-Network-Addr'),
+    sequence = tonumber(event:getHeader('Event-Sequence')),
+    timestamp = tonumber(event:getHeader('Event-Date-Timestamp')),
+    received_ip = event:getHeader('Caller-Network-Addr'),
+    received_port = event:getHeader('variable_sip_network_port'),
+    hangup_cause = event:getHeader('Hangup-Cause'),
+    endpoint_disposition = event:getHeader('variable_endpoint_disposition'),
+    direction = event:getHeader('Call-Direction'),
+    destination_number = event:getHeader('Caller-Destination-Number');
+    caller_id_name = event:getHeader('Caller-Caller-ID-Name');
+    caller_id_number = event:getHeader('Caller-Caller-ID-Number');
+    from_user = event:getHeader('variable_sip_from_user'),
+    from_host = event:getHeader('variable_sip_from_host'),
+    to_user = event:getHeader('variable_sip_to_user'),
+    to_host = event:getHeader('variable_sip_to_host'),
+    req_user = event:getHeader('variable_sip_req_user'),
+    req_host = event:getHeader('variable_sip_req_host'),
+    user_agent = event:getHeader('variable_sip_user_agent'),
+    username = event:getHeader('Caller-Username'),
+    contact = event:getHeader('variable_sip_contact_uri'),
+  };
+end
+
+
 function PerimeterDefense.sofia_pre_register(self, event)
-  local record = self:to_record(event, 'pre_register');
+  local record = self:to_register_record(event, 'pre_register');
   self.perimeter:check(record);
 end
 
 
 function PerimeterDefense.sofia_register_attempt(self, event)
-  local record = self:to_record(event, 'register_attempt');
+  local record = self:to_register_record(event, 'register_attempt');
   self.perimeter:check(record);
 end
 
 
 function PerimeterDefense.sofia_register_failure(self, event)
-  local record = self:to_record(event, 'register_failure');
+  local record = self:to_register_record(event, 'register_failure');
+  self.perimeter:check(record);
+end
+
+
+function PerimeterDefense.channel_hangup(self, event)
+  local record = self:to_call_record(event, 'channel_hangup');
   self.perimeter:check(record);
 end