summaryrefslogtreecommitdiff
path: root/misc/freeswitch/scripts
diff options
context:
space:
mode:
authorPeter Kozak <spag@golwen.net>2013-03-18 02:55:32 -0400
committerPeter Kozak <spag@golwen.net>2013-03-18 02:55:32 -0400
commit23b868f332c54864cd7c72418ef7ca1cf5aeecb6 (patch)
treeeedf939ad4a9aa68c4ef7379be2f4ba6580e3785 /misc/freeswitch/scripts
parentcbfe39a01d71b5819e6746060dd1ae511f613b61 (diff)
transfer_all method fixed
Diffstat (limited to 'misc/freeswitch/scripts')
-rw-r--r--misc/freeswitch/scripts/dialplan/functions.lua33
1 files changed, 15 insertions, 18 deletions
diff --git a/misc/freeswitch/scripts/dialplan/functions.lua b/misc/freeswitch/scripts/dialplan/functions.lua
index 773e481..a47d9d3 100644
--- a/misc/freeswitch/scripts/dialplan/functions.lua
+++ b/misc/freeswitch/scripts/dialplan/functions.lua
@@ -119,35 +119,32 @@ function Functions.dialplan_function(self, caller, dialed_number)
return result or { continue = false, code = 505, phrase = 'Error executing function', no_cdr = true };
end
--- Transfer all calls to a conference
+
function Functions.transfer_all(self, caller, destination_number)
- self.log:info('TRANSFER_ALL - caller: ', caller.account_type, '/', caller.account_uuid, ' number: ', destination_number);
-
local caller_sip_account = self:ensure_caller_sip_account(caller);
if not caller_sip_account then
self.log:error('TRANSFER_ALL - incompatible caller');
return { continue = false, code = 403, phrase = 'Incompatible caller' }
end
- -- Query call and channel table for channel IDs
- local sql_query = 'SELECT `b`.`name` AS `caller_chan_name`, `a`.`caller_uuid`, `a`.`callee_uuid` \
- FROM `calls` `a` JOIN `channels` `b` ON `a`.`caller_uuid` = `b`.`uuid` JOIN `channels` `c` \
- ON `a`.`callee_uuid` = `c`.`uuid` WHERE `b`.`name` LIKE ("%' .. caller_sip_account.record.auth_name .. '@%") \
- OR `c`.`name` LIKE ("%' .. caller_sip_account.record.auth_name .. '@%") LIMIT 100';
+ self.log:info('TRANSFER_ALL - initiator: ', caller.account.class, '=', caller.account.id, '/', caller.account.uuid, ', number: ', destination_number);
+ local sql_query = 'SELECT `uuid`, `b_uuid`, `callee_number`, `caller_id_number`, `sip_account_id`, `b_sip_account_id` \
+ FROM `calls_active` WHERE `sip_account_id` = '.. caller.account.id .. ' OR `b_sip_account_id` = '.. caller.account.id;
+ local index = 1;
self.database:query(sql_query, function(call_entry)
- local uid = nil
- if call_entry.caller_chan_name:find(caller_sip_account.record.auth_name .. "@") then
- uid = call_entry.callee_uuid;
- self.log:debug("Transfering callee channel with uid: " .. uid);
- else
- uid = call_entry.caller_uuid;
- self.log:debug("Transfering caller channel with uid: " .. uid);
+ if not common.str.blank(call_entry.uuid) and tostring(caller.account.id) ~= tostring(call_entry.sip_account_id) then
+ self.log:info('TRANSFER_ALEG ', index, ' - channel/', call_entry.uuid, '|', call_entry.caller_id_number);
+ freeswitch.API():execute("uuid_transfer", call_entry.uuid .. " " .. destination_number);
+ end
+ if not common.str.blank(call_entry.b_uuid) and tostring(caller.account.id) ~= tostring(call_entry.b_sip_account_id) then
+ self.log:info('TRANSFER_BLEG ', index, ' - channel/', call_entry.b_uuid, '|', call_entry.callee_number);
+ freeswitch.API():execute("uuid_transfer", call_entry.b_uuid .. " " .. destination_number);
end
- freeswitch.API():execute("uuid_transfer", uid .. " " .. destination_number);
+ index = index + 1;
end)
- return destination_number;
+ return { continue = true, number = destination_number }
end
@@ -175,7 +172,7 @@ function Functions.intercept_any_number(self, caller, destination_number)
local destination_group_ids = group_class:union(common.array.try(phone_numberable, 'group_ids'), common.array.try(phone_numberable, 'owner.group_ids'));
if #group_class:intersection(destination_group_ids, target_group_ids) == 0 then
- self.log:notice('FUNCTION_INTERCEPT_ANY_NUMBER - Groups not found or insufficient permissions');
+ self.log:notice('FUNCTION_INTERCEPT_ANY_NUMBER - Groups not found or insufficient permissions, destination:', destination_group_ids, ', target: ', target_group_ids);
return { continue = false, code = 402, phrase = '"Insufficient permissions', no_cdr = true };
end