From 0efcf371b4a61fa1376e83d2b7404aeb47a36e26 Mon Sep 17 00:00:00 2001 From: Super User Date: Thu, 1 May 2008 10:35:20 +0200 Subject: work on chan_lcr modified: Makefile modified: action.cpp modified: action_efi.cpp modified: action_vbox.cpp modified: apppbx.cpp modified: apppbx.h modified: bchannel.c modified: bchannel.h new file: callerid.c new file: callerid.h modified: chan_lcr.c modified: chan_lcr.h modified: crypt.cpp modified: endpoint.cpp modified: endpointapp.cpp modified: interface.c modified: join.cpp modified: joinpbx.cpp modified: joinremote.cpp modified: mISDN.cpp modified: mail.c modified: main.h modified: message.h modified: port.cpp modified: route.c modified: route.h modified: socket_server.c modified: todo.txt modified: vbox.cpp modified: watch.c --- socket_server.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'socket_server.c') diff --git a/socket_server.c b/socket_server.c index 6565602..b50b3e7 100644 --- a/socket_server.c +++ b/socket_server.c @@ -9,23 +9,10 @@ ** ** \*****************************************************************************/ -#include -//#include -//#include -#include -//#include -//#include -//#include -//#include -#include -//#include -//#include -//#include -//#include +#include "main.h" #include #include #include -#include "main.h" char *socket_name = SOCKET_NAME; @@ -274,7 +261,7 @@ int admin_route(struct admin_queue **responsep) apppbx->release(RELEASE_ALL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL, LOCATION_PRIVATE_LOCAL, CAUSE_NORMAL); start_trace(0, NULL, - numberrize_callerinfo(apppbx->e_callerinfo.id, apppbx->e_callerinfo.ntype), + numberrize_callerinfo(apppbx->e_callerinfo.id, apppbx->e_callerinfo.ntype, options.national, options.international), apppbx->e_dialinginfo.id, DIRECTION_NONE, CATEGORY_EP, @@ -516,7 +503,7 @@ int admin_call(struct admin_list *admin, struct admin_message *msg) FATAL("No memory for Endpoint Application instance\n"); apppbx->e_adminid = admin->sockserial; admin->epointid = epoint->ep_serial; - SCPY(apppbx->e_callerinfo.id, nationalize_callerinfo(msg->u.call.callerid, &apppbx->e_callerinfo.ntype)); + SCPY(apppbx->e_callerinfo.id, nationalize_callerinfo(msg->u.call.callerid, &apppbx->e_callerinfo.ntype, options.national, options.international)); if (msg->u.call.present) apppbx->e_callerinfo.present = INFO_PRESENT_ALLOWED; else -- cgit v1.2.3-55-g7522