Fix dtmfmode, dtmfcodec capability, Faststart for users and peers. Bug #4112

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5551 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 12 insertions, 11 deletions

diff --git a/channels/h323/ast_h323.cpp b/channels/h323/ast_h323.cpp
index 80cabd6ff..2fd4d8c9a 100755
--- a/channels/h323/ast_h323.cpp
+++ b/channels/h323/ast_h323.cpp
@@ -298,7 +298,7 @@ int MyH323EndPoint::MakeCall(const PString & dest, PString & token, unsigned int
 			cout << " -- Making call to " << fullAddress << " without gatekeeper." << endl;
 		}
 	}
-	if (!(connection = (MyH323Connection *)H323EndPoint::MakeCallLocked(fullAddress, token))) {
+	if (!(connection = (MyH323Connection *)H323EndPoint::MakeCallLocked(fullAddress, token, opts))) {
 		if (h323debug) {
 			cout << "Error making call to \"" << fullAddress << '"' << endl;
 		}
diff --git a/channels/h323/chan_h323.h b/channels/h323/chan_h323.h
index 3be251e80..9ac4a061b 100755
--- a/channels/h323/chan_h323.h
+++ b/channels/h323/chan_h323.h
@@ -31,16 +31,16 @@
 /** call_option struct holds various bits
  *         of information for each call */
 typedef struct call_options {
-	char            cid_num[80];
-	char            cid_name[80];
-	int             noFastStart;
-	int             noH245Tunneling;
-	int             noSilenceSuppression;
-	unsigned int    port;
-	int             progress_setup;
-	int             progress_alert;
-	int             progress_audio;
-	int		dtmfcodec;
+	char			cid_num[80];
+	char			cid_name[80];
+	int				noFastStart;
+	int				noH245Tunneling;
+	int				noSilenceSuppression;
+	unsigned int	port;
+	int				progress_setup;
+	int				progress_alert;
+	int				progress_audio;
+	int				dtmfcodec;
 } call_options_t;
 
 /* structure to hold the valid asterisk users */
@@ -51,6 +51,7 @@ struct oh323_user {
 	char callerid[80];
 	char accountcode[20];
 	int amaflags;
+	int capability;
 	int bridge;
 	int nat;
 	int dtmfmode;