From 83477c7faf66a160530f5a01c1bf3016e2127a4d Mon Sep 17 00:00:00 2001 From: Super User Date: Sat, 5 Jan 2008 22:58:22 +0100 Subject: fixes, screen in and out works, fixed release problem in mISDNuser modified: Makefile modified: README modified: action.cpp modified: apppbx.cpp modified: apppbx.h modified: dss1.cpp modified: extension.c modified: interface.c modified: interface.h modified: main.c modified: port.cpp modified: tones.c modified: trace.c modified: trace.h --- dss1.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'dss1.cpp') diff --git a/dss1.cpp b/dss1.cpp index 523ab32..e64ccce 100644 --- a/dss1.cpp +++ b/dss1.cpp @@ -353,9 +353,9 @@ int Pdss1::hunt_bchannel(int channel, int exclusive) } if (channel <= 0) /* not given, no channel, whatever.. */ channel = CHANNEL_ANY; /* any channel */ + add_trace("channel", "reserved", "%d", p_m_mISDNport->b_reserved); if (p_m_mISDNport->b_reserved >= p_m_mISDNport->b_num) // of out chan.. { - add_trace("channel", "reserved", "%d", p_m_mISDNport->b_reserved); add_trace("conclusion", NULL, "all channels are reserved"); end_trace(); return(-34); // no channel @@ -2056,6 +2056,8 @@ void Pdss1::message_setup(unsigned long epoint_id, int message_id, union paramet memcpy(&p_capainfo, ¶m->setup.capainfo, sizeof(p_capainfo)); memcpy(&p_redirinfo, ¶m->setup.redirinfo, sizeof(p_redirinfo)); // SCPY(&p_m_tones_dir, param->setup.ext.tones_dir); + /* screen outgoing caller id */ + do_screen(1, p_callerinfo.id, sizeof(p_callerinfo.id), &p_callerinfo.ntype, &p_callerinfo.present, p_m_mISDNport->ifport->interface); /* only display at connect state: this case happens if endpoint is in connected mode */ if (p_state==PORT_STATE_CONNECT) @@ -2573,6 +2575,8 @@ void Pdss1::message_connect(unsigned long epoint_id, int message_id, union param /* copy connected information */ memcpy(&p_connectinfo, ¶m->connectinfo, sizeof(p_connectinfo)); + /* screen outgoing caller id */ + do_screen(1, p_connectinfo.id, sizeof(p_connectinfo.id), &p_connectinfo.ntype, &p_connectinfo.present, p_m_mISDNport->ifport->interface); /* only display at connect state */ if (p_state == PORT_STATE_CONNECT) -- cgit v1.2.3-55-g7522