X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=dss1.cpp;h=f0834af9f809b646ee3a16bc23f818f79222c1ed;hp=e745bd379137ace90f976f6acb93d5b1b0110e3b;hb=5463e1b62a39ce417b610584e3d34a8bc30ac15e;hpb=73353997fd842a1ec34f048be4261f46240113ba

diff --git a/dss1.cpp b/dss1.cpp
index e745bd3..f0834af 100644
--- a/dss1.cpp
+++ b/dss1.cpp
@@ -1943,7 +1943,9 @@ void Pdss1::message_information(unsigned int epoint_id, int message_id, union pa
 void Pdss1::message_setup(unsigned int epoint_id, int message_id, union parameter *param)
 {
 	l3_msg *l3m;
+#ifdef OLD_MT_ASSIGN
 	int ret;
+#endif
 	int plan, type, screen, present, reason;
 	int plan2, type2, screen2, present2;
 	int capability, mode, rate, coding, user, presentation, interpretation, hlc, exthlc;
@@ -1970,8 +1972,8 @@ void Pdss1::message_setup(unsigned int epoint_id, int message_id, union paramete
 	memcpy(&p_capainfo, &param->setup.capainfo, sizeof(p_capainfo));
 	memcpy(&p_redirinfo, &param->setup.redirinfo, sizeof(p_redirinfo));
 	/* 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);
-	do_screen(1, p_callerinfo.id2, sizeof(p_callerinfo.id2), &p_callerinfo.ntype2, &p_callerinfo.present2, p_m_mISDNport->ifport->interface);
+	do_screen(1, p_callerinfo.id, sizeof(p_callerinfo.id), &p_callerinfo.ntype, &p_callerinfo.present, p_m_mISDNport->ifport->interface->name);
+	do_screen(1, p_callerinfo.id2, sizeof(p_callerinfo.id2), &p_callerinfo.ntype2, &p_callerinfo.present2, p_m_mISDNport->ifport->interface->name);
 
 	/* only display at connect state: this case happens if endpoint is in connected mode */
 	if (p_state==PORT_STATE_CONNECT) {
@@ -2485,7 +2487,7 @@ void Pdss1::message_connect(unsigned int epoint_id, int message_id, union parame
 	/* copy connected information */
 	memcpy(&p_connectinfo, &param->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);
+	do_screen(1, p_connectinfo.id, sizeof(p_connectinfo.id), &p_connectinfo.ntype, &p_connectinfo.present, p_m_mISDNport->ifport->interface->name);
 
 	/* only display at connect state */
 	if (p_state == PORT_STATE_CONNECT)
@@ -2999,6 +3001,11 @@ int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pi
 		// facility als broadcast
 		break;
 
+		case MT_L2IDLE:
+		// L2 became idle - we could sent a MT_L2RELEASE if we are the L2 master
+		PDEBUG(DEBUG_ISDN, "Got L2 idle\n");
+		break;
+
 		default:
 		PERROR("unhandled message: cmd(0x%x) pid(0x%x)\n", cmd, pid);
 		port = port_first;