summaryrefslogtreecommitdiff
path: root/addons/ooh323c/src/ooh323.c
diff options
context:
space:
mode:
Diffstat (limited to 'addons/ooh323c/src/ooh323.c')
-rw-r--r--addons/ooh323c/src/ooh323.c476
1 files changed, 238 insertions, 238 deletions
diff --git a/addons/ooh323c/src/ooh323.c b/addons/ooh323c/src/ooh323.c
index b04a954ed..be02f8f88 100644
--- a/addons/ooh323c/src/ooh323.c
+++ b/addons/ooh323c/src/ooh323.c
@@ -1,15 +1,15 @@
/*
* Copyright (C) 2004-2005 by Objective Systems, Inc.
*
- * This software is furnished under an open source license and may be
- * used and copied only in accordance with the terms of this license.
- * The text of the license may generally be found in the root
- * directory of this installation in the COPYING file. It
+ * This software is furnished under an open source license and may be
+ * used and copied only in accordance with the terms of this license.
+ * The text of the license may generally be found in the root
+ * directory of this installation in the COPYING file. It
* can also be viewed online at the following URL:
*
* http://www.obj-sys.com/open/license.html
*
- * Any redistributions of this file including modified versions must
+ * Any redistributions of this file including modified versions must
* maintain this copyright notice.
*
*****************************************************************************/
@@ -50,7 +50,7 @@ int ooHandleDisplayIE(OOH323CallData *call, Q931Message *q931Msg) {
if(pDisplayIE) {
if (call->remoteDisplayName)
memFreePtr(call->pctxt, call->remoteDisplayName);
- call->remoteDisplayName = (char *) memAllocZ(call->pctxt,
+ call->remoteDisplayName = (char *) memAllocZ(call->pctxt,
pDisplayIE->length*sizeof(ASN1OCTET)+1);
strncpy(call->remoteDisplayName, (char *)pDisplayIE->data, pDisplayIE->length*sizeof(ASN1OCTET));
}
@@ -62,7 +62,7 @@ int ooHandleH2250ID (OOH323CallData *call, H225ProtocolIdentifier* protocolIdent
if (!call->h225version && (protocolIdentifier->numids >= 6) &&
(protocolIdentifier->subid[3] == 2250)) {
call->h225version = protocolIdentifier->subid[5];
- OOTRACEDBGC4("Extract H.225 remote version, it's %d, (%s, %s)\n", call->h225version,
+ OOTRACEDBGC4("Extract H.225 remote version, it's %d, (%s, %s)\n", call->h225version,
call->callType, call->callToken);
}
@@ -74,7 +74,7 @@ int ooHandleFastStart(OOH323CallData *call, H225Facility_UUIE *facility)
H245OpenLogicalChannel* olc;
ASN1OCTET msgbuf[MAXMSGLEN];
ooLogicalChannel * pChannel = NULL;
- H245H2250LogicalChannelParameters * h2250lcp = NULL;
+ H245H2250LogicalChannelParameters * h2250lcp = NULL;
int i=0, ret=0;
/* Handle fast-start */
@@ -92,7 +92,7 @@ int ooHandleFastStart(OOH323CallData *call, H225Facility_UUIE *facility)
{
olc = NULL;
- olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt,
+ olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt,
sizeof(H245OpenLogicalChannel));
if(!olc)
{
@@ -109,9 +109,9 @@ int ooHandleFastStart(OOH323CallData *call, H225Facility_UUIE *facility)
return OO_FAILED;
}
memset(olc, 0, sizeof(H245OpenLogicalChannel));
- memcpy(msgbuf, facility->fastStart.elem[i].data,
+ memcpy(msgbuf, facility->fastStart.elem[i].data,
facility->fastStart.elem[i].numocts);
- setPERBuffer(call->pctxt, msgbuf,
+ setPERBuffer(call->pctxt, msgbuf,
facility->fastStart.elem[i].numocts, 1);
ret = asn1PD_H245OpenLogicalChannel(call->pctxt, olc);
if(ret != ASN_OK)
@@ -136,7 +136,7 @@ int ooHandleFastStart(OOH323CallData *call, H225Facility_UUIE *facility)
{
OOTRACEERR4("ERROR: Logical Channel %d not found, fast start. "
"(%s, %s)\n",
- olc->forwardLogicalChannelNumber, call->callType,
+ olc->forwardLogicalChannelNumber, call->callType,
call->callToken);
finishPrint();
removeEventHandler(call->pctxt);
@@ -145,9 +145,9 @@ int ooHandleFastStart(OOH323CallData *call, H225Facility_UUIE *facility)
if(pChannel->channelNo != olc->forwardLogicalChannelNumber)
{
OOTRACEINFO5("Remote endpoint changed forwardLogicalChannel"
- "Number from %d to %d (%s, %s)\n",
- pChannel->channelNo,
- olc->forwardLogicalChannelNumber, call->callType,
+ "Number from %d to %d (%s, %s)\n",
+ pChannel->channelNo,
+ olc->forwardLogicalChannelNumber, call->callType,
call->callToken);
pChannel->channelNo = olc->forwardLogicalChannelNumber;
}
@@ -158,12 +158,12 @@ int ooHandleFastStart(OOH323CallData *call, H225Facility_UUIE *facility)
T_H245OpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_h2250LogicalChannelParameters)
{
OOTRACEERR4("ERROR:Unknown multiplex parameter type for "
- "channel %d (%s, %s)\n",
+ "channel %d (%s, %s)\n",
olc->forwardLogicalChannelNumber, call->callType,
call->callToken);
continue;
}
-
+
/* Extract the remote media endpoint address */
h2250lcp = olc->forwardLogicalChannelParameters.multiplexParameters.u.h2250LogicalChannelParameters;
if(!h2250lcp)
@@ -182,10 +182,10 @@ int ooHandleFastStart(OOH323CallData *call, H225Facility_UUIE *facility)
"(%s, %s)\n", call->callType, call->callToken);
return OO_FAILED;
}
- ret = ooGetIpPortFromH245TransportAddress(call,
+ ret = ooGetIpPortFromH245TransportAddress(call,
&h2250lcp->mediaChannel, pChannel->remoteIP,
&pChannel->remoteMediaPort);
-
+
if(ret != OO_OK)
{
if(call->callState < OO_CALL_CLEAR)
@@ -199,17 +199,17 @@ int ooHandleFastStart(OOH323CallData *call, H225Facility_UUIE *facility)
removeEventHandler(call->pctxt);
return OO_FAILED;
}
-
+
if(!pChannel->chanCap->startTransmitChannel)
{
OOTRACEERR3("ERROR:No callback registered to start transmit "
- "channel (%s, %s)\n",call->callType,
+ "channel (%s, %s)\n",call->callType,
call->callToken);
return OO_FAILED;
}
pChannel->chanCap->startTransmitChannel(call, pChannel);
}
- /* Mark the current channel as established and close all other
+ /* Mark the current channel as established and close all other
logical channels with same session id and in same direction.
*/
ooOnLogicalChannelEstablished(call, pChannel);
@@ -218,7 +218,7 @@ int ooHandleFastStart(OOH323CallData *call, H225Facility_UUIE *facility)
removeEventHandler(call->pctxt);
OO_SETFLAG(call->flags, OO_M_FASTSTARTANSWERED);
}
-
+
}
if(facility->m.h245AddressPresent)
@@ -227,16 +227,16 @@ int ooHandleFastStart(OOH323CallData *call, H225Facility_UUIE *facility)
{
OO_CLRFLAG (call->flags, OO_M_TUNNELING);
OOTRACEINFO3("Tunneling is disabled for call as H245 address is "
- "provided in facility message (%s, %s)\n",
+ "provided in facility message (%s, %s)\n",
call->callType, call->callToken);
}
- ret = ooH323GetIpPortFromH225TransportAddress(call,
+ ret = ooH323GetIpPortFromH225TransportAddress(call,
&facility->h245Address, call->remoteIP,
&call->remoteH245Port);
if(ret != OO_OK)
{
OOTRACEERR3("Error: Unknown H245 address type in received "
- "Facility message (%s, %s)", call->callType,
+ "Facility message (%s, %s)", call->callType,
call->callToken);
/* Mark call for clearing */
if(call->callState < OO_CALL_CLEAR)
@@ -247,11 +247,11 @@ int ooHandleFastStart(OOH323CallData *call, H225Facility_UUIE *facility)
return OO_FAILED;
}
if(call->remoteH245Port != 0 && !call->pH245Channel) {
- /* Create an H.245 connection.
+ /* Create an H.245 connection.
*/
if(ooCreateH245Connection(call)== OO_FAILED)
{
- OOTRACEERR3("Error: H.245 channel creation failed (%s, %s)\n",
+ OOTRACEERR3("Error: H.245 channel creation failed (%s, %s)\n",
call->callType, call->callToken);
if(call->callState < OO_CALL_CLEAR)
@@ -286,8 +286,8 @@ int ooOnReceivedReleaseComplete(OOH323CallData *call, Q931Message *q931Msg)
{
cause = q931Msg->causeIE->data[1];
/* Get rid of the extension bit.For more info, check ooQ931SetCauseIE */
- cause = cause & 0x7f;
- OOTRACEDBGA4("Cause of Release Complete is %x. (%s, %s)\n", cause,
+ cause = cause & 0x7f;
+ OOTRACEDBGA4("Cause of Release Complete is %x. (%s, %s)\n", cause,
call->callType, call->callToken);
}
@@ -296,18 +296,18 @@ int ooOnReceivedReleaseComplete(OOH323CallData *call, Q931Message *q931Msg)
{
pNode = dListFindByIndex(&call->timerList, i);
pTimer = (OOTimer*)pNode->data;
- if(((ooTimerCallback*)pTimer->cbData)->timerType &
+ if(((ooTimerCallback*)pTimer->cbData)->timerType &
OO_SESSION_TIMER)
{
memFreePtr(call->pctxt, pTimer->cbData);
ooTimerDelete(call->pctxt, &call->timerList, pTimer);
- OOTRACEDBGC3("Deleted Session Timer. (%s, %s)\n",
+ OOTRACEDBGC3("Deleted Session Timer. (%s, %s)\n",
call->callType, call->callToken);
break;
}
}
-
+
if(!q931Msg->userInfo)
{
OOTRACEERR3("ERROR:No User-User IE in received ReleaseComplete message "
@@ -326,14 +326,14 @@ int ooOnReceivedReleaseComplete(OOH323CallData *call, Q931Message *q931Msg)
if(releaseComplete->m.reasonPresent)
{
- OOTRACEINFO4("Release complete reason code %d. (%s, %s)\n",
+ OOTRACEINFO4("Release complete reason code %d. (%s, %s)\n",
releaseComplete->reason.t, call->callType, call->callToken);
reasonCode = releaseComplete->reason.t;
}
}
if(call->callEndReason == OO_REASON_UNKNOWN)
- call->callEndReason = ooGetCallClearReasonFromCauseAndReasonCode(cause,
+ call->callEndReason = ooGetCallClearReasonFromCauseAndReasonCode(cause,
reasonCode);
call->q931cause = cause;
#if 0
@@ -349,7 +349,7 @@ int ooOnReceivedReleaseComplete(OOH323CallData *call, Q931Message *q931Msg)
" (%s, %s)\n", call->callType, call->callToken);
}
#endif
- if(call->h245SessionState != OO_H245SESSION_IDLE &&
+ if(call->h245SessionState != OO_H245SESSION_IDLE &&
call->h245SessionState != OO_H245SESSION_CLOSED)
{
ooCloseH245Connection(call);
@@ -384,7 +384,7 @@ int ooOnReceivedSetup(OOH323CallData *call, Q931Message *q931Msg)
char remoteIP[2+8*4+7] = "";
call->callReference = q931Msg->callReference;
-
+
if(!q931Msg->userInfo)
{
OOTRACEERR3("ERROR:No User-User IE in received SETUP message (%s, %s)\n",
@@ -399,10 +399,10 @@ int ooOnReceivedSetup(OOH323CallData *call, Q931Message *q931Msg)
return OO_FAILED;
}
ooHandleH2250ID(call, &setup->protocolIdentifier);
- memcpy(call->callIdentifier.guid.data, setup->callIdentifier.guid.data,
+ memcpy(call->callIdentifier.guid.data, setup->callIdentifier.guid.data,
setup->callIdentifier.guid.numocts);
call->callIdentifier.guid.numocts = setup->callIdentifier.guid.numocts;
-
+
memcpy(call->confIdentifier.data, setup->conferenceID.data,
setup->conferenceID.numocts);
call->confIdentifier.numocts = setup->conferenceID.numocts;
@@ -411,7 +411,7 @@ int ooOnReceivedSetup(OOH323CallData *call, Q931Message *q931Msg)
pDisplayIE = ooQ931GetIE(q931Msg, Q931DisplayIE);
if(pDisplayIE)
{
- call->remoteDisplayName = (char *) memAllocZ(call->pctxt,
+ call->remoteDisplayName = (char *) memAllocZ(call->pctxt,
pDisplayIE->length*sizeof(ASN1OCTET)+1);
strncpy(call->remoteDisplayName, (char *)pDisplayIE->data, pDisplayIE->length*sizeof(ASN1OCTET));
}
@@ -420,7 +420,7 @@ int ooOnReceivedSetup(OOH323CallData *call, Q931Message *q931Msg)
{
if(setup->sourceAddress.count>0)
{
- ooH323RetrieveAliases(call, &setup->sourceAddress,
+ ooH323RetrieveAliases(call, &setup->sourceAddress,
&call->remoteAliases);
pAlias = call->remoteAliases;
while(pAlias)
@@ -444,13 +444,13 @@ int ooOnReceivedSetup(OOH323CallData *call, Q931Message *q931Msg)
}
/* Extract, aliases used for us, if present. Also,
Populate calledPartyNumber from dialedDigits, if not yet populated using
- calledPartyNumber Q931 IE.
- */
+ calledPartyNumber Q931 IE.
+ */
if(setup->m.destinationAddressPresent)
{
if(setup->destinationAddress.count>0)
{
- ooH323RetrieveAliases(call, &setup->destinationAddress,
+ ooH323RetrieveAliases(call, &setup->destinationAddress,
&call->ourAliases);
pAlias = call->ourAliases;
while(pAlias)
@@ -468,7 +468,7 @@ int ooOnReceivedSetup(OOH323CallData *call, Q931Message *q931Msg)
}
break;
}
- pAlias = pAlias->next;
+ pAlias = pAlias->next;
}
}
}
@@ -511,7 +511,7 @@ int ooOnReceivedSetup(OOH323CallData *call, Q931Message *q931Msg)
}
OO_CLRFLAG (call->flags, OO_M_TUNNELING);
}
-
+
/* Extract Remote IP address */
if(!setup->m.sourceCallSignalAddressPresent)
{
@@ -525,7 +525,7 @@ int ooOnReceivedSetup(OOH323CallData *call, Q931Message *q931Msg)
call->remotePort = setup->sourceCallSignalAddress.u.ip6Address->port;
} else if(setup->sourceCallSignalAddress.t == T_H225TransportAddress_ipAddress) {
ip = &setup->sourceCallSignalAddress.u.ipAddress->ip;
- sprintf(remoteIP, "%d.%d.%d.%d", ip->data[0], ip->data[1],
+ sprintf(remoteIP, "%d.%d.%d.%d", ip->data[0], ip->data[1],
ip->data[2], ip->data[3]);
call->remotePort = setup->sourceCallSignalAddress.u.ipAddress->port;
} else {
@@ -543,9 +543,9 @@ int ooOnReceivedSetup(OOH323CallData *call, Q931Message *q931Msg)
return OO_FAILED;
}
}
-
+
/* check for fast start */
-
+
if(setup->m.fastStartPresent)
{
if(!OO_TESTFLAG(gH323ep.flags, OO_M_FASTSTART))
@@ -579,11 +579,11 @@ int ooOnReceivedSetup(OOH323CallData *call, Q931Message *q931Msg)
{
olc = NULL;
/* memset(msgbuf, 0, sizeof(msgbuf));*/
- olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt,
+ olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt,
sizeof(H245OpenLogicalChannel));
if(!olc)
{
- OOTRACEERR3("ERROR:Memory - ooOnReceivedSetup - olc (%s, %s)\n",
+ OOTRACEERR3("ERROR:Memory - ooOnReceivedSetup - olc (%s, %s)\n",
call->callType, call->callToken);
/*Mark call for clearing */
if(call->callState < OO_CALL_CLEAR)
@@ -596,10 +596,10 @@ int ooOnReceivedSetup(OOH323CallData *call, Q931Message *q931Msg)
return OO_FAILED;
}
memset(olc, 0, sizeof(H245OpenLogicalChannel));
- memcpy(msgbuf, setup->fastStart.elem[i].data,
+ memcpy(msgbuf, setup->fastStart.elem[i].data,
setup->fastStart.elem[i].numocts);
- setPERBuffer(call->pctxt, msgbuf,
+ setPERBuffer(call->pctxt, msgbuf,
setup->fastStart.elem[i].numocts, 1);
ret = asn1PD_H245OpenLogicalChannel(call->pctxt, olc);
if(ret != ASN_OK)
@@ -635,7 +635,7 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg)
H245OpenLogicalChannel* olc;
ASN1OCTET msgbuf[MAXMSGLEN];
ooLogicalChannel * pChannel = NULL;
- H245H2250LogicalChannelParameters * h2250lcp = NULL;
+ H245H2250LogicalChannelParameters * h2250lcp = NULL;
int i=0, ret=0;
if(!q931Msg->userInfo)
@@ -644,12 +644,12 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg)
" (%s, %s)\n", call->callType, call->callToken);
return OO_FAILED;
}
- callProceeding =
+ callProceeding =
q931Msg->userInfo->h323_uu_pdu.h323_message_body.u.callProceeding;
if(callProceeding == NULL)
{
OOTRACEERR3("Error: Received CallProceeding message does not have "
- "CallProceeding UUIE (%s, %s)\n", call->callType,
+ "CallProceeding UUIE (%s, %s)\n", call->callType,
call->callToken);
/* Mark call for clearing */
if(call->callState < OO_CALL_CLEAR)
@@ -676,7 +676,7 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg)
{
olc = NULL;
- olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt,
+ olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt,
sizeof(H245OpenLogicalChannel));
if(!olc)
{
@@ -693,9 +693,9 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg)
return OO_FAILED;
}
memset(olc, 0, sizeof(H245OpenLogicalChannel));
- memcpy(msgbuf, callProceeding->fastStart.elem[i].data,
+ memcpy(msgbuf, callProceeding->fastStart.elem[i].data,
callProceeding->fastStart.elem[i].numocts);
- setPERBuffer(call->pctxt, msgbuf,
+ setPERBuffer(call->pctxt, msgbuf,
callProceeding->fastStart.elem[i].numocts, 1);
ret = asn1PD_H245OpenLogicalChannel(call->pctxt, olc);
if(ret != ASN_OK)
@@ -720,7 +720,7 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg)
{
OOTRACEERR4("ERROR: Logical Channel %d not found, fast start. "
"(%s, %s)\n",
- olc->forwardLogicalChannelNumber, call->callType,
+ olc->forwardLogicalChannelNumber, call->callType,
call->callToken);
finishPrint();
removeEventHandler(call->pctxt);
@@ -729,9 +729,9 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg)
if(pChannel->channelNo != olc->forwardLogicalChannelNumber)
{
OOTRACEINFO5("Remote endpoint changed forwardLogicalChannel"
- "Number from %d to %d (%s, %s)\n",
- pChannel->channelNo,
- olc->forwardLogicalChannelNumber, call->callType,
+ "Number from %d to %d (%s, %s)\n",
+ pChannel->channelNo,
+ olc->forwardLogicalChannelNumber, call->callType,
call->callToken);
pChannel->channelNo = olc->forwardLogicalChannelNumber;
}
@@ -741,12 +741,12 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg)
T_H245OpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_h2250LogicalChannelParameters)
{
OOTRACEERR4("ERROR:Unknown multiplex parameter type for "
- "channel %d (%s, %s)\n",
+ "channel %d (%s, %s)\n",
olc->forwardLogicalChannelNumber, call->callType,
call->callToken);
continue;
}
-
+
/* Extract the remote media endpoint address */
h2250lcp = olc->forwardLogicalChannelParameters.multiplexParameters.u.h2250LogicalChannelParameters;
if(!h2250lcp)
@@ -767,10 +767,10 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg)
removeEventHandler(call->pctxt);
return OO_FAILED;
}
- ret = ooGetIpPortFromH245TransportAddress(call,
+ ret = ooGetIpPortFromH245TransportAddress(call,
&h2250lcp->mediaChannel, pChannel->remoteIP,
&pChannel->remoteMediaPort);
-
+
if(ret != OO_OK)
{
if(call->callState < OO_CALL_CLEAR)
@@ -784,11 +784,11 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg)
removeEventHandler(call->pctxt);
return OO_FAILED;
}
-
+
if(!pChannel->chanCap->startTransmitChannel)
{
OOTRACEERR3("ERROR:No callback registered to start transmit "
- "channel (%s, %s)\n",call->callType,
+ "channel (%s, %s)\n",call->callType,
call->callToken);
finishPrint();
removeEventHandler(call->pctxt);
@@ -796,7 +796,7 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg)
}
pChannel->chanCap->startTransmitChannel(call, pChannel);
}
- /* Mark the current channel as established and close all other
+ /* Mark the current channel as established and close all other
logical channels with same session id and in same direction.
*/
ooOnLogicalChannelEstablished(call, pChannel);
@@ -805,11 +805,11 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg)
removeEventHandler(call->pctxt);
OO_SETFLAG(call->flags, OO_M_FASTSTARTANSWERED);
}
-
+
}
/* Retrieve tunneling info/H.245 control channel address from the connect msg */
- if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&
+ if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&
!q931Msg->userInfo->h323_uu_pdu.h245Tunneling) {
if (OO_TESTFLAG (call->flags, OO_M_TUNNELING)) {
OO_CLRFLAG (call->flags, OO_M_TUNNELING);
@@ -822,7 +822,7 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg)
OO_TESTFLAG (call->flags, OO_M_TUNNELING) &&
callProceeding->m.h245AddressPresent) {
OOTRACEINFO3("Tunneling and h245address provided."
- "Using Tunneling for H.245 messages (%s, %s)\n",
+ "Using Tunneling for H.245 messages (%s, %s)\n",
call->callType, call->callToken);
}
else if(callProceeding->m.h245AddressPresent)
@@ -831,16 +831,16 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg)
{
OO_CLRFLAG (call->flags, OO_M_TUNNELING);
OOTRACEINFO3("Tunneling is disabled for call as H245 address is "
- "provided in callProceeding message (%s, %s)\n",
+ "provided in callProceeding message (%s, %s)\n",
call->callType, call->callToken);
}
- ret = ooH323GetIpPortFromH225TransportAddress(call,
+ ret = ooH323GetIpPortFromH225TransportAddress(call,
&callProceeding->h245Address, call->remoteIP,
&call->remoteH245Port);
if(ret != OO_OK)
{
OOTRACEERR3("Error: Unknown H245 address type in received "
- "CallProceeding message (%s, %s)", call->callType,
+ "CallProceeding message (%s, %s)", call->callType,
call->callToken);
/* Mark call for clearing */
if(call->callState < OO_CALL_CLEAR)
@@ -851,11 +851,11 @@ int ooOnReceivedCallProceeding(OOH323CallData *call, Q931Message *q931Msg)
return OO_FAILED;
}
if(call->remoteH245Port != 0 && !call->pH245Channel) {
- /* Create an H.245 connection.
+ /* Create an H.245 connection.
*/
if(ooCreateH245Connection(call)== OO_FAILED)
{
- OOTRACEERR3("Error: H.245 channel creation failed (%s, %s)\n",
+ OOTRACEERR3("Error: H.245 channel creation failed (%s, %s)\n",
call->callType, call->callToken);
if(call->callState < OO_CALL_CLEAR)
@@ -878,7 +878,7 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg)
H245OpenLogicalChannel* olc;
ASN1OCTET msgbuf[MAXMSGLEN];
ooLogicalChannel * pChannel = NULL;
- H245H2250LogicalChannelParameters * h2250lcp = NULL;
+ H245H2250LogicalChannelParameters * h2250lcp = NULL;
int i=0, ret=0;
ooHandleDisplayIE(call, q931Msg);
@@ -893,7 +893,7 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg)
if(alerting == NULL)
{
OOTRACEERR3("Error: Received Alerting message does not have "
- "alerting UUIE (%s, %s)\n", call->callType,
+ "alerting UUIE (%s, %s)\n", call->callType,
call->callToken);
/* Mark call for clearing */
if(call->callState < OO_CALL_CLEAR)
@@ -920,7 +920,7 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg)
{
olc = NULL;
- olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt,
+ olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt,
sizeof(H245OpenLogicalChannel));
if(!olc)
{
@@ -937,9 +937,9 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg)
return OO_FAILED;
}
memset(olc, 0, sizeof(H245OpenLogicalChannel));
- memcpy(msgbuf, alerting->fastStart.elem[i].data,
+ memcpy(msgbuf, alerting->fastStart.elem[i].data,
alerting->fastStart.elem[i].numocts);
- setPERBuffer(call->pctxt, msgbuf,
+ setPERBuffer(call->pctxt, msgbuf,
alerting->fastStart.elem[i].numocts, 1);
ret = asn1PD_H245OpenLogicalChannel(call->pctxt, olc);
if(ret != ASN_OK)
@@ -964,7 +964,7 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg)
{
OOTRACEERR4("ERROR: Logical Channel %d not found, fast start. "
"(%s, %s)\n",
- olc->forwardLogicalChannelNumber, call->callType,
+ olc->forwardLogicalChannelNumber, call->callType,
call->callToken);
finishPrint();
removeEventHandler(call->pctxt);
@@ -973,9 +973,9 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg)
if(pChannel->channelNo != olc->forwardLogicalChannelNumber)
{
OOTRACEINFO5("Remote endpoint changed forwardLogicalChannel"
- "Number from %d to %d (%s, %s)\n",
- pChannel->channelNo,
- olc->forwardLogicalChannelNumber, call->callType,
+ "Number from %d to %d (%s, %s)\n",
+ pChannel->channelNo,
+ olc->forwardLogicalChannelNumber, call->callType,
call->callToken);
pChannel->channelNo = olc->forwardLogicalChannelNumber;
}
@@ -985,12 +985,12 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg)
T_H245OpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_h2250LogicalChannelParameters)
{
OOTRACEERR4("ERROR:Unknown multiplex parameter type for "
- "channel %d (%s, %s)\n",
+ "channel %d (%s, %s)\n",
olc->forwardLogicalChannelNumber, call->callType,
call->callToken);
continue;
}
-
+
/* Extract the remote media endpoint address */
h2250lcp = olc->forwardLogicalChannelParameters.multiplexParameters.u.h2250LogicalChannelParameters;
if(!h2250lcp)
@@ -1011,10 +1011,10 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg)
removeEventHandler(call->pctxt);
return OO_FAILED;
}
- ret = ooGetIpPortFromH245TransportAddress(call,
+ ret = ooGetIpPortFromH245TransportAddress(call,
&h2250lcp->mediaChannel, pChannel->remoteIP,
&pChannel->remoteMediaPort);
-
+
if(ret != OO_OK)
{
if(call->callState < OO_CALL_CLEAR)
@@ -1026,18 +1026,18 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg)
"(%s, %s)\n", call->callType, call->callToken);
return OO_FAILED;
}
-
+
if(!pChannel->chanCap->startTransmitChannel)
{
OOTRACEERR3("ERROR:No callback registered to start transmit "
- "channel (%s, %s)\n",call->callType,
+ "channel (%s, %s)\n",call->callType,
call->callToken);
finishPrint();
removeEventHandler(call->pctxt);
return OO_FAILED;
}
pChannel->chanCap->startTransmitChannel(call, pChannel);
- /* Mark the current channel as established and close all other
+ /* Mark the current channel as established and close all other
logical channels with same session id and in same direction.
*/
ooOnLogicalChannelEstablished(call, pChannel);
@@ -1046,12 +1046,12 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg)
finishPrint();
removeEventHandler(call->pctxt);
OO_SETFLAG(call->flags, OO_M_FASTSTARTANSWERED);
- }
+ }
}
/* Retrieve tunneling info/H.245 control channel address from the connect msg */
- if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&
+ if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&
!q931Msg->userInfo->h323_uu_pdu.h245Tunneling) {
if (OO_TESTFLAG (call->flags, OO_M_TUNNELING)) {
OO_CLRFLAG (call->flags, OO_M_TUNNELING);
@@ -1062,9 +1062,9 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg)
if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&
q931Msg->userInfo->h323_uu_pdu.h245Tunneling &&
OO_TESTFLAG (call->flags, OO_M_TUNNELING)) {
- if (alerting->m.h245AddressPresent)
+ if (alerting->m.h245AddressPresent)
OOTRACEINFO3("Tunneling and h245address provided."
- "Giving preference to Tunneling (%s, %s)\n",
+ "Giving preference to Tunneling (%s, %s)\n",
call->callType, call->callToken);
if (call->h225version >= 4) {
ret =ooSendTCSandMSD(call);
@@ -1077,16 +1077,16 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg)
{
OO_CLRFLAG (call->flags, OO_M_TUNNELING);
OOTRACEINFO3("Tunneling is disabled for call as H245 address is "
- "provided in Alerting message (%s, %s)\n",
+ "provided in Alerting message (%s, %s)\n",
call->callType, call->callToken);
}
- ret = ooH323GetIpPortFromH225TransportAddress(call,
+ ret = ooH323GetIpPortFromH225TransportAddress(call,
&alerting->h245Address, call->remoteIP,
&call->remoteH245Port);
if(ret != OO_OK)
{
OOTRACEERR3("Error: Unknown H245 address type in received "
- "Alerting message (%s, %s)", call->callType,
+ "Alerting message (%s, %s)", call->callType,
call->callToken);
/* Mark call for clearing */
if(call->callState < OO_CALL_CLEAR)
@@ -1097,11 +1097,11 @@ int ooOnReceivedAlerting(OOH323CallData *call, Q931Message *q931Msg)
return OO_FAILED;
}
if(call->remoteH245Port != 0 && !call->pH245Channel) {
- /* Create an H.245 connection.
+ /* Create an H.245 connection.
*/
if(ooCreateH245Connection(call)== OO_FAILED)
{
- OOTRACEERR3("Error: H.245 channel creation failed (%s, %s)\n",
+ OOTRACEERR3("Error: H.245 channel creation failed (%s, %s)\n",
call->callType, call->callToken);
if(call->callState < OO_CALL_CLEAR)
@@ -1127,7 +1127,7 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg)
H245OpenLogicalChannel* olc;
ASN1OCTET msgbuf[MAXMSGLEN];
ooLogicalChannel * pChannel = NULL;
- H245H2250LogicalChannelParameters * h2250lcp = NULL;
+ H245H2250LogicalChannelParameters * h2250lcp = NULL;
int i=0, ret=0;
ooHandleDisplayIE(call, q931Msg);
@@ -1142,7 +1142,7 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg)
if(progress == NULL)
{
OOTRACEERR3("Error: Received Progress message does not have "
- "progress UUIE (%s, %s)\n", call->callType,
+ "progress UUIE (%s, %s)\n", call->callType,
call->callToken);
/* Mark call for clearing */
if(call->callState < OO_CALL_CLEAR)
@@ -1169,7 +1169,7 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg)
{
olc = NULL;
- olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt,
+ olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt,
sizeof(H245OpenLogicalChannel));
if(!olc)
{
@@ -1186,9 +1186,9 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg)
return OO_FAILED;
}
memset(olc, 0, sizeof(H245OpenLogicalChannel));
- memcpy(msgbuf, progress->fastStart.elem[i].data,
+ memcpy(msgbuf, progress->fastStart.elem[i].data,
progress->fastStart.elem[i].numocts);
- setPERBuffer(call->pctxt, msgbuf,
+ setPERBuffer(call->pctxt, msgbuf,
progress->fastStart.elem[i].numocts, 1);
ret = asn1PD_H245OpenLogicalChannel(call->pctxt, olc);
if(ret != ASN_OK)
@@ -1213,7 +1213,7 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg)
{
OOTRACEERR4("ERROR: Logical Channel %d not found, fast start. "
"(%s, %s)\n",
- olc->forwardLogicalChannelNumber, call->callType,
+ olc->forwardLogicalChannelNumber, call->callType,
call->callToken);
finishPrint();
removeEventHandler(call->pctxt);
@@ -1222,9 +1222,9 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg)
if(pChannel->channelNo != olc->forwardLogicalChannelNumber)
{
OOTRACEINFO5("Remote endpoint changed forwardLogicalChannel"
- "Number from %d to %d (%s, %s)\n",
- pChannel->channelNo,
- olc->forwardLogicalChannelNumber, call->callType,
+ "Number from %d to %d (%s, %s)\n",
+ pChannel->channelNo,
+ olc->forwardLogicalChannelNumber, call->callType,
call->callToken);
pChannel->channelNo = olc->forwardLogicalChannelNumber;
}
@@ -1234,12 +1234,12 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg)
T_H245OpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_h2250LogicalChannelParameters)
{
OOTRACEERR4("ERROR:Unknown multiplex parameter type for "
- "channel %d (%s, %s)\n",
+ "channel %d (%s, %s)\n",
olc->forwardLogicalChannelNumber, call->callType,
call->callToken);
continue;
}
-
+
/* Extract the remote media endpoint address */
h2250lcp = olc->forwardLogicalChannelParameters.multiplexParameters.u.h2250LogicalChannelParameters;
if(!h2250lcp)
@@ -1260,10 +1260,10 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg)
removeEventHandler(call->pctxt);
return OO_FAILED;
}
- ret = ooGetIpPortFromH245TransportAddress(call,
+ ret = ooGetIpPortFromH245TransportAddress(call,
&h2250lcp->mediaChannel, pChannel->remoteIP,
&pChannel->remoteMediaPort);
-
+
if(ret != OO_OK)
{
if(call->callState < OO_CALL_CLEAR)
@@ -1277,11 +1277,11 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg)
removeEventHandler(call->pctxt);
return OO_FAILED;
}
-
+
if(!pChannel->chanCap->startTransmitChannel)
{
OOTRACEERR3("ERROR:No callback registered to start transmit "
- "channel (%s, %s)\n",call->callType,
+ "channel (%s, %s)\n",call->callType,
call->callToken);
finishPrint();
removeEventHandler(call->pctxt);
@@ -1289,7 +1289,7 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg)
}
pChannel->chanCap->startTransmitChannel(call, pChannel);
}
- /* Mark the current channel as established and close all other
+ /* Mark the current channel as established and close all other
logical channels with same session id and in same direction.
*/
ooOnLogicalChannelEstablished(call, pChannel);
@@ -1298,12 +1298,12 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg)
removeEventHandler(call->pctxt);
OO_SETFLAG(call->flags, OO_M_FASTSTARTANSWERED);
}
-
+
}
/* Retrieve the H.245 control channel address from the connect msg */
/* Retrieve tunneling info/H.245 control channel address from the connect msg */
- if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&
+ if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&
!q931Msg->userInfo->h323_uu_pdu.h245Tunneling) {
if (OO_TESTFLAG (call->flags, OO_M_TUNNELING)) {
OO_CLRFLAG (call->flags, OO_M_TUNNELING);
@@ -1314,9 +1314,9 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg)
if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&
q931Msg->userInfo->h323_uu_pdu.h245Tunneling &&
OO_TESTFLAG (call->flags, OO_M_TUNNELING)) {
- if (progress->m.h245AddressPresent)
+ if (progress->m.h245AddressPresent)
OOTRACEINFO3("Tunneling and h245address provided."
- "Giving preference to Tunneling (%s, %s)\n",
+ "Giving preference to Tunneling (%s, %s)\n",
call->callType, call->callToken);
if (call->h225version >= 4) {
ret =ooSendTCSandMSD(call);
@@ -1328,16 +1328,16 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg)
{
OO_CLRFLAG (call->flags, OO_M_TUNNELING);
OOTRACEINFO3("Tunneling is disabled for call as H245 address is "
- "provided in Progress message (%s, %s)\n",
+ "provided in Progress message (%s, %s)\n",
call->callType, call->callToken);
}
- ret = ooH323GetIpPortFromH225TransportAddress(call,
+ ret = ooH323GetIpPortFromH225TransportAddress(call,
&progress->h245Address, call->remoteIP,
&call->remoteH245Port);
if(ret != OO_OK)
{
OOTRACEERR3("Error: Unknown H245 address type in received "
- "Progress message (%s, %s)", call->callType,
+ "Progress message (%s, %s)", call->callType,
call->callToken);
/* Mark call for clearing */
if(call->callState < OO_CALL_CLEAR)
@@ -1348,11 +1348,11 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg)
return OO_FAILED;
}
if(call->remoteH245Port != 0 && !call->pH245Channel) {
- /* Create an H.245 connection.
+ /* Create an H.245 connection.
*/
if(ooCreateH245Connection(call)== OO_FAILED)
{
- OOTRACEERR3("Error: H.245 channel creation failed (%s, %s)\n",
+ OOTRACEERR3("Error: H.245 channel creation failed (%s, %s)\n",
call->callType, call->callToken);
if(call->callState < OO_CALL_CLEAR)
@@ -1371,7 +1371,7 @@ int ooOnReceivedProgress(OOH323CallData *call, Q931Message *q931Msg)
return OO_OK;
}
-
+
int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg)
{
@@ -1380,7 +1380,7 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg)
H245OpenLogicalChannel* olc;
ASN1OCTET msgbuf[MAXMSGLEN];
ooLogicalChannel * pChannel = NULL;
- H245H2250LogicalChannelParameters * h2250lcp = NULL;
+ H245H2250LogicalChannelParameters * h2250lcp = NULL;
ooHandleDisplayIE(call, q931Msg);
@@ -1412,7 +1412,7 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg)
}
ooHandleH2250ID(call, &connect->protocolIdentifier);
/*Handle fast-start */
- if(OO_TESTFLAG (call->flags, OO_M_FASTSTART) &&
+ if(OO_TESTFLAG (call->flags, OO_M_FASTSTART) &&
!OO_TESTFLAG (call->flags, OO_M_FASTSTARTANSWERED))
{
if(!connect->m.fastStartPresent)
@@ -1423,7 +1423,7 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg)
}
}
- if (connect->m.fastStartPresent &&
+ if (connect->m.fastStartPresent &&
!OO_TESTFLAG(call->flags, OO_M_FASTSTARTANSWERED))
{
/* For printing the decoded message to log, initialize handler. */
@@ -1436,7 +1436,7 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg)
{
olc = NULL;
/* memset(msgbuf, 0, sizeof(msgbuf));*/
- olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt,
+ olc = (H245OpenLogicalChannel*)memAlloc(call->pctxt,
sizeof(H245OpenLogicalChannel));
if(!olc)
{
@@ -1453,9 +1453,9 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg)
return OO_FAILED;
}
memset(olc, 0, sizeof(H245OpenLogicalChannel));
- memcpy(msgbuf, connect->fastStart.elem[i].data,
+ memcpy(msgbuf, connect->fastStart.elem[i].data,
connect->fastStart.elem[i].numocts);
- setPERBuffer(call->pctxt, msgbuf,
+ setPERBuffer(call->pctxt, msgbuf,
connect->fastStart.elem[i].numocts, 1);
ret = asn1PD_H245OpenLogicalChannel(call->pctxt, olc);
if(ret != ASN_OK)
@@ -1480,7 +1480,7 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg)
{
OOTRACEERR4("ERROR: Logical Channel %d not found, fasts start "
"answered. (%s, %s)\n",
- olc->forwardLogicalChannelNumber, call->callType,
+ olc->forwardLogicalChannelNumber, call->callType,
call->callToken);
finishPrint();
removeEventHandler(call->pctxt);
@@ -1490,21 +1490,21 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg)
{
OOTRACEINFO5("Remote endpoint changed forwardLogicalChannelNumber"
"from %d to %d (%s, %s)\n", pChannel->channelNo,
- olc->forwardLogicalChannelNumber, call->callType,
+ olc->forwardLogicalChannelNumber, call->callType,
call->callToken);
pChannel->channelNo = olc->forwardLogicalChannelNumber;
}
if(!strcmp(pChannel->dir, "transmit"))
{
- if(olc->forwardLogicalChannelParameters.multiplexParameters.t !=
+ if(olc->forwardLogicalChannelParameters.multiplexParameters.t !=
T_H245OpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_h2250LogicalChannelParameters)
{
OOTRACEERR4("ERROR:Unknown multiplex parameter type for channel"
- " %d (%s, %s)\n", olc->forwardLogicalChannelNumber,
+ " %d (%s, %s)\n", olc->forwardLogicalChannelNumber,
call->callType, call->callToken);
continue;
}
-
+
/* Extract the remote media endpoint address */
h2250lcp = olc->forwardLogicalChannelParameters.multiplexParameters.u.h2250LogicalChannelParameters;
if(!h2250lcp)
@@ -1526,7 +1526,7 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg)
return OO_FAILED;
}
- ret = ooGetIpPortFromH245TransportAddress(call,
+ ret = ooGetIpPortFromH245TransportAddress(call,
&h2250lcp->mediaChannel, pChannel->remoteIP,
&pChannel->remoteMediaPort);
if(ret != OO_OK)
@@ -1552,7 +1552,7 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg)
}
pChannel->chanCap->startTransmitChannel(call, pChannel);
}
- /* Mark the current channel as established and close all other
+ /* Mark the current channel as established and close all other
logical channels with same session id and in same direction.
*/
ooOnLogicalChannelEstablished(call, pChannel);
@@ -1563,7 +1563,7 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg)
}
/* Retrieve tunneling info/H.245 control channel address from the connect msg */
- if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&
+ if(q931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent &&
!q931Msg->userInfo->h323_uu_pdu.h245Tunneling) {
if (OO_TESTFLAG (call->flags, OO_M_TUNNELING)) {
OO_CLRFLAG (call->flags, OO_M_TUNNELING);
@@ -1576,7 +1576,7 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg)
OO_TESTFLAG (call->flags, OO_M_TUNNELING) &&
connect->m.h245AddressPresent) {
OOTRACEINFO3("Tunneling and h245address provided."
- "Giving preference to Tunneling (%s, %s)\n",
+ "Giving preference to Tunneling (%s, %s)\n",
call->callType, call->callToken);
}
else if(connect->m.h245AddressPresent)
@@ -1585,10 +1585,10 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg)
{
OO_CLRFLAG (call->flags, OO_M_TUNNELING);
OOTRACEINFO3("Tunneling is disabled for call as H245 address is "
- "provided in connect message (%s, %s)\n",
+ "provided in connect message (%s, %s)\n",
call->callType, call->callToken);
}
- ret = ooH323GetIpPortFromH225TransportAddress(call,
+ ret = ooH323GetIpPortFromH225TransportAddress(call,
&connect->h245Address, call->remoteIP, &call->remoteH245Port);
if(ret != OO_OK)
{
@@ -1606,11 +1606,11 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg)
if(call->remoteH245Port != 0 && !call->pH245Channel)
{
- /* Create an H.245 connection.
+ /* Create an H.245 connection.
*/
if(ooCreateH245Connection(call)== OO_FAILED)
{
- OOTRACEERR3("Error: H.245 channel creation failed (%s, %s)\n",
+ OOTRACEERR3("Error: H.245 channel creation failed (%s, %s)\n",
call->callType, call->callToken);
if(call->callState < OO_CALL_CLEAR)
@@ -1645,7 +1645,7 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg)
}
/*
- Send TCS as call established and no capability exchange has yet
+ Send TCS as call established and no capability exchange has yet
started. This will be true only when separate h245 connection is not
established and tunneling is being used.
*/
@@ -1665,7 +1665,7 @@ int ooOnReceivedSignalConnect(OOH323CallData* call, Q931Message *q931Msg)
if (call->rtdrCount > 0 && call->rtdrInterval > 0) {
return ooSendRoundTripDelayRequest(call);
}
- return OO_OK;
+ return OO_OK;
}
int ooHandleH2250Message(OOH323CallData *call, Q931Message *q931Msg)
@@ -1697,21 +1697,21 @@ int ooHandleH2250Message(OOH323CallData *call, Q931Message *q931Msg)
if (ret != OO_OK) {
call->callState = OO_CALL_CLEAR;
} else {
-
+
/* H225 message callback */
if(gH323ep.h225Callbacks.onReceivedSetup)
ret = gH323ep.h225Callbacks.onReceivedSetup(call, q931Msg);
}
- /* Free up the mem used by the received message, as it's processing
- is done.
+ /* Free up the mem used by the received message, as it's processing
+ is done.
*/
if (ret == OO_OK) {
ooFreeQ931Message(call->msgctxt, q931Msg);
-
- /* DISABLEGK is used to selectively disable gatekeeper use. For
- incoming calls DISABLEGK can be set in onReceivedSetup callback by
- application. Very useful in pbx applications where gk is used only
+
+ /* DISABLEGK is used to selectively disable gatekeeper use. For
+ incoming calls DISABLEGK can be set in onReceivedSetup callback by
+ application. Very useful in pbx applications where gk is used only
when call is to or from outside pbx domian
*/
if(gH323ep.gkClient && !OO_TESTFLAG(call->flags, OO_M_DISABLEGK))
@@ -1720,7 +1720,7 @@ int ooHandleH2250Message(OOH323CallData *call, Q931Message *q931Msg)
{
call->callState = OO_CALL_WAITING_ADMISSION;
ast_mutex_lock(&call->GkLock);
- ret = ooGkClientSendAdmissionRequest(gH323ep.gkClient, call,
+ ret = ooGkClientSendAdmissionRequest(gH323ep.gkClient, call,
FALSE);
tv = ast_tvnow();
ts.tv_sec = tv.tv_sec + 24;
@@ -1761,7 +1761,7 @@ int ooHandleH2250Message(OOH323CallData *call, Q931Message *q931Msg)
case Q931AlertingMsg:/* ALERTING message received */
- OOTRACEINFO3("H.225 Alerting message received (%s, %s)\n",
+ OOTRACEINFO3("H.225 Alerting message received (%s, %s)\n",
call->callType, call->callToken);
call->alertingTime = (H235TimeStamp) time(NULL);
@@ -1774,7 +1774,7 @@ int ooHandleH2250Message(OOH323CallData *call, Q931Message *q931Msg)
case Q931ProgressMsg:/* PROGRESS message received */
- OOTRACEINFO3("H.225 Progress message received (%s, %s)\n",
+ OOTRACEINFO3("H.225 Progress message received (%s, %s)\n",
call->callType, call->callToken);
ooOnReceivedProgress(call, q931Msg);
@@ -1796,12 +1796,12 @@ int ooHandleH2250Message(OOH323CallData *call, Q931Message *q931Msg)
{
pNode = dListFindByIndex(&call->timerList, i);
pTimer = (OOTimer*)pNode->data;
- if(((ooTimerCallback*)pTimer->cbData)->timerType &
+ if(((ooTimerCallback*)pTimer->cbData)->timerType &
OO_CALLESTB_TIMER)
{
memFreePtr(call->pctxt, pTimer->cbData);
ooTimerDelete(call->pctxt, &call->timerList, pTimer);
- OOTRACEDBGC3("Deleted CallESTB timer. (%s, %s)\n",
+ OOTRACEDBGC3("Deleted CallESTB timer. (%s, %s)\n",
call->callType, call->callToken);
break;
}
@@ -1840,14 +1840,14 @@ int ooHandleH2250Message(OOH323CallData *call, Q931Message *q931Msg)
call->endTime = (H235TimeStamp) time(NULL);
ooOnReceivedReleaseComplete(call, q931Msg);
-
+
ooFreeQ931Message(call->msgctxt, q931Msg);
break;
- case Q931FacilityMsg:
+ case Q931FacilityMsg:
OOTRACEINFO3("H.225 Facility message Received (%s, %s)\n",
call->callType, call->callToken);
- ooOnReceivedFacility(call, q931Msg);
+ ooOnReceivedFacility(call, q931Msg);
ooFreeQ931Message(call->msgctxt, q931Msg);
break;
case Q931StatusMsg:
@@ -1866,7 +1866,7 @@ int ooHandleH2250Message(OOH323CallData *call, Q931Message *q931Msg)
call->callType, call->callToken);
ooFreeQ931Message(call->msgctxt, q931Msg);
break;
- case Q931NotifyMsg:
+ case Q931NotifyMsg:
OOTRACEINFO3("H.225 Notify message Received (%s, %s)\n",
call->callType, call->callToken);
ooFreeQ931Message(call->msgctxt, q931Msg);
@@ -1886,7 +1886,7 @@ int ooOnReceivedFacility(OOH323CallData *call, Q931Message * pQ931Msg)
int ret;
H225TransportAddress_ipAddress_ip *ip = NULL;
H225TransportAddress_ip6Address_ip *ip6 = NULL;
- OOTRACEDBGC3("Received Facility Message.(%s, %s)\n", call->callType,
+ OOTRACEDBGC3("Received Facility Message.(%s, %s)\n", call->callType,
call->callToken);
ooHandleDisplayIE(call, pQ931Msg);
@@ -1945,11 +1945,11 @@ int ooOnReceivedFacility(OOH323CallData *call, Q931Message * pQ931Msg)
{
OOTRACEINFO3("Call Forward Facility message received. (%s, %s)\n",
call->callType, call->callToken);
- if(!facility->m.alternativeAddressPresent &&
+ if(!facility->m.alternativeAddressPresent &&
!facility->m.alternativeAliasAddressPresent)
{
OOTRACEERR3("Error:No alternative address provided in call forward"
- "facility message.(%s, %s)\n", call->callType,
+ "facility message.(%s, %s)\n", call->callType,
call->callToken);
if(call->callState < OO_CALL_CLEAR)
{
@@ -1958,7 +1958,7 @@ int ooOnReceivedFacility(OOH323CallData *call, Q931Message * pQ931Msg)
}
return OO_OK;
}
- call->pCallFwdData = (OOCallFwdData *) memAlloc(call->pctxt,
+ call->pCallFwdData = (OOCallFwdData *) memAlloc(call->pctxt,
sizeof(OOCallFwdData));
if(!call->pCallFwdData)
{
@@ -1972,40 +1972,40 @@ int ooOnReceivedFacility(OOH323CallData *call, Q931Message * pQ931Msg)
if(facility->m.alternativeAddressPresent)
{
if (call->versionIP == 6) {
- if(facility->alternativeAddress.t !=
+ if(facility->alternativeAddress.t !=
T_H225TransportAddress_ip6Address)
{
OOTRACEERR3("ERROR: Source call signalling address type not ip6 "
"(%s, %s)\n", call->callType, call->callToken);
-
+
return OO_FAILED;
}
ip6 = &facility->alternativeAddress.u.ip6Address->ip;
inet_ntop(AF_INET6, ip6->data, call->pCallFwdData->ip, INET6_ADDRSTRLEN);
- call->pCallFwdData->port =
+ call->pCallFwdData->port =
facility->alternativeAddress.u.ip6Address->port;
} else {
- if(facility->alternativeAddress.t !=
+ if(facility->alternativeAddress.t !=
T_H225TransportAddress_ipAddress)
{
OOTRACEERR3("ERROR: Source call signalling address type not ip "
"(%s, %s)\n", call->callType, call->callToken);
-
+
return OO_FAILED;
}
ip = &facility->alternativeAddress.u.ipAddress->ip;
- sprintf(call->pCallFwdData->ip, "%d.%d.%d.%d", ip->data[0],
+ sprintf(call->pCallFwdData->ip, "%d.%d.%d.%d", ip->data[0],
ip->data[1], ip->data[2], ip->data[3]);
- call->pCallFwdData->port =
+ call->pCallFwdData->port =
facility->alternativeAddress.u.ipAddress->port;
}
}
if(facility->m.alternativeAliasAddressPresent)
{
- ooH323RetrieveAliases(call, &facility->alternativeAliasAddress,
+ ooH323RetrieveAliases(call, &facility->alternativeAliasAddress,
&call->pCallFwdData->aliases);
}
/* Now we have to clear the current call and make a new call to
@@ -2035,12 +2035,12 @@ int ooOnReceivedFacility(OOH323CallData *call, Q931Message * pQ931Msg)
}
}
else{
- OOTRACEINFO3("Unhandled Facility reason type received (%s, %s)\n",
+ OOTRACEINFO3("Unhandled Facility reason type received (%s, %s)\n",
call->callType, call->callToken);
}
}
else{ /* Empty facility message Check for tunneling */
- if (pH323UUPdu->h323_message_body.t ==
+ if (pH323UUPdu->h323_message_body.t ==
T_H225H323_UU_PDU_h323_message_body_empty) {
OOTRACEDBGB3("Handling tunneled messages in empty Facility message."
" (%s, %s)\n", call->callType, call->callToken);
@@ -2049,7 +2049,7 @@ int ooOnReceivedFacility(OOH323CallData *call, Q931Message * pQ931Msg)
"message. (%s, %s)\n", call->callType, call->callToken);
}
}
-
+
return OO_OK;
}
@@ -2059,7 +2059,7 @@ int ooHandleStartH245FacilityMessage
H225TransportAddress_ipAddress *ipAddress = NULL;
H225TransportAddress_ip6Address *ip6Address = NULL;
int ret;
-
+
/* Extract H245 address */
if(!facility->m.h245AddressPresent)
{
@@ -2097,7 +2097,7 @@ int ooHandleStartH245FacilityMessage
"address found. (%s, %s)\n", call->callType, call->callToken);
return OO_FAILED;
}
-
+
sprintf(call->remoteIP, "%d.%d.%d.%d", ipAddress->ip.data[0],
ipAddress->ip.data[1],
ipAddress->ip.data[2],
@@ -2131,17 +2131,17 @@ int ooHandleTunneledH245Messages
H245Message *pmsg;
OOCTXT *pctxt = call->msgctxt;
int ret=0,i=0;
-
- OOTRACEDBGC3("Checking for tunneled H.245 messages (%s, %s)\n",
+
+ OOTRACEDBGC3("Checking for tunneled H.245 messages (%s, %s)\n",
call->callType, call->callToken);
- /* Check whether there are tunneled messages */
+ /* Check whether there are tunneled messages */
if(pH323UUPdu->m.h245TunnelingPresent)
{
if(pH323UUPdu->h245Tunneling)
{
OOTRACEDBGB4("Total number of tunneled H245 messages are %d.(%s, %s)"
- "\n", (int)pH323UUPdu->h245Control.n, call->callType,
+ "\n", (int)pH323UUPdu->h245Control.n, call->callType,
call->callToken);
for(i=0; i< (int)pH323UUPdu->h245Control.n; i++)
{
@@ -2156,21 +2156,21 @@ int ooHandleTunneledH245Messages
return OO_FAILED;
}
- setPERBuffer(pctxt,
+ setPERBuffer(pctxt,
(ASN1OCTET*)pH323UUPdu->h245Control.elem[i].data,
- pH323UUPdu->h245Control.elem[i].numocts, 1);
+ pH323UUPdu->h245Control.elem[i].numocts, 1);
initializePrintHandler(&printHandler, "Tunneled H.245 Message");
memset(pmsg, 0, sizeof(H245Message));
/* Set event handler */
setEventHandler (pctxt, &printHandler);
- OOTRACEDBGC4("Decoding %d tunneled H245 message. (%s, %s)\n",
+ OOTRACEDBGC4("Decoding %d tunneled H245 message. (%s, %s)\n",
i+1, call->callType, call->callToken);
- ret = asn1PD_H245MultimediaSystemControlMessage(pctxt,
+ ret = asn1PD_H245MultimediaSystemControlMessage(pctxt,
&(pmsg->h245Msg));
if(ret != ASN_OK)
{
- OOTRACEERR3("Error decoding H245 message (%s, %s)\n",
+ OOTRACEERR3("Error decoding H245 message (%s, %s)\n",
call->callType, call->callToken);
ooFreeH245Message(call,pmsg);
return OO_FAILED;
@@ -2187,7 +2187,7 @@ int ooHandleTunneledH245Messages
}
int ooH323RetrieveAliases
- (OOH323CallData *call, H225_SeqOfH225AliasAddress *pAddresses,
+ (OOH323CallData *call, H225_SeqOfH225AliasAddress *pAddresses,
OOAliases **aliasList)
{
int i=0,j=0,k=0;
@@ -2198,14 +2198,14 @@ int ooH323RetrieveAliases
if(!pAddresses)
{
- OOTRACEWARN3("Warn:No Aliases present (%s, %s)\n", call->callType,
+ OOTRACEWARN3("Warn:No Aliases present (%s, %s)\n", call->callType,
call->callToken);
return OO_OK;
}
/* check for aliases */
if(pAddresses->count<=0)
return OO_OK;
-
+
for(i=0; i<(int)pAddresses->count; i++)
{
pNode = dListFindByIndex (pAddresses, i);
@@ -2230,14 +2230,14 @@ int ooH323RetrieveAliases
{
case T_H225AliasAddress_dialedDigits:
newAlias->type = T_H225AliasAddress_dialedDigits;
- newAlias->value = (char*) memAlloc(call->pctxt,
+ newAlias->value = (char*) memAlloc(call->pctxt,
strlen(pAliasAddress->u.dialedDigits)*sizeof(char)+1);
if(!newAlias->value)
{
OOTRACEERR3("ERROR:Memory - ooH323RetrieveAliases - "
- "newAlias->value(dialedDigits) (%s, %s)\n",
+ "newAlias->value(dialedDigits) (%s, %s)\n",
call->callType, call->callToken);
- memFreePtr(call->pctxt, newAlias);
+ memFreePtr(call->pctxt, newAlias);
return OO_FAILED;
}
@@ -2247,14 +2247,14 @@ int ooH323RetrieveAliases
break;
case T_H225AliasAddress_h323_ID:
newAlias->type = T_H225AliasAddress_h323_ID;
- newAlias->value = (char*)memAlloc(call->pctxt,
+ newAlias->value = (char*)memAlloc(call->pctxt,
(pAliasAddress->u.h323_ID.nchars+1)*sizeof(char)+1);
if(!newAlias->value)
{
OOTRACEERR3("ERROR:Memory - ooH323RetrieveAliases - "
- "newAlias->value(h323id) (%s, %s)\n", call->callType,
+ "newAlias->value(h323id) (%s, %s)\n", call->callType,
call->callToken);
- memFreePtr(call->pctxt, newAlias);
+ memFreePtr(call->pctxt, newAlias);
return OO_FAILED;
}
@@ -2266,7 +2266,7 @@ int ooH323RetrieveAliases
}
}
newAlias->value[k] = '\0';
- break;
+ break;
case T_H225AliasAddress_url_ID:
newAlias->type = T_H225AliasAddress_url_ID;
newAlias->value = (char*)memAlloc(call->pctxt,
@@ -2274,9 +2274,9 @@ int ooH323RetrieveAliases
if(!newAlias->value)
{
OOTRACEERR3("ERROR:Memory - ooH323RetrieveAliases - "
- "newAlias->value(urlid) (%s, %s)\n", call->callType,
+ "newAlias->value(urlid) (%s, %s)\n", call->callType,
call->callToken);
- memFreePtr(call->pctxt, newAlias);
+ memFreePtr(call->pctxt, newAlias);
return OO_FAILED;
}
@@ -2288,18 +2288,18 @@ int ooH323RetrieveAliases
newAlias->type = T_H225AliasAddress_transportID;
pTransportAddrss = pAliasAddress->u.transportID;
if(pTransportAddrss->t == T_H225TransportAddress_ip6Address) {
- /* hopefully ip:port value can't exceed more than 30
+ /* hopefully ip:port value can't exceed more than 30
characters */
- newAlias->value = (char*)memAlloc(call->pctxt,
+ newAlias->value = (char*)memAlloc(call->pctxt,
INET6_ADDRSTRLEN*sizeof(char)*2);
inet_ntop(AF_INET6, pTransportAddrss->u.ip6Address->ip.data, newAlias->value, INET6_ADDRSTRLEN);
sprintf(newAlias->value+strlen(newAlias->value), ":%d", pTransportAddrss->u.ip6Address->port);
} else if(pTransportAddrss->t == T_H225TransportAddress_ipAddress) {
- /* hopefully ip:port value can't exceed more than 30
+ /* hopefully ip:port value can't exceed more than 30
characters */
- newAlias->value = (char*)memAlloc(call->pctxt,
+ newAlias->value = (char*)memAlloc(call->pctxt,
30*sizeof(char));
- sprintf(newAlias->value, "%d.%d.%d.%d:%d",
+ sprintf(newAlias->value, "%d.%d.%d.%d:%d",
pTransportAddrss->u.ipAddress->ip.data[0],
pTransportAddrss->u.ipAddress->ip.data[1],
pTransportAddrss->u.ipAddress->ip.data[2],
@@ -2313,14 +2313,14 @@ int ooH323RetrieveAliases
break;
case T_H225AliasAddress_email_ID:
newAlias->type = T_H225AliasAddress_email_ID;
- newAlias->value = (char*)memAlloc(call->pctxt,
+ newAlias->value = (char*)memAlloc(call->pctxt,
strlen(pAliasAddress->u.email_ID)*sizeof(char)+1);
if(!newAlias->value)
{
OOTRACEERR3("ERROR:Memory - ooH323RetrieveAliases - "
- "newAlias->value(emailid) (%s, %s)\n", call->callType,
+ "newAlias->value(emailid) (%s, %s)\n", call->callType,
call->callToken);
- memFreePtr(call->pctxt, newAlias);
+ memFreePtr(call->pctxt, newAlias);
return OO_FAILED;
}
@@ -2329,7 +2329,7 @@ int ooH323RetrieveAliases
newAlias->value[strlen(pAliasAddress->u.email_ID)*sizeof(char)]='\0';
break;
default:
- OOTRACEERR3("Error:Unhandled Alias type (%s, %s)\n",
+ OOTRACEERR3("Error:Unhandled Alias type (%s, %s)\n",
call->callType, call->callToken);
memFreePtr(call->pctxt, newAlias);
continue;
@@ -2339,7 +2339,7 @@ int ooH323RetrieveAliases
*aliasList = newAlias;
newAlias = NULL;
-
+
pAliasAddress = NULL;
pNode = NULL;
}/* endof: for */
@@ -2364,7 +2364,7 @@ int ooPopulatePrefixList(OOCTXT *pctxt, OOAliases *pAliases,
switch(pAlias->type)
{
case T_H225AliasAddress_dialedDigits:
- pPrefixEntry = (H225SupportedPrefix *)memAlloc(pctxt,
+ pPrefixEntry = (H225SupportedPrefix *)memAlloc(pctxt,
sizeof(H225SupportedPrefix));
if(!pPrefixEntry) {
OOTRACEERR1("ERROR:Memory - ooPopulatePrefixList - pAliasEntry\n");
@@ -2383,12 +2383,12 @@ int ooPopulatePrefixList(OOCTXT *pctxt, OOAliases *pAliases,
bValid = TRUE;
break;
default:
- bValid = FALSE;
+ bValid = FALSE;
}
-
+
if(bValid)
dListAppend( pctxt, pPrefixList, (void*)pPrefixEntry );
-
+
pAlias = pAlias->next;
}
}
@@ -2412,7 +2412,7 @@ int ooPopulateAliasList(OOCTXT *pctxt, OOAliases *pAliases,
pAlias = pAlias->next;
continue;
}
- pAliasEntry = (H225AliasAddress*)memAlloc(pctxt,
+ pAliasEntry = (H225AliasAddress*)memAlloc(pctxt,
sizeof(H225AliasAddress));
if(!pAliasEntry)
{
@@ -2445,7 +2445,7 @@ int ooPopulateAliasList(OOCTXT *pctxt, OOAliases *pAliases,
pAliasEntry->u.h323_ID.nchars = strlen(pAlias->value);
pAliasEntry->u.h323_ID.data = (ASN116BITCHAR*)memAllocZ
(pctxt, strlen(pAlias->value)*sizeof(ASN116BITCHAR));
-
+
if(!pAliasEntry->u.h323_ID.data)
{
OOTRACEERR1("ERROR:Memory - ooPopulateAliasList - h323_id\n");
@@ -2458,12 +2458,12 @@ int ooPopulateAliasList(OOCTXT *pctxt, OOAliases *pAliases,
break;
case T_H225AliasAddress_url_ID:
pAliasEntry->t = T_H225AliasAddress_url_ID;
- pAliasEntry->u.url_ID = (ASN1IA5String)memAlloc(pctxt,
+ pAliasEntry->u.url_ID = (ASN1IA5String)memAlloc(pctxt,
strlen(pAlias->value)+1);
if(!pAliasEntry->u.url_ID)
{
OOTRACEERR1("ERROR:Memory - ooPopulateAliasList - url_id\n");
- memFreePtr(pctxt, pAliasEntry);
+ memFreePtr(pctxt, pAliasEntry);
return OO_FAILED;
}
strcpy(*(char**)&pAliasEntry->u.url_ID, pAlias->value);
@@ -2471,7 +2471,7 @@ int ooPopulateAliasList(OOCTXT *pctxt, OOAliases *pAliases,
break;
case T_H225AliasAddress_email_ID:
pAliasEntry->t = T_H225AliasAddress_email_ID;
- pAliasEntry->u.email_ID = (ASN1IA5String)memAlloc(pctxt,
+ pAliasEntry->u.email_ID = (ASN1IA5String)memAlloc(pctxt,
strlen(pAlias->value)+1);
if(!pAliasEntry->u.email_ID)
{
@@ -2484,14 +2484,14 @@ int ooPopulateAliasList(OOCTXT *pctxt, OOAliases *pAliases,
break;
default:
OOTRACEERR1("ERROR: Unhandled alias type\n");
- bValid = FALSE;
+ bValid = FALSE;
}
-
+
if(bValid)
dListAppend( pctxt, pAliasList, (void*)pAliasEntry );
else
memFreePtr(pctxt, pAliasEntry);
-
+
pAlias = pAlias->next;
}
}
@@ -2544,7 +2544,7 @@ OOAliases* ooH323AddAliasToList
int j=0,k=0;
OOAliases *newAlias=NULL;
H225TransportAddress *pTransportAddrss=NULL;
-
+
newAlias = (OOAliases*) memAlloc(pctxt, sizeof(OOAliases));
if(!newAlias)
{
@@ -2562,7 +2562,7 @@ OOAliases* ooH323AddAliasToList
break;
case T_H225AliasAddress_h323_ID:
newAlias->type = T_H225AliasAddress_h323_ID;
- newAlias->value = (char*)memAlloc(pctxt,
+ newAlias->value = (char*)memAlloc(pctxt,
(pAliasAddress->u.h323_ID.nchars+1)*sizeof(char)+1);
for(j=0, k=0; j<(int)pAliasAddress->u.h323_ID.nchars; j++)
@@ -2573,7 +2573,7 @@ OOAliases* ooH323AddAliasToList
}
}
newAlias->value[k] = '\0';
- break;
+ break;
case T_H225AliasAddress_url_ID:
newAlias->type = T_H225AliasAddress_url_ID;
newAlias->value = (char*)memAlloc(pctxt,
@@ -2585,18 +2585,18 @@ OOAliases* ooH323AddAliasToList
newAlias->type = T_H225AliasAddress_transportID;
pTransportAddrss = pAliasAddress->u.transportID;
if(pTransportAddrss->t == T_H225TransportAddress_ip6Address) {
- /* hopefully ip:port value can't exceed more than 30
+ /* hopefully ip:port value can't exceed more than 30
characters */
- newAlias->value = (char*)memAlloc(pctxt,
+ newAlias->value = (char*)memAlloc(pctxt,
INET6_ADDRSTRLEN*sizeof(char)*2);
inet_ntop(AF_INET6, pTransportAddrss->u.ip6Address->ip.data, newAlias->value, INET6_ADDRSTRLEN);
sprintf(newAlias->value+strlen(newAlias->value), ":%d", pTransportAddrss->u.ip6Address->port);
} else if(pTransportAddrss->t == T_H225TransportAddress_ipAddress) {
- /* hopefully ip:port value can't exceed more than 30
+ /* hopefully ip:port value can't exceed more than 30
characters */
- newAlias->value = (char*)memAlloc(pctxt,
+ newAlias->value = (char*)memAlloc(pctxt,
30*sizeof(char));
- sprintf(newAlias->value, "%d.%d.%d.%d:%d",
+ sprintf(newAlias->value, "%d.%d.%d.%d:%d",
pTransportAddrss->u.ipAddress->ip.data[0],
pTransportAddrss->u.ipAddress->ip.data[1],
pTransportAddrss->u.ipAddress->ip.data[2],
@@ -2610,7 +2610,7 @@ OOAliases* ooH323AddAliasToList
break;
case T_H225AliasAddress_email_ID:
newAlias->type = T_H225AliasAddress_email_ID;
- newAlias->value = (char*)memAlloc(pctxt,
+ newAlias->value = (char*)memAlloc(pctxt,
strlen(pAliasAddress->u.email_ID)*sizeof(char)+1);
strcpy(newAlias->value, pAliasAddress->u.email_ID);
@@ -2626,7 +2626,7 @@ OOAliases* ooH323AddAliasToList
return newAlias;
}
-int ooH323GetIpPortFromH225TransportAddress(struct OOH323CallData *call,
+int ooH323GetIpPortFromH225TransportAddress(struct OOH323CallData *call,
H225TransportAddress *h225Address, char *ip, int *port)
{
if (call->versionIP == 6) {
@@ -2646,8 +2646,8 @@ int ooH323GetIpPortFromH225TransportAddress(struct OOH323CallData *call,
call->callToken);
return OO_FAILED;
}
- sprintf(ip, "%d.%d.%d.%d",
- h225Address->u.ipAddress->ip.data[0],
+ sprintf(ip, "%d.%d.%d.%d",
+ h225Address->u.ipAddress->ip.data[0],
h225Address->u.ipAddress->ip.data[1],
h225Address->u.ipAddress->ip.data[2],
h225Address->u.ipAddress->ip.data[3]);
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 20:50:39 +0000