aboutsummaryrefslogtreecommitdiffstats
path: root/addons
diff options
context:
space:
mode:
authormay <may@f38db490-d61c-443f-a65b-d21fe96a405b>2011-03-14 21:51:35 +0000
committermay <may@f38db490-d61c-443f-a65b-d21fe96a405b>2011-03-14 21:51:35 +0000
commitbf0bc7d7a7f427a1a89ad9a7f94d3d2599aef34d (patch)
tree503cc11908579e0efc29f9f6bbcaa279679dff70 /addons
parent5401364c2d1146fd342f26c4d876cdef4540433c (diff)
Merged revisions 310734 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 (closes issue #18693) ........ r310734 | may | 2011-03-15 00:45:53 +0300 (Tue, 15 Mar 2011) | 12 lines Introduce t.38 parameters control functionality not full but enough for Send/RcvFax support Introduce t.38 controls between asterisk core and channel/proto layers. Not all parameters are transferred from proto layers but *Fax apps tested and work ok. (issue #18693) Reported by: benngard2 Patches: issue-18693.patch uploaded by may213 (license 454) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@310735 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'addons')
-rw-r--r--addons/chan_ooh323.c16
-rw-r--r--addons/ooh323c/src/ooCalls.h2
-rw-r--r--addons/ooh323c/src/ooCapability.c6
3 files changed, 24 insertions, 0 deletions
diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c
index bdb03e255..1b6c0ceca 100644
--- a/addons/chan_ooh323.c
+++ b/addons/chan_ooh323.c
@@ -520,6 +520,7 @@ static struct ooh323_pvt *ooh323_alloc(int callref, char *callToken)
}
ast_udptl_set_error_correction_scheme(pvt->udptl, UDPTL_ERROR_CORRECTION_NONE);
+ ast_udptl_set_far_max_datagram(pvt->udptl, 144);
pvt->faxmode = 0;
pvt->t38support = gT38Support;
pvt->rtptimeout = gRTPTimeout;
@@ -4158,11 +4159,14 @@ void setup_udptl_connection(ooCallData *call, const char *remoteIp,
them.sin_port = htons(remotePort);
ast_sockaddr_from_sin(&them_addr, &them);
ast_udptl_set_peer(p->udptl, &them_addr);
+ ast_udptl_set_tag(p->udptl, p->owner->name);
p->t38_tx_enable = 1;
p->lastTxT38 = time(NULL);
if (p->t38support == T38_ENABLED) {
struct ast_control_t38_parameters parameters = { .request_response = 0 };
parameters.request_response = AST_T38_NEGOTIATED;
+ parameters.max_ifp = ast_udptl_get_far_max_ifp(p->udptl);
+ parameters.rate = AST_T38_RATE_14400;
ast_queue_control_data(p->owner, AST_CONTROL_T38_PARAMETERS, &parameters, sizeof(parameters));
}
if (gH323Debug)
@@ -4357,6 +4361,16 @@ void onModeChanged(ooCallData *call, int t38mode) {
struct ast_control_t38_parameters parameters = { .request_response = 0 };
parameters.request_response = AST_T38_REQUEST_NEGOTIATE;
+ if (call->T38FarMaxDatagram) {
+ ast_udptl_set_far_max_datagram(p->udptl, call->T38FarMaxDatagram);
+ } else {
+ ast_udptl_set_far_max_datagram(p->udptl, 144);
+ }
+ if (call->T38Version) {
+ parameters.version = call->T38Version;
+ }
+ parameters.max_ifp = ast_udptl_get_far_max_ifp(p->udptl);
+ parameters.rate = AST_T38_RATE_14400;
ast_queue_control_data(p->owner, AST_CONTROL_T38_PARAMETERS,
&parameters, sizeof(parameters));
p->faxmode = 1;
@@ -4366,6 +4380,8 @@ void onModeChanged(ooCallData *call, int t38mode) {
if (p->t38support == T38_ENABLED) {
struct ast_control_t38_parameters parameters = { .request_response = 0 };
parameters.request_response = AST_T38_REQUEST_TERMINATE;
+ parameters.max_ifp = ast_udptl_get_far_max_ifp(p->udptl);
+ parameters.rate = AST_T38_RATE_14400;
ast_queue_control_data(p->owner, AST_CONTROL_T38_PARAMETERS,
&parameters, sizeof(parameters));
}
diff --git a/addons/ooh323c/src/ooCalls.h b/addons/ooh323c/src/ooCalls.h
index 8f367769f..5c2604087 100644
--- a/addons/ooh323c/src/ooCalls.h
+++ b/addons/ooh323c/src/ooCalls.h
@@ -214,6 +214,8 @@ typedef struct OOH323CallData {
ASN1UINT8 requestSequence;
ASN1UINT reqFlags;
ASN1UINT t38sides;
+ int T38FarMaxDatagram;
+ int T38Version;
H235TimeStamp alertingTime, connectTime, endTime; /* time data for gatekeeper */
FastStartResponse *pFastStartRes; /* fast start response */
struct OOH323Regex* rtpMask;
diff --git a/addons/ooh323c/src/ooCapability.c b/addons/ooh323c/src/ooCapability.c
index 391864018..18a25f375 100644
--- a/addons/ooh323c/src/ooCapability.c
+++ b/addons/ooh323c/src/ooCapability.c
@@ -2710,6 +2710,12 @@ int ooAddRemoteDataApplicationCapability(OOH323CallData *call,
switch(dataCap->application.t)
{
case T_H245DataApplicationCapability_application_t38fax:
+ if (dataCap->application.u.t38fax->t38FaxProfile.m.t38FaxUdpOptionsPresent) {
+ call->T38FarMaxDatagram = dataCap->application.u.t38fax->t38FaxProfile.t38FaxUdpOptions.t38FaxMaxDatagram;
+ }
+ if (dataCap->application.u.t38fax->t38FaxProfile.m.versionPresent) {
+ call->T38Version = dataCap->application.u.t38fax->t38FaxProfile.version;
+ }
return ooCapabilityAddT38Capability(call, OO_T38,
dir, NULL, NULL, NULL, NULL,TRUE);
default: