[asterisk-commits] may: branch may/ooh323_ipv6_direct_rtp r349923 - /team/may/ooh323_ipv6_direct...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Jan 6 14:22:23 CST 2012
Author: may
Date: Fri Jan 6 14:22:19 2012
New Revision: 349923
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=349923
Log:
remove red blobs (coding issues)
Modified:
team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooh245.c
team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooq931.c
Modified: team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooh245.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooh245.c?view=diff&rev=349923&r1=349922&r2=349923
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooh245.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooh245.c Fri Jan 6 14:22:19 2012
@@ -2830,8 +2830,8 @@
{
int ret = OO_OK;
/* Stop the media transmission */
- OOTRACEINFO4("Closing logical channel %d (%s, %s)\n",
- clcAck->forwardLogicalChannelNumber, call->callType,
+ OOTRACEINFO4("Closing logical channel %d (%s, %s)\n",
+ clcAck->forwardLogicalChannelNumber, call->callType,
call->callToken);
ret = ooClearLogicalChannel(call, clcAck->forwardLogicalChannelNumber);
if (ret != OO_OK) {
Modified: team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooq931.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooq931.c?view=diff&rev=349923&r1=349922&r2=349923
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooq931.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/addons/ooh323c/src/ooq931.c Fri Jan 6 14:22:19 2012
@@ -876,15 +876,15 @@
int ooHandleFastStartChannels(OOH323CallData *pCall)
{
int i = 0, j = 0, remoteMediaControlPort = 0, dir = 0;
- char remoteMediaControlIP[2+8*4+7];
+ char remoteMediaControlIP[2 + 8 * 4 + 7];
DListNode *pNode = NULL;
H245OpenLogicalChannel *olc = NULL;
ooH323EpCapability *epCap = NULL;
- H245H2250LogicalChannelParameters *h2250lcp = NULL;
+ H245H2250LogicalChannelParameters *h2250lcp = NULL;
/* If fast start supported and remote endpoint has sent faststart element */
- if (OO_TESTFLAG(pCall->flags, OO_M_FASTSTART) &&
+ if (OO_TESTFLAG(pCall->flags, OO_M_FASTSTART) &&
pCall->remoteFastStartOLCs.count>0) {
/* Go though all the proposed channels */
@@ -895,23 +895,24 @@
olc = (H245OpenLogicalChannel*)pNode->data;
/* Don't support both direction channel */
- if (olc->forwardLogicalChannelParameters.dataType.t !=
+ if (olc->forwardLogicalChannelParameters.dataType.t !=
T_H245DataType_nullData &&
- olc->m.reverseLogicalChannelParametersPresent)
- continue;
+ olc->m.reverseLogicalChannelParametersPresent) {
+ continue;
+ }
/* Check forward logic channel */
- if (olc->forwardLogicalChannelParameters.dataType.t !=
+ if (olc->forwardLogicalChannelParameters.dataType.t !=
T_H245DataType_nullData) {
/* Forward Channel - remote transmits - local receives */
- OOTRACEDBGC4("Processing received forward olc %d (%s, %s)\n",
- olc->forwardLogicalChannelNumber, pCall->callType,
+ OOTRACEDBGC4("Processing received forward olc %d (%s, %s)\n",
+ olc->forwardLogicalChannelNumber, pCall->callType,
pCall->callToken);
dir = OORX;
- epCap = ooIsDataTypeSupported(pCall,
+ epCap = ooIsDataTypeSupported(pCall,
&olc->forwardLogicalChannelParameters.dataType,
OORX);
-
+
if (!epCap) {
continue; /* Not Supported Channel */
}
@@ -920,8 +921,8 @@
if (olc->forwardLogicalChannelParameters.multiplexParameters.t !=
T_H245OpenLogicalChannel_forwardLogicalChannelParameters_multiplexParameters_h2250LogicalChannelParameters) {
OOTRACEERR4("ERROR:Unknown multiplex parameter type for "
- "channel %d (%s, %s)\n",
- olc->forwardLogicalChannelNumber,
+ "channel %d (%s, %s)\n",
+ olc->forwardLogicalChannelNumber,
pCall->callType, pCall->callToken);
memFreePtr(pCall->pctxt, epCap);
epCap = NULL;
@@ -933,7 +934,7 @@
if (ooIsSessionEstablished(pCall, olc->forwardLogicalChannelParameters.multiplexParameters.u.h2250LogicalChannelParameters->sessionID, "receive")) {
OOTRACEINFO4("Receive channel with sessionID %d already "
- "established.(%s, %s)\n", olc->forwardLogicalChannelParameters.multiplexParameters.u.h2250LogicalChannelParameters->sessionID,
+ "established.(%s, %s)\n", olc->forwardLogicalChannelParameters.multiplexParameters.u.h2250LogicalChannelParameters->sessionID,
pCall->callType, pCall->callToken);
memFreePtr(pCall->pctxt, epCap);
epCap = NULL;
@@ -942,8 +943,8 @@
/* Extract mediaControlChannel info, if supplied */
if (h2250lcp->m.mediaControlChannelPresent) {
- if (OO_OK != ooGetIpPortFromH245TransportAddress(pCall,
- &h2250lcp->mediaControlChannel,
+ if (OO_OK != ooGetIpPortFromH245TransportAddress(pCall,
+ &h2250lcp->mediaControlChannel,
remoteMediaControlIP, &remoteMediaControlPort)) {
OOTRACEERR3("Error: Invalid media control channel address "
"(%s, %s)\n", pCall->callType, pCall->callToken);
@@ -963,7 +964,7 @@
remoteMediaControlPort--;
if (gH323ep.h323Callbacks.onMediaChanged &&
pCall->callState < OO_CALL_CLEAR) {
- gH323ep.h323Callbacks.onMediaChanged(pCall, remoteMediaControlIP,
+ gH323ep.h323Callbacks.onMediaChanged(pCall, remoteMediaControlIP,
remoteMediaControlPort);
}
}
@@ -1774,20 +1775,20 @@
pQ931Msg->userInfo = (H225H323_UserInformation*)memAlloc(pctxt,
sizeof(H225H323_UserInformation));
if (!pQ931Msg->userInfo) {
- OOTRACEERR3("ERROR:Memory - ooSendFSUpdate - userInfo(%s, %s)\n",
+ OOTRACEERR3("ERROR:Memory - ooSendFSUpdate - userInfo(%s, %s)\n",
call->callType, call->callToken);
return OO_FAILED;
}
memset(pQ931Msg->userInfo, 0, sizeof(H225H323_UserInformation));
- pQ931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1;
-
- pQ931Msg->userInfo->h323_uu_pdu.h245Tunneling =
- OO_TESTFLAG (call->flags, OO_M_TUNNELING);
-
- pQ931Msg->userInfo->h323_uu_pdu.h323_message_body.t =
+ pQ931Msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1;
+
+ pQ931Msg->userInfo->h323_uu_pdu.h245Tunneling =
+ OO_TESTFLAG (call->flags, OO_M_TUNNELING);
+
+ pQ931Msg->userInfo->h323_uu_pdu.h323_message_body.t =
T_H225H323_UU_PDU_h323_message_body_facility;
-
- facility = (H225Facility_UUIE*)
+
+ facility = (H225Facility_UUIE*)
memAllocZ (pctxt, sizeof(H225Facility_UUIE));
if (!facility) {
More information about the asterisk-commits
mailing list