[asterisk-commits] may: branch may/ooh323_ipv6 r308283 - in /team/may/ooh323_ipv6: ./ addons/ ce...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Feb 17 18:49:42 CST 2011
Author: may
Date: Thu Feb 17 18:49:38 2011
New Revision: 308283
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=308283
Log:
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/ (props changed)
team/may/ooh323_ipv6/addons/chan_ooh323.c
team/may/ooh323_ipv6/addons/ooh323cDriver.c
team/may/ooh323_ipv6/addons/ooh323cDriver.h
team/may/ooh323_ipv6/cel/cel_odbc.c (props changed)
team/may/ooh323_ipv6/configs/cel_odbc.conf.sample (props changed)
team/may/ooh323_ipv6/sounds/Makefile (props changed)
Propchange: team/may/ooh323_ipv6/
------------------------------------------------------------------------------
automerge = *
Propchange: team/may/ooh323_ipv6/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.
Propchange: team/may/ooh323_ipv6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 18:49:38 2011
@@ -1,1 +1,1 @@
-/trunk:307751-307752,308099-308157
+/trunk:307751-307752,308099-308157,308243
Propchange: team/may/ooh323_ipv6/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Feb 17 18:49:38 2011
@@ -1,1 +1,1 @@
-/trunk:1-308219
+/trunk:1-308282
Modified: team/may/ooh323_ipv6/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/addons/chan_ooh323.c?view=diff&rev=308283&r1=308282&r2=308283
==============================================================================
--- team/may/ooh323_ipv6/addons/chan_ooh323.c (original)
+++ team/may/ooh323_ipv6/addons/chan_ooh323.c Thu Feb 17 18:49:38 2011
@@ -184,6 +184,7 @@
int amaflags;
int progsent; /* progress is sent */
int alertsent; /* alerting is sent */
+ int g729onlyA; /* G.729 only A */
struct ast_dsp *vad;
struct OOH323Regex *rtpmask; /* rtp ip regexp */
char rtpmaskstr[120];
@@ -216,6 +217,7 @@
char rtpmaskstr[120];
int rtdrcount, rtdrinterval;
int faststart, h245tunneling;
+ int g729onlyA;
struct ooh323_user *next;
};
@@ -244,6 +246,7 @@
char rtpmaskstr[120];
int rtdrcount,rtdrinterval;
int faststart, h245tunneling;
+ int g729onlyA;
struct ooh323_peer *next;
};
@@ -303,6 +306,7 @@
static int gMediaWaitForConnect = 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;
@@ -506,6 +510,7 @@
pvt->rtptimeout = gRTPTimeout;
pvt->rtdrinterval = gRTDRInterval;
pvt->rtdrcount = gRTDRCount;
+ pvt->g729onlyA = g729onlyA;
pvt->call_reference = callref;
if (callToken)
@@ -624,6 +629,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;
@@ -652,6 +658,7 @@
ast_mutex_unlock(&iflock);
return NULL;
}
+ p->g729onlyA = g729onlyA;
p->dtmfmode = gDTMFMode;
p->dtmfcodec = gDTMFCodec;
p->t38support = gT38Support;
@@ -1752,6 +1759,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;
@@ -1767,7 +1775,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);
@@ -1802,7 +1810,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) {
@@ -1978,7 +1986,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);
@@ -2198,6 +2206,7 @@
user->t38support = gT38Support;
user->faststart = gFastStart;
user->h245tunneling = gTunneling;
+ user->g729onlyA = g729onlyA;
/* set default context */
ast_copy_string(user->context, gContext, sizeof(user->context));
ast_copy_string(user->accountcode, gAccountcode, sizeof(user->accountcode));
@@ -2219,6 +2228,8 @@
user->faststart = ast_true(v->value);
} else if (!strcasecmp(v->name, "h245tunneling")) {
user->h245tunneling = 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->t38support = gT38Support;
peer->faststart = gFastStart;
peer->h245tunneling = gTunneling;
+ peer->g729onlyA = g729onlyA;
peer->port = 1720;
if (0 == friend_type) {
peer->mFriend = 1;
@@ -2369,6 +2381,8 @@
peer->faststart = ast_true(v->value);
} else if (!strcasecmp(v->name, "h245tunneling")) {
peer->h245tunneling = 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)
@@ -2606,6 +2620,8 @@
ooH323EpEnableH245Tunneling();
else
ooH323EpDisableH245Tunneling();
+ } 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/addons/ooh323cDriver.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/addons/ooh323cDriver.c?view=diff&rev=308283&r1=308282&r2=308283
==============================================================================
--- team/may/ooh323_ipv6/addons/ooh323cDriver.c (original)
+++ team/may/ooh323_ipv6/addons/ooh323cDriver.c Thu Feb 17 18:49:38 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/addons/ooh323cDriver.h
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6/addons/ooh323cDriver.h?view=diff&rev=308283&r1=308282&r2=308283
==============================================================================
--- team/may/ooh323_ipv6/addons/ooh323cDriver.h (original)
+++ team/may/ooh323_ipv6/addons/ooh323cDriver.h Thu Feb 17 18:49:38 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/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 18:49:38 2011
@@ -1,2 +1,2 @@
/be/branches/C.3/cel/cel_adaptive_odbc.c:256426
-/trunk/cel/cel_odbc.c:290061-306867,307751-307752,308099-308157
+/trunk/cel/cel_odbc.c:290061-306867,307751-307752,308099-308157,308243
Propchange: team/may/ooh323_ipv6/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 18:49:38 2011
@@ -1,2 +1,2 @@
/be/branches/C.3/configs/cel_adaptive_odbc.conf.sample:256426
-/trunk/configs/cel_odbc.conf.sample:290061-306867,307751-307752,308099-308157
+/trunk/configs/cel_odbc.conf.sample:290061-306867,307751-307752,308099-308157,308243
Propchange: team/may/ooh323_ipv6/sounds/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 18:49:38 2011
@@ -1,2 +1,2 @@
/be/branches/C.3/sounds/Makefile:256426
-/trunk/sounds/Makefile:270974,290061-306867,307751-307752,308099-308157
+/trunk/sounds/Makefile:270974,290061-306867,307751-307752,308099-308157,308243
More information about the asterisk-commits
mailing list