[Asterisk-cvs] asterisk-addons/asterisk-ooh323c/ooh323c/src
ooCalls.c, 1.4, 1.5 ooCapability.c, 1.4, 1.5 oochannels.c, 1.8,
1.9 ooq931.c, 1.11, 1.12
vphirke
vphirke
Tue Aug 2 14:49:19 CDT 2005
Update of /usr/cvsroot/asterisk-addons/asterisk-ooh323c/ooh323c/src
In directory mongoose.digium.com:/tmp/cvs-serv18190/ooh323c/src
Modified Files:
ooCalls.c ooCapability.c oochannels.c ooq931.c
Log Message:
Updated stack source
Index: ooCalls.c
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/asterisk-ooh323c/ooh323c/src/ooCalls.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ooCalls.c 3 Jun 2005 14:54:06 -0000 1.4
+++ ooCalls.c 2 Aug 2005 18:54:54 -0000 1.5
@@ -335,10 +335,10 @@
return OO_FAILED;
}
/* Set dialed digits alias */
- if(!strcmp(call->callType, "outgoing"))
+ /* if(!strcmp(call->callType, "outgoing"))
{
ooCallAddAliasDialedDigits(call, number);
- }
+ }*/
return OO_OK;
}
Index: ooCapability.c
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/asterisk-ooh323c/ooh323c/src/ooCapability.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ooCapability.c 6 Jul 2005 12:49:54 -0000 1.4
+++ ooCapability.c 2 Aug 2005 18:54:54 -0000 1.5
@@ -1932,13 +1932,14 @@
OOTRACEDBGC3("Adding cap to joint capabilities(%s, %s)\n",call->callType,
call->callToken);
/* Note:we add jointCaps in remote endpoints preference order.*/
- if(call->jointCaps)
- {
+ if(!call->jointCaps)
+ call->jointCaps = epCap;
+ else {
cur = call->jointCaps;
while(cur->next) cur = cur->next;
cur->next = epCap;
}
- call->jointCaps = epCap;
+
return OO_OK;
}
@@ -1979,13 +1980,14 @@
OOTRACEDBGC3("Adding H263-SQCIF to joint capabilities(%s, %s)\n",
call->callType, call->callToken);
/* Note:we add jointCaps in remote endpoints preference order.*/
- if(call->jointCaps)
- {
+ if(!call->jointCaps)
+ call->jointCaps = epCap;
+ else {
cur = call->jointCaps;
while(cur->next) cur = cur->next;
cur->next = epCap;
}
- call->jointCaps = epCap;
+
}
}
@@ -2000,13 +2002,14 @@
OOTRACEDBGC3("Adding H263-QCIF to joint capabilities(%s, %s)\n",
call->callType, call->callToken);
/* Note:we add jointCaps in remote endpoints preference order.*/
- if(call->jointCaps)
- {
+ if(!call->jointCaps)
+ call->jointCaps = epCap;
+ else {
cur = call->jointCaps;
while(cur->next) cur = cur->next;
cur->next = epCap;
}
- call->jointCaps = epCap;
+
}
}
@@ -2021,13 +2024,14 @@
OOTRACEDBGC3("Adding H263-CIF to joint capabilities(%s, %s)\n",
call->callType, call->callToken);
/* Note:we add jointCaps in remote endpoints preference order.*/
- if(call->jointCaps)
- {
+ if(!call->jointCaps)
+ call->jointCaps = epCap;
+ else {
cur = call->jointCaps;
while(cur->next) cur = cur->next;
cur->next = epCap;
}
- call->jointCaps = epCap;
+
}
}
@@ -2042,13 +2046,14 @@
OOTRACEDBGC3("Adding H263-CIF to joint capabilities(%s, %s)\n",
call->callType, call->callToken);
/* Note:we add jointCaps in remote endpoints preference order.*/
- if(call->jointCaps)
- {
+ if(!call->jointCaps)
+ call->jointCaps = epCap;
+ else {
cur = call->jointCaps;
while(cur->next) cur = cur->next;
cur->next = epCap;
}
- call->jointCaps = epCap;
+
}
}
@@ -2063,13 +2068,13 @@
OOTRACEDBGC3("Adding H263-CIF4 to joint capabilities(%s, %s)\n",
call->callType, call->callToken);
/* Note:we add jointCaps in remote endpoints preference order.*/
- if(call->jointCaps)
- {
+ if(!call->jointCaps)
+ call->jointCaps = epCap;
+ else {
cur = call->jointCaps;
while(cur->next) cur = cur->next;
cur->next = epCap;
}
- call->jointCaps = epCap;
}
}
@@ -2084,13 +2089,14 @@
OOTRACEDBGC3("Adding H263-CIF16 to joint capabilities(%s, %s)\n",
call->callType, call->callToken);
/* Note:we add jointCaps in remote endpoints preference order.*/
- if(call->jointCaps)
- {
+ if(!call->jointCaps)
+ call->jointCaps = epCap;
+ else {
cur = call->jointCaps;
while(cur->next) cur = cur->next;
cur->next = epCap;
}
- call->jointCaps = epCap;
+
}
}
Index: oochannels.c
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/asterisk-ooh323c/ooh323c/src/oochannels.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- oochannels.c 21 Jul 2005 21:49:36 -0000 1.8
+++ oochannels.c 2 Aug 2005 18:54:54 -0000 1.9
@@ -792,10 +792,15 @@
memset(pmsg, 0, sizeof(Q931Message));
/* First read just TPKT header which is four bytes */
recvLen = ooSocketRecv (call->pH225Channel->sock, message, 4);
- if(recvLen == 0)
+ if(recvLen <= 0)
{
- OOTRACEWARN3("Warn:RemoteEndpoint closed connection (%s, %s)\n",
- call->callType, call->callToken);
+ if(recvLen == 0)
+ OOTRACEWARN3("Warn:RemoteEndpoint closed connection (%s, %s)\n",
+ call->callType, call->callToken);
+ else
+ OOTRACEERR3("Error:Transport failure while reading Q931 "
+ "message (%s, %s)\n", call->callType, call->callToken);
+
ooCloseH225Connection(call);
if(call->callState < OO_CALL_CLEARED)
{
@@ -928,11 +933,15 @@
message boundary. Has to be done at channel level, as channels
know the message formats and can determine boundaries
*/
- if(recvLen==0)
+ if(recvLen<=0)
{
-
- OOTRACEINFO3("Closing H.245 channels as remote end point closed H.245"
- " connection (%s, %s)\n", call->callType, call->callToken);
+ if(recvLen == 0)
+ OOTRACEINFO3("Closing H.245 channels as remote end point closed H.245"
+ " connection (%s, %s)\n", call->callType, call->callToken);
+ else
+ OOTRACEERR3("Error: Transport failure while trying to receive H245"
+ " message (%s, %s)\n", call->callType, call->callToken);
+
ooCloseH245Connection(call);
ooFreeH245Message(call, pmsg);
if(call->callState < OO_CALL_CLEAR)
Index: ooq931.c
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/asterisk-ooh323c/ooh323c/src/ooq931.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ooq931.c 21 Jul 2005 22:13:35 -0000 1.11
+++ ooq931.c 2 Aug 2005 18:54:54 -0000 1.12
@@ -718,7 +718,7 @@
}
/*Add display ie. */
- if(ooUtilsIsStrEmpty(call->ourCallerId))
+ if(!ooUtilsIsStrEmpty(call->ourCallerId))
{
msgbuf[i++] = Q931DisplayIE;
ieLen = strlen(call->ourCallerId)+1;
@@ -1860,6 +1860,7 @@
ASN1BOOL aligned = 1;
H225AliasAddress * pAliasAddress=NULL;
pctxt = &gH323ep.msgctxt;
+ ooAliases *pAlias = NULL;
ret = ooCreateQ931Message(&q931msg, Q931SetupMsg);
if(ret != OO_OK)
@@ -1874,7 +1875,7 @@
if(OO_OK != ooSetBearerCapabilityIE(q931msg, Q931CCITTStd,
Q931TransferSpeech, Q931TransferCircuitMode,
Q931TransferRate64Kbps, Q931UserInfoLayer1G722G725))
-//Cisco 1750 router Q931TransferRate64Kbps, Q931UserInfoLayer1G711ULaw))
+// Q931TransferRate64Kbps, Q931UserInfoLayer1G711ULaw))
{
OOTRACEERR3("Error: Failed to set bearer capability ie.(%s, %s)\n",
call->callType, call->callToken);
@@ -1885,11 +1886,36 @@
if(call->callingPartyNumber)
ooQ931SetCallingPartyNumberIE(q931msg,
(const char*)call->callingPartyNumber, 1, 0, 1, 1);
+
/* Set called party number Q931 ie */
if(call->calledPartyNumber)
ooQ931SetCalledPartyNumberIE(q931msg,
(const char*)call->calledPartyNumber, 1, 0);
+ else if(call->remoteAliases) {
+ pAlias = call->remoteAliases;
+ while(pAlias) {
+ if(pAlias->type == T_H225AliasAddress_dialedDigits)
+ break;
+ pAlias = pAlias->next;
+ }
+ if(pAlias)
+ {
+ call->calledPartyNumber = (char*)memAlloc(call->pctxt,
+ strlen(pAlias->value)+1);
+ if(!call->calledPartyNumber)
+ {
+ OOTRACEERR3("Error:Memory - ooH323MakeCall_helper - "
+ "calledPartyNumber(%s, %s)\n", call->callType,
+ call->callToken);
+ return OO_FAILED;
+ }
+ strcpy(call->calledPartyNumber, pAlias->value);
+ ooQ931SetCalledPartyNumberIE(q931msg,
+ (const char*)call->calledPartyNumber, 1, 0);
+ }
+
+ }
q931msg->userInfo = (H225H323_UserInformation*)memAlloc(pctxt,
sizeof(H225H323_UserInformation));
@@ -1928,12 +1954,18 @@
return OO_FAILED;
}
}
+
setup->m.presentationIndicatorPresent = TRUE;
setup->presentationIndicator.t =
T_H225PresentationIndicator_presentationAllowed;
setup->m.screeningIndicatorPresent = TRUE;
setup->screeningIndicator = userProvidedNotScreened;
+ setup->m.multipleCallsPresent = TRUE;
+ setup->multipleCalls = FALSE;
+ setup->m.maintainConnectionPresent = TRUE;
+ setup->maintainConnection = FALSE;
+
/* Populate Destination aliases */
if(call->remoteAliases)
{
More information about the svn-commits
mailing list