[asterisk-commits] branch crichter/0.3.0 - r7572 /team/crichter/0.3.0/channels/

[asterisk-commits at lists.digium.com]

Author: crichter
Date: Wed Dec 21 05:12:57 2005
New Revision: 7572

URL: http://svn.digium.com/view/asterisk?rev=7572&view=rev
Log:
fixed prefix addition to callerid bug, updated chan_misdn version

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

Modified: team/crichter/0.3.0/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/crichter/0.3.0/channels/Makefile?rev=7572&r1=7571&r2=7572&view=diff
==============================================================================
--- team/crichter/0.3.0/channels/Makefile (original)
+++ team/crichter/0.3.0/channels/Makefile Wed Dec 21 05:12:57 2005
@@ -240,7 +240,7 @@
 	$(CC) -shared -Xlinker -x -L/usr/lib -o $@ $^ -lisdnnet -lmISDN
 
 chan_misdn.o: chan_misdn.c
-	$(CC) $(CFLAGS) -DCHAN_MISDN_VERSION=\"0.2.1\" -c $< -o $@
+	$(CC) $(CFLAGS) -DCHAN_MISDN_VERSION=\"0.3.0\" -c $< -o $@
 
 #chan_modem.so : chan_modem.o
 #	$(CC) -rdynamic -shared -Xlinker -x -o $@ $<

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=7572&r1=7571&r2=7572&view=diff
==============================================================================
--- team/crichter/0.3.0/channels/chan_misdn.c (original)
+++ team/crichter/0.3.0/channels/chan_misdn.c Wed Dec 21 05:12:57 2005
@@ -1364,6 +1364,14 @@
 		if ( strcmp(bc->dad,ast->exten)) {
 			ast_copy_string(ast->exten, bc->dad, sizeof(ast->exten));
 		}
+		if ( ast->cid.cid_num && strcmp(ast->cid.cid_num, bc->oad)) {
+			free(ast->cid.cid_num);
+			ast->cid.cid_num=NULL;
+			
+		}
+		if ( !ast->cid.cid_num) {
+			ast->cid.cid_num=strdup(bc->oad);
+		}
 			
 		pbx_builtin_setvar_helper(ch->ast,"REDIRECTING_NUMBER",bc->rad);
 	}