[asterisk-commits] may: branch may/ooh323_ipv6_direct_rtp r308285 - in /team/may/ooh323_ipv6_dir...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Fri Feb 18 13:38:30 CST 2011


Author: may
Date: Fri Feb 18 13:38:26 2011
New Revision: 308285

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=308285
Log:
Recorded merge of revisions 308283 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/team/may/ooh323_ipv6

................
  r308283 | may | 2011-02-18 03:49:38 +0300 (Fri, 18 Feb 2011) | 17 lines
  
  Recorded merge of revisions 308243 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/trunk
  
  ................
    r308243 | may | 2011-02-18 03:11:06 +0300 (Fri, 18 Feb 2011) | 10 lines
    
    Merged revisions 308242 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.8
    
    ........
      r308242 | may | 2011-02-18 03:07:20 +0300 (Fri, 18 Feb 2011) | 3 lines
      
      added g729onlyA option for announce only AnnexA g.729 codec in
      h.323 capabilities. Option can be global or per user/peer.
    ........
  ................
................

Modified:
    team/may/ooh323_ipv6_direct_rtp/   (props changed)
    team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c
    team/may/ooh323_ipv6_direct_rtp/addons/ooh323cDriver.c
    team/may/ooh323_ipv6_direct_rtp/addons/ooh323cDriver.h
    team/may/ooh323_ipv6_direct_rtp/cel/cel_odbc.c   (props changed)
    team/may/ooh323_ipv6_direct_rtp/configs/cel_odbc.conf.sample   (props changed)
    team/may/ooh323_ipv6_direct_rtp/sounds/Makefile   (props changed)

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 18 13:38:26 2011
@@ -1,2 +1,2 @@
-/team/may/ooh323_ipv6:307716-307877
-/trunk:307751-307752,308099-308157
+/team/may/ooh323_ipv6:307716-307877,308283
+/trunk:307751-307752,308099-308157,308243

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
--- svnmerge-custom (original)
+++ svnmerge-custom Fri Feb 18 13:38:26 2011
@@ -1,1 +1,1 @@
-/team/may/ooh323_ipv6:1-308201,308220-308258
+/team/may/ooh323_ipv6:1-308284

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb 18 13:38:26 2011
@@ -1,1 +1,1 @@
-/trunk:1-308219
+/trunk:1-308282

Modified: team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c?view=diff&rev=308285&r1=308284&r2=308285
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/addons/chan_ooh323.c Fri Feb 18 13:38:26 2011
@@ -188,6 +188,7 @@
 	int progsent;			/* progress is sent */
 	int alertsent;			/* alerting is sent */
 	int directrtp;			/* direct rtp */
+	int g729onlyA;			/* G.729 only A */
 	struct ast_dsp *vad;
 	struct OOH323Regex *rtpmask;	/* rtp ip regexp */
 	char rtpmaskstr[120];
@@ -221,6 +222,7 @@
 	int	    rtdrcount, rtdrinterval;
 	int	    faststart, h245tunneling;
 	int	    directrtp;
+	int	    g729onlyA;
 	struct ooh323_user *next;
 };
 
@@ -250,6 +252,7 @@
 	int	    rtdrcount,rtdrinterval;
 	int	    faststart, h245tunneling;
 	int	    directrtp;
+	int	    g729onlyA;
 	struct ooh323_peer *next;
 };
 
@@ -310,6 +313,7 @@
 static int  gDirectRTP = 0;
 static int  gTOS = 0;
 static int  gRTPTimeout = 60;
+static int  g729onlyA = 0;
 static char gAccountcode[80] = DEFAULT_H323ACCNT;
 static int  gAMAFLAGS;
 static char gContext[AST_MAX_EXTENSION] = DEFAULT_CONTEXT;
@@ -491,6 +495,7 @@
 	pvt->rtptimeout = gRTPTimeout;
 	pvt->rtdrinterval = gRTDRInterval;
 	pvt->rtdrcount = gRTDRCount;
+	pvt->g729onlyA = g729onlyA;
 
 	pvt->call_reference = callref;
 	if (callToken)
@@ -609,6 +614,7 @@
 
 		ast_format_cap_copy(p->cap, peer->cap);
 		memcpy(&p->prefs, &peer->prefs, sizeof(struct ast_codec_pref));
+		p->g729onlyA = peer->g729onlyA;
 		p->dtmfmode |= peer->dtmfmode;
 		p->dtmfcodec  = peer->dtmfcodec;
 		p->t38support = peer->t38support;
@@ -638,6 +644,7 @@
 			ast_mutex_unlock(&iflock);
 			return NULL;
 		}
+		p->g729onlyA = g729onlyA;
 		p->dtmfmode = gDTMFMode;
 		p->dtmfcodec = gDTMFCodec;
 		p->t38support = gT38Support;
@@ -1746,6 +1753,7 @@
 		ast_copy_string(p->accountcode, user->accountcode, sizeof(p->accountcode));
 		p->amaflags = user->amaflags;
 		ast_format_cap_copy(p->cap, user->cap);
+		p->g729onlyA = user->g729onlyA;
 		memcpy(&p->prefs, &user->prefs, sizeof(struct ast_codec_pref));
 		p->dtmfmode |= user->dtmfmode;
 		p->dtmfcodec = user->dtmfcodec;
@@ -1762,7 +1770,7 @@
 		/* if we disable h245tun for this user then we clear flag */
 		/* in any other case we don't must touch this */
 		/* ie if we receive setup without h245tun but enabled
-		   we can't enable it per call */
+		   				we can't enable it per call */
 		if (!p->h245tunneling)
 			OO_CLRFLAG(call->flags, OO_M_TUNNELING);
 
@@ -1798,7 +1806,7 @@
 	}
 
 	ooh323c_set_capability_for_call(call, &p->prefs, p->cap, p->dtmfmode, p->dtmfcodec,
-					 p->t38support);
+					 p->t38support, p->g729onlyA);
 /* Incoming call */
   	c = ooh323_new(p, AST_STATE_RING, p->username, 0, NULL);
   	if(!c) {
@@ -1974,7 +1982,7 @@
 		}
 
       		ooh323c_set_capability_for_call(call, &p->prefs, p->cap,
-                                     p->dtmfmode, p->dtmfcodec, p->t38support);
+                                     p->dtmfmode, p->dtmfcodec, p->t38support, p->g729onlyA);
 
 		/* configure_local_rtp(p, call); */
 		ast_mutex_unlock(&p->lock);
@@ -2195,6 +2203,7 @@
 		user->faststart = gFastStart;
 		user->h245tunneling = gTunneling;
 		user->directrtp = gDirectRTP;
+		user->g729onlyA = g729onlyA;
 		/* set default context */
 		ast_copy_string(user->context, gContext, sizeof(user->context));
 		ast_copy_string(user->accountcode, gAccountcode, sizeof(user->accountcode));
@@ -2218,6 +2227,8 @@
 				user->h245tunneling = ast_true(v->value);
 			} else if (!strcasecmp(v->name, "directrtp") || !strcasecmp(v->name, "directmedia")) {
 				user->directrtp = ast_true(v->value);
+			} else if (!strcasecmp(v->name, "g729onlyA")) {
+				user->g729onlyA = ast_true(v->value);
 			} else if (!strcasecmp(v->name, "rtptimeout")) {
 				user->rtptimeout = atoi(v->value);
 				if (user->rtptimeout < 0)
@@ -2315,6 +2326,7 @@
 		peer->faststart = gFastStart;
 		peer->h245tunneling = gTunneling;
 		peer->directrtp = gDirectRTP;
+		peer->g729onlyA = g729onlyA;
       		peer->port = 1720;
 		if (0 == friend_type) {
 			peer->mFriend = 1;
@@ -2371,6 +2383,8 @@
 				peer->h245tunneling = ast_true(v->value);
 			} else if (!strcasecmp(v->name, "directrtp") || !strcasecmp(v->name, "directmedia")) {
 				peer->directrtp = ast_true(v->value);
+			} else if (!strcasecmp(v->name, "g729onlyA")) {
+				peer->g729onlyA = ast_true(v->value);
 			} else if (!strcasecmp(v->name, "rtptimeout")) {
             			peer->rtptimeout = atoi(v->value);
             			if(peer->rtptimeout < 0)
@@ -2610,6 +2624,8 @@
 				ooH323EpDisableH245Tunneling();
 		} else if (!strcasecmp(v->name, "directrtp") || !strcasecmp(v->name, "directmedia")) {
 			gDirectRTP = ast_true(v->value);
+		} else if (!strcasecmp(v->name, "g729onlyA")) {
+			g729onlyA = ast_true(v->value);
 		} else if (!strcasecmp(v->name, "roundtrip")) {
 			sscanf(v->value, "%d,%d", &gRTDRCount, &gRTDRInterval);
       		} else if (!strcasecmp(v->name, "trybemaster")) {

Modified: team/may/ooh323_ipv6_direct_rtp/addons/ooh323cDriver.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/addons/ooh323cDriver.c?view=diff&rev=308285&r1=308284&r2=308285
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/addons/ooh323cDriver.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/addons/ooh323cDriver.c Fri Feb 18 13:38:26 2011
@@ -386,7 +386,7 @@
 
 int ooh323c_set_capability_for_call
    (ooCallData *call, struct ast_codec_pref *prefs, struct ast_format_cap *cap, int dtmf, int dtmfcodec,
-		 int t38support)
+		 int t38support, int g729onlyA)
 {
    int ret = 0, x, txframes;
    struct ast_format tmpfmt;
@@ -472,17 +472,19 @@
       
          txframes = (prefs->framing[x])/10;
          if(gH323Debug)
+            ast_verbose("\tAdding g729A capability to call(%s, %s)\n",
+                                            call->callType, call->callToken);
+         ret= ooCallAddG729Capability(call, OO_G729A, txframes, txframes, 
+                                     OORXANDTX, &ooh323c_start_receive_channel,
+                                     &ooh323c_start_transmit_channel,
+                                     &ooh323c_stop_receive_channel, 
+                                     &ooh323c_stop_transmit_channel);
+	 if (g729onlyA)
+		continue;
+         if(gH323Debug)
             ast_verbose("\tAdding g729 capability to call(%s, %s)\n",
                                             call->callType, call->callToken);
          ret|= ooCallAddG729Capability(call, OO_G729, txframes, txframes, 
-                                     OORXANDTX, &ooh323c_start_receive_channel,
-                                     &ooh323c_start_transmit_channel,
-                                     &ooh323c_stop_receive_channel, 
-                                     &ooh323c_stop_transmit_channel);
-         if(gH323Debug)
-            ast_verbose("\tAdding g729A capability to call(%s, %s)\n",
-                                            call->callType, call->callToken);
-         ret= ooCallAddG729Capability(call, OO_G729A, txframes, txframes, 
                                      OORXANDTX, &ooh323c_start_receive_channel,
                                      &ooh323c_start_transmit_channel,
                                      &ooh323c_stop_receive_channel, 

Modified: team/may/ooh323_ipv6_direct_rtp/addons/ooh323cDriver.h
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/addons/ooh323cDriver.h?view=diff&rev=308285&r1=308284&r2=308285
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/addons/ooh323cDriver.h (original)
+++ team/may/ooh323_ipv6_direct_rtp/addons/ooh323cDriver.h Fri Feb 18 13:38:26 2011
@@ -41,5 +41,5 @@
 struct ast_format *convertH323CapToAsteriskCap(int cap, struct ast_format *format);
 int ooh323c_set_capability_for_call
    (ooCallData *call, struct ast_codec_pref *prefs, struct ast_format_cap *cap, int dtmf, int dtmfcodec,
-	int t38support);
+	int t38support, int g729onlyA);
 #endif

Propchange: team/may/ooh323_ipv6_direct_rtp/cel/cel_odbc.c
            ('svn:mergeinfo' removed)

Propchange: team/may/ooh323_ipv6_direct_rtp/configs/cel_odbc.conf.sample
            ('svn:mergeinfo' removed)

Propchange: team/may/ooh323_ipv6_direct_rtp/sounds/Makefile
            ('svn:mergeinfo' removed)




More information about the asterisk-commits mailing list