[asterisk-commits] branch crichter/0.2.1 r8918 - in /team/crichter/0.2.1: ./ channels/ channels/...

[asterisk-commits at lists.digium.com]

Author: crichter
Date: Mon Jan 30 12:40:25 2006
New Revision: 8918

URL: http://svn.digium.com/view/asterisk?rev=8918&view=rev
Log:
* fixed RETRIEVE Bug
* fixed NT Bug with Dect Phones


Modified:
    team/crichter/0.2.1/Makefile
    team/crichter/0.2.1/channels/chan_misdn.c
    team/crichter/0.2.1/channels/misdn/isdn_lib.c

Modified: team/crichter/0.2.1/Makefile
URL: http://svn.digium.com/view/asterisk/team/crichter/0.2.1/Makefile?rev=8918&r1=8917&r2=8918&view=diff
==============================================================================
--- team/crichter/0.2.1/Makefile (original)
+++ team/crichter/0.2.1/Makefile Mon Jan 30 12:40:25 2006
@@ -899,3 +899,18 @@
 	if cmp -s .cleancount .lastclean ; then echo ; else \
 		$(MAKE) clean; cp -f .cleancount .lastclean;\
 	fi
+
+
+chan_misdn.so:
+	make -C . SUBDIRS=channels CHANNEL_LIBS=chan_misdn.so
+
+cm-install: chan_misdn.so
+	install -m 644 channels/chan_misdn.so /usr/lib/asterisk/modules/
+
+cm-clean:
+	rm -f channels/chan_misdn_config.o
+	rm -f channels/chan_misdn.o
+	rm -f channels/chan_misdn.so
+
+cm-cleaner:	cm-clean
+	make -C channels/misdn clean

Modified: team/crichter/0.2.1/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/team/crichter/0.2.1/channels/chan_misdn.c?rev=8918&r1=8917&r2=8918&view=diff
==============================================================================
--- team/crichter/0.2.1/channels/chan_misdn.c (original)
+++ team/crichter/0.2.1/channels/chan_misdn.c Mon Jan 30 12:40:25 2006
@@ -3300,6 +3300,7 @@
 			break;
 		}
 
+#if 0
 		{
 			struct chan_list *holded_ch=find_holded(cl_te, bc);
 			if (holded_ch) {
@@ -3308,6 +3309,7 @@
 				break;
 			}
 		}
+#endif
 		
 		if (AST_BRIDGED_P(ch->ast)){
 			ch->state = MISDN_HOLDED;

Modified: team/crichter/0.2.1/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/view/asterisk/team/crichter/0.2.1/channels/misdn/isdn_lib.c?rev=8918&r1=8917&r2=8918&view=diff
==============================================================================
--- team/crichter/0.2.1/channels/misdn/isdn_lib.c (original)
+++ team/crichter/0.2.1/channels/misdn/isdn_lib.c Mon Jan 30 12:40:25 2006
@@ -1551,7 +1551,8 @@
 				if (bc) { //repair reject bug
 					int myprocid=bc->l3_id&0x0000ffff;
 					hh->dinfo=(hh->dinfo&0xffff0000)|myprocid;
-					cb_log(4,stack->port,"Repaired reject Bug, new dinfo: %x\n",hh->dinfo);
+					cb_log(3,stack->port,"Repaired reject Bug, new dinfo: %x\n",hh->dinfo);
+					return 0;
 				}
 			}
 		}
@@ -2551,9 +2552,7 @@
 	case EVENT_HOLD_ACKNOWLEDGE:
 	{
 		struct misdn_bchannel *holded_bc=malloc(sizeof(struct misdn_bchannel));
-		
 		memcpy(holded_bc,bc,sizeof(struct misdn_bchannel));
-		
 		holded_bc->holded=1;
 		stack_holder_add(stack,holded_bc);
 		
@@ -2845,7 +2844,11 @@
   
 	msg_init();
 	debug_init(0 , NULL, NULL, NULL);
-	
+#if 0
+	int flags=0xff;
+	flags &= ~DBGM_MSG;
+	debug_init( flags , NULL, NULL, NULL);
+#endif	
 	if (!portlist || (*portlist == 0) ) return 1;
 	
 	init_flip_bits();
@@ -3188,6 +3191,7 @@
 	     help=help->next) {
 		if (!help->next) {
 			help->next=holder;
+			break;
 		}
 	}