** **
\*****************************************************************************/
-#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;
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,
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
response->am[num].u.i.l1link = mISDNport->l1link;
/* l2link */
response->am[num].u.i.l2link = mISDNport->l2link;
+ /* los */
+ response->am[num].u.i.los = mISDNport->los;
+ /* ais */
+ response->am[num].u.i.ais = mISDNport->ais;
+ /* rdi */
+ response->am[num].u.i.rdi = mISDNport->rdi;
+ /* slip */
+ response->am[num].u.i.slip_tx = mISDNport->slip_tx;
+ response->am[num].u.i.slip_rx = mISDNport->slip_rx;
/* channels */
response->am[num].u.i.channels = mISDNport->b_num;
/* channel info */