summaryrefslogtreecommitdiffstats
path: root/apppbx.cpp
diff options
context:
space:
mode:
authorSuper User2008-02-03 13:47:33 +0100
committerSuper User2008-02-03 13:47:33 +0100
commit5ad4c41dc406a15beaa0a7b73d9dada1df74f939 (patch)
tree4c46478eb2ed26258b4d4727ebf47b62318c6794 /apppbx.cpp
parentwork on asterisk channel driver (diff)
downloadlcr-5ad4c41dc406a15beaa0a7b73d9dada1df74f939.tar.gz
lcr-5ad4c41dc406a15beaa0a7b73d9dada1df74f939.tar.xz
lcr-5ad4c41dc406a15beaa0a7b73d9dada1df74f939.zip
now gives warning if mISDN branch is wrong.
also some work on chan_lcr. modified: Makefile modified: apppbx.cpp modified: bchannel.c modified: chan_lcr.c modified: chan_lcr.h modified: dss1.cpp modified: dss1.h modified: extension.c modified: extension.h modified: genrc.c modified: ie.cpp renamed: admin_client.c -> lcradmin.c renamed: admin.h -> lcrsocket.h modified: mISDN.cpp modified: main.h renamed: admin_server.c -> socket_server.c renamed: admin_server.h -> socket_server.h modified: todo.txt
Diffstat (limited to 'apppbx.cpp')
-rw-r--r--apppbx.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/apppbx.cpp b/apppbx.cpp
index c2619e9..66aba31 100644
--- a/apppbx.cpp
+++ b/apppbx.cpp
@@ -1001,7 +1001,7 @@ void EndpointAppPBX::out_setup(void)
goto check_anycall_intern;
}
/* directory.list */
- if (e_callerinfo.id[0] && (e_ext.centrex || e_ext.display_name))
+ if (e_callerinfo.id[0] && e_ext.display_name)
{
dirname = parse_directory(e_callerinfo.id, e_callerinfo.ntype);
if (dirname)
@@ -1025,8 +1025,8 @@ void EndpointAppPBX::out_setup(void)
SCPY(message->param.setup.callerinfo.display, apply_callerid_display(message->param.setup.callerinfo.id, message->param.setup.callerinfo.itype, message->param.setup.callerinfo.ntype, message->param.setup.callerinfo.present, message->param.setup.callerinfo.screen, message->param.setup.callerinfo.extension, message->param.setup.callerinfo.name));
//printf("\n\ndisplay = %s\n\n\n",message->param.setup.callerinfo.display);
/* use cnip, if enabld */
- if (!e_ext.centrex)
- message->param.setup.callerinfo.name[0] = '\0';
+ // if (!e_ext.centrex)
+ // message->param.setup.callerinfo.name[0] = '\0';
/* screen clip if prefix is required */
if (message->param.setup.callerinfo.id[0] && e_ext.clip_prefix[0])
{
@@ -2986,8 +2986,8 @@ void EndpointAppPBX::join_connect(struct port_list *portlist, int message_type,
SCPY(message->param.connectinfo.display, apply_callerid_display(message->param.connectinfo.id, message->param.connectinfo.itype, message->param.connectinfo.ntype, message->param.connectinfo.present, message->param.connectinfo.screen, message->param.connectinfo.extension, message->param.connectinfo.name));
/* use conp, if enabld */
- if (!e_ext.centrex)
- message->param.connectinfo.name[0] = '\0';
+// if (!e_ext.centrex)
+// message->param.connectinfo.name[0] = '\0';
/* send connect */
message_put(message);