X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=socket_server.c;h=b50b3e7e2be81f11a9546343d98d9e59fe1cd0b2;hp=6565602ab18e7e790591460733a49f19b5ef8962;hb=0efcf371b4a61fa1376e83d2b7404aeb47a36e26;hpb=81c485c126c08982e0d9120d5198c5515a0779d6

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