diff --git a/kamailio_conf.lua.tt2 b/kamailio_conf.lua.tt2 index f27ab3e..cc12e85 100644 --- a/kamailio_conf.lua.tt2 +++ b/kamailio_conf.lua.tt2 @@ -3,6 +3,8 @@ require 'ngcp.ngcp' ngcp = NGCP:new() +loaded_keys = {} + -- set config ngcp.config.db_user = "[% kamailio.proxy.dbrwuser %]" ngcp.config.db_pass = "[% kamailio.proxy.dbrwpw %]" @@ -13,23 +15,34 @@ function ngcp_test() print = function(msg) sr.log("info", msg) end - require('tests.ngcp_xavp') - require('tests.ngcp_dp') - require('tests.ngcp_up') - require('tests.ngcp_pp') - require('tests.ngcp_rp') - require('tests.ngcp') + require('tests.test_kamailio') end function ngcp_clean(vtype) ngcp:clean(vtype) end +function print_loaded_prefs(vtype) + local _,v + local xavp = NGCPRealPrefs:xavp(vtype) + for _,v in pairs(loaded_keys[vtype].real) do + sr.log("info", string.format("real key:%s value:%s\n", v, xavp(v))) + end + xavp = NGCPPeerPrefs:xavp(vtype) + for _,v in pairs(loaded_keys[vtype].peer) do + sr.log("info", string.format("peer key:%s value:%s\n", v, xavp(v))) + end +end + function ngcp_load_caller(uuid, domain, peer) - ngcp:caller_load(uuid, domain,peer) + loaded_keys["caller"] = ngcp:caller_load(uuid, domain, peer) + local keys = loaded_keys["caller"] + sr.log("info", string.format("real: %s peer: %s", table.tostring(keys.real), table.tostring(keys.peer))) end function ngcp_load_callee(uuid, domain, peer) - ngcp:caller_load(uuid, domain,peer) + loaded_keys["callee"] = ngcp:caller_load(uuid, domain, peer) + local keys = loaded_keys["callee"] + sr.log("info", string.format("real: %s peer: %s", table.tostring(keys.real), table.tostring(keys.peer))) end --EOF diff --git a/ngcp/ngcp.lua b/ngcp/ngcp.lua index 4c2255b..247cc6c 100644 --- a/ngcp/ngcp.lua +++ b/ngcp/ngcp.lua @@ -68,6 +68,7 @@ NGCP_MT = { __index = NGCP } table.add(unique_keys, v) end self.prefs.real:caller_load(unique_keys) + return {real = unique_keys, peer = keys.peer} end function NGCP:callee_load(uuid, domain, peer) @@ -82,6 +83,7 @@ NGCP_MT = { __index = NGCP } table.add(unique_keys, v) end self.prefs.real:callee_load(unique_keys) + return {real = unique_keys, peer = keys.peer} end function NGCP:clean(vtype)