[asterisk-commits] branch crichter/0.3.0 - r8530 in /team/crichter/0.3.0: ./ channels/ channels/...

[asterisk-commits at lists.digium.com]

Author: crichter
Date: Tue Jan 24 06:43:24 2006
New Revision: 8530

URL: http://svn.digium.com/view/asterisk?rev=8530&view=rev
Log:

* fixed RETRIEVE does not work bug!
* added cm-install/clean targets to main makefile for easy installation
* minor code formattings



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

Modified: team/crichter/0.3.0/Makefile
URL: http://svn.digium.com/view/asterisk/team/crichter/0.3.0/Makefile?rev=8530&r1=8529&r2=8530&view=diff
==============================================================================
--- team/crichter/0.3.0/Makefile (original)
+++ team/crichter/0.3.0/Makefile Tue Jan 24 06:43:24 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.3.0/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/team/crichter/0.3.0/channels/chan_misdn.c?rev=8530&r1=8529&r2=8530&view=diff
==============================================================================
--- team/crichter/0.3.0/channels/chan_misdn.c (original)
+++ team/crichter/0.3.0/channels/chan_misdn.c Tue Jan 24 06:43:24 2006
@@ -3456,7 +3456,7 @@
 			break;
 		}
 
-#if 1
+#if 0
 		{
 			struct chan_list *holded_ch=find_holded(cl_te, bc);
 			if (holded_ch) {
@@ -4130,3 +4130,5 @@
 		fclose(fp);
 	}
 }
+
+

Modified: team/crichter/0.3.0/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/view/asterisk/team/crichter/0.3.0/channels/misdn/isdn_lib.c?rev=8530&r1=8529&r2=8530&view=diff
==============================================================================
--- team/crichter/0.3.0/channels/misdn/isdn_lib.c (original)
+++ team/crichter/0.3.0/channels/misdn/isdn_lib.c Tue Jan 24 06:43:24 2006
@@ -12,7 +12,7 @@
  */
 
 #include "isdn_lib_intern.h"
-
+#include <mISDNuser/isdn_debug.h>
 
 void misdn_free_ibuffer(void *ibuf)
 {
@@ -2788,9 +2788,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);
 		
@@ -3094,7 +3092,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();
@@ -3418,6 +3420,7 @@
 	     help=help->next) {
 		if (!help->next) {
 			help->next=holder;
+			break;
 		}
 	}