[svn-commits] kpfleming: branch 1.6.0 r132967 - in /branches/1.6.0: ./ channels/misdn/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Wed Jul 23 11:42:28 2008
New Revision: 132967

URL: http://svn.digium.com/view/asterisk?view=rev&rev=132967
Log:
Merged revisions 132883,132966 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r132883 | crichter | 2008-07-23 07:07:15 -0500 (Wed, 23 Jul 2008) | 9 lines

Merged revisions 132826 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r132826 | crichter | 2008-07-23 13:37:50 +0200 (Mi, 23 Jul 2008) | 1 line

another Fix because of r119585, this commit has broken high frequented BRI Ports, there was a possibility that a channel, that was marked as in_use would be reused later, the corresponding port could got stuck then. So it is recommended to upgrade for chan_misdn users.
........

................
r132966 | kpfleming | 2008-07-23 11:38:28 -0500 (Wed, 23 Jul 2008) | 2 lines

use correct function name... please compile with --enable-dev-mode

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/misdn/isdn_lib.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/misdn/isdn_lib.c?view=diff&rev=132967&r1=132966&r2=132967
==============================================================================
--- branches/1.6.0/channels/misdn/isdn_lib.c (original)
+++ branches/1.6.0/channels/misdn/isdn_lib.c Wed Jul 23 11:42:28 2008
@@ -2637,6 +2637,19 @@
 			misdn_make_dummy(&dummybc, stack->port, MISDN_ID_GLOBAL, stack->nt, 0);
 			bc=&dummybc;
 		}
+
+		if (!bc && (frm->prim==(CC_SETUP|INDICATION)) ) {
+			misdn_make_dummy(&dummybc, stack->port, MISDN_ID_GLOBAL, stack->nt, 0);
+			dummybc.port=stack->port;
+			dummybc.l3_id=frm->dinfo;
+			bc=&dummybc;
+
+			misdn_lib_send_event(bc,EVENT_RELEASE_COMPLETE);
+
+			free_msg(msg);
+			return 1;
+		}
+
     
 handle_frm_bc:
 		if (bc ) {
@@ -3121,8 +3134,8 @@
 	struct timeval now;
 	gettimeofday(&now, NULL);
 	if (!bc->in_use) {
-		if (bc->last_used.tv_sec < now.tv_sec) {
-			cb_log(0,bc->port, "channel with stid:%x for one second still in use!\n", bc->b_stid);
+		if (misdn_lib_port_is_pri(bc->port) && bc->last_used.tv_sec == now.tv_sec ) {
+			cb_log(2,bc->port, "channel with stid:%x for one second still in use! (n:%d lu:%d)\n", bc->b_stid, (int) now.tv_sec, (int) bc->last_used.tv_sec);
 			return 1;
 		}
 	}