This commit was manufactured by cvs2svn to create tag 'v1-0-7'.

git-svn-id: http://svn.digium.com/svn/asterisk/tags/v1-0-7@5203 f38db490-d61c-443f-a65b-d21fe96a405b

4 files changed, 18 insertions, 8 deletions

diff --git a/channels/h323/.cvsignore b/channels/h323/.cvsignore
new file mode 100755
index 000000000..4671378ae
--- /dev/null
+++ b/channels/h323/.cvsignore
@@ -0,0 +1 @@
+.depend
diff --git a/channels/h323/Makefile b/channels/h323/Makefile
index 52004c1fd..1ccc8a657 100755
--- a/channels/h323/Makefile
+++ b/channels/h323/Makefile
@@ -64,7 +64,7 @@ CFLAGS += -I$(OPENH323DIR)/include
 CFLAGS += -Wno-missing-prototypes -Wno-missing-declarations
 LIBS+= -lcrypto -lssl -lexpat
 
-all:   	libchanh323.a
+all:	depend libchanh323.a
 
 samples: 
 	if [ -f $(ASTETCDIR)/h323.conf ]; then \
@@ -73,11 +73,15 @@ samples:
 	install h323.conf.sample $(ASTETCDIR)/h323.conf
  
 
+libchanh323.a:	ast_h323.o
+	ar cr libchanh323.a ast_h323.o
+
 ast_h323.o:	ast_h323.cpp
 	$(CXX) -g -c -fno-rtti -o $@ $(CFLAGS) $<
 
-libchanh323.a:	ast_h323.o
-	ar cr libchanh323.a ast_h323.o
+ifneq ($(wildcard .depend),)
+include .depend
+endif
 
 chan_h323.so:	
 	$(CXX)  -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib $(CHANH323LIB)
@@ -88,6 +92,11 @@ chan_h323_d.so:	chan_h323.o ast_h323.o
 chan_h323_s.so:	chan_h323.o ast_h323.o
 	$(CXX)  -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib  -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib $(CHANH323LIB)
 clean:
-	rm -f *.o *.so core.* libchanh323.a
+	rm -f *.o *.so core.* libchanh323.a .depend
+
+depend: .depend
+
+.depend:
+	../../mkdep $(CFLAGS) `ls *.cpp`
 
 
diff --git a/channels/h323/ast_h323.cpp b/channels/h323/ast_h323.cpp
index afeee365e..4c01d9575 100755
--- a/channels/h323/ast_h323.cpp
+++ b/channels/h323/ast_h323.cpp
@@ -722,7 +722,7 @@ void MyH323Connection::SendUserInputTone(char tone, unsigned duration)
 	if (h323debug) {
 		cout << "	-- Sending user input tone (" << tone << ") to remote" << endl;
 	}
-	on_send_digit(GetCallReference(), tone);	
+	on_send_digit(GetCallReference(), tone, (const char *)GetCallToken());	
 	H323Connection::SendUserInputTone(tone, duration);
 }
 
@@ -732,7 +732,7 @@ void MyH323Connection::OnUserInputTone(char tone, unsigned duration, unsigned lo
 		if (h323debug) {
 			cout << "	-- Received user input tone (" << tone << ") from remote" << endl;
 		}
-		on_send_digit(GetCallReference(), tone);
+		on_send_digit(GetCallReference(), tone, (const char *)GetCallToken());	
 	}
 	H323Connection::OnUserInputTone(tone, duration, logicalChannel, rtpTimestamp);
 }
@@ -743,7 +743,7 @@ void MyH323Connection::OnUserInputString(const PString &value)
 		if (h323debug) {
 			cout <<  "	-- Received user input string (" << value << ") from remote." << endl;
 		}
-		on_send_digit(GetCallReference(), value[0]);
+		on_send_digit(GetCallReference(), value[0], (const char *)GetCallToken());
 	}	
 }
 
diff --git a/channels/h323/chan_h323.h b/channels/h323/chan_h323.h
index 1b277c499..e948a1a02 100755
--- a/channels/h323/chan_h323.h
+++ b/channels/h323/chan_h323.h
@@ -114,7 +114,7 @@ typedef struct rtp_info {
 
 /* This is a callback prototype function, called pass
    DTMF down the RTP. */
-typedef int (*send_digit_cb)(unsigned, char);
+typedef int (*send_digit_cb)(unsigned, char, const char *);
 extern send_digit_cb	on_send_digit; 
 
 /* This is a callback prototype function, called to collect