summaryrefslogtreecommitdiffstats
path: root/dss1.cpp
diff options
context:
space:
mode:
authorSuper User2008-05-12 18:35:48 +0200
committerSuper User2008-05-12 18:35:48 +0200
commit012abb3e07c04507685491070cedd93e4b093374 (patch)
tree2260f3291e51c67c944372f8186a06534a86ec07 /dss1.cpp
parentnt-mode multiplexing debugged (diff)
downloadlcr-012abb3e07c04507685491070cedd93e4b093374.tar.gz
lcr-012abb3e07c04507685491070cedd93e4b093374.tar.xz
lcr-012abb3e07c04507685491070cedd93e4b093374.zip
some minor fixes
modified: dss1.cpp modified: joinpbx.cpp modified: mISDN.cpp modified: port.cpp modified: tones_american/joined.isdn modified: tones_american/left.isdn
Diffstat (limited to 'dss1.cpp')
-rw-r--r--dss1.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/dss1.cpp b/dss1.cpp
index 3c9afa5..2df2645 100644
--- a/dss1.cpp
+++ b/dss1.cpp
@@ -1180,14 +1180,10 @@ void Pdss1::connect_ind(unsigned long prim, unsigned long dinfo, void *data)
struct lcr_msg *message;
int bchannel_before;
+#ifndef SOCKET_MISDN
if (p_m_d_ntmode)
- {
-#ifdef SOCKET_MISDN
- p_m_d_ces = pid >> 16;
-#else
p_m_d_ces = connect->ces;
#endif
- }
l1l2l3_trace_header(p_m_mISDNport, this, L3_CONNECT_IND, DIRECTION_IN);
#ifdef SOCKET_MISDN
@@ -4088,6 +4084,8 @@ int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pi
if ((pdss1->p_m_d_l3id&MISDN_PID_CRTYPE_MASK) != MISDN_PID_MASTER)
PERROR(" strange setup-procid 0x%x\n", pdss1->p_m_d_l3id);
pdss1->p_m_d_l3id = pid;
+ if (port->p_state == PORT_STATE_CONNECT)
+ pdss1->p_m_d_ces = pid >> 16;
add_trace("callref", "new", "0x%x", pdss1->p_m_d_l3id);
end_trace();
return(0);