summaryrefslogtreecommitdiffstats
path: root/socket_server.c
diff options
context:
space:
mode:
authorSuper User2008-05-01 10:35:20 +0200
committerSuper User2008-05-01 10:35:20 +0200
commit0efcf371b4a61fa1376e83d2b7404aeb47a36e26 (patch)
tree490134ca54abca5c1983b8d40648acdf03de3b39 /socket_server.c
parentwork (diff)
downloadlcr-0efcf371b4a61fa1376e83d2b7404aeb47a36e26.tar.gz
lcr-0efcf371b4a61fa1376e83d2b7404aeb47a36e26.tar.xz
lcr-0efcf371b4a61fa1376e83d2b7404aeb47a36e26.zip
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
Diffstat (limited to 'socket_server.c')
-rw-r--r--socket_server.c19
1 files changed, 3 insertions, 16 deletions
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 <stdio.h>
-//#include <stdlib.h>
-//#include <string.h>
-#include <sys/types.h>
-//#include <sys/stat.h>
-//#include <unistd.h>
-//#include <signal.h>
-//#include <fcntl.h>
-#include <sys/ioctl.h>
-//#include <sys/file.h>
-//#include <errno.h>
-//#include <sys/mman.h>
-//#include <sys/resource.h>
+#include "main.h"
#include <sys/socket.h>
#include <sys/un.h>
#include <curses.h>
-#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