[svn-commits] trunk - r188 in /trunk/asterisk-ooh323c: ./
ooh323c/src/ src/
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Wed Jan 18 16:11:15 MST 2006
Author: objsys
Date: Wed Jan 18 17:11:09 2006
New Revision: 188
URL: http://svn.digium.com/view/asterisk-addons?rev=188&view=rev
Log:
G.729 codec support update, well formatted code
Modified:
trunk/asterisk-ooh323c/ChangeLog
trunk/asterisk-ooh323c/README
trunk/asterisk-ooh323c/config.h
trunk/asterisk-ooh323c/configure
trunk/asterisk-ooh323c/configure.in
trunk/asterisk-ooh323c/ooh323c/src/eventHandler.c
trunk/asterisk-ooh323c/ooh323c/src/ooCalls.c
trunk/asterisk-ooh323c/ooh323c/src/ooCalls.h
trunk/asterisk-ooh323c/ooh323c/src/ooCapability.c
trunk/asterisk-ooh323c/ooh323c/src/ooCapability.h
trunk/asterisk-ooh323c/ooh323c/src/ooCmdChannel.c
trunk/asterisk-ooh323c/ooh323c/src/ooDateTime.c
trunk/asterisk-ooh323c/ooh323c/src/ooGkClient.c
trunk/asterisk-ooh323c/ooh323c/src/ooGkClient.h
trunk/asterisk-ooh323c/ooh323c/src/ooLogChan.c
trunk/asterisk-ooh323c/ooh323c/src/ooSocket.c
trunk/asterisk-ooh323c/ooh323c/src/ooSocket.h
trunk/asterisk-ooh323c/ooh323c/src/ooStackCmds.c
trunk/asterisk-ooh323c/ooh323c/src/ooTimer.c
trunk/asterisk-ooh323c/ooh323c/src/ooTimer.h
trunk/asterisk-ooh323c/ooh323c/src/oochannels.c
trunk/asterisk-ooh323c/ooh323c/src/ooh245.c
trunk/asterisk-ooh323c/ooh323c/src/ooh245.h
trunk/asterisk-ooh323c/ooh323c/src/ooh323.c
trunk/asterisk-ooh323c/ooh323c/src/ooh323ep.c
trunk/asterisk-ooh323c/ooh323c/src/ooh323ep.h
trunk/asterisk-ooh323c/ooh323c/src/ooports.c
trunk/asterisk-ooh323c/ooh323c/src/ooq931.c
trunk/asterisk-ooh323c/ooh323c/src/ootrace.c
trunk/asterisk-ooh323c/ooh323c/src/ootypes.h
trunk/asterisk-ooh323c/src/chan_h323.c
trunk/asterisk-ooh323c/src/ooh323cDriver.c
trunk/asterisk-ooh323c/src/ooh323cDriver.h
Modified: trunk/asterisk-ooh323c/ChangeLog
URL: http://svn.digium.com/view/asterisk-addons/trunk/asterisk-ooh323c/ChangeLog?rev=188&r1=187&r2=188&view=diff
==============================================================================
--- trunk/asterisk-ooh323c/ChangeLog (original)
+++ trunk/asterisk-ooh323c/ChangeLog Wed Jan 18 17:11:09 2006
@@ -1,3 +1,10 @@
+Release 0.4
+* Fixed 4 deadlocks conditions in onAlerting, onReceivedDigit and
+ onCallExstablished funtions
+* Added Thread/Mutex debugging option, for debug build
+* Fixed bug causing dialed digits alias being set as a char string
+
+
Release 0.2
Added support for gsm, g729a, g723.1
Added call end cause conversion logic from H323 cause to asterisk cause
Modified: trunk/asterisk-ooh323c/README
URL: http://svn.digium.com/view/asterisk-addons/trunk/asterisk-ooh323c/README?rev=188&r1=187&r2=188&view=diff
==============================================================================
--- trunk/asterisk-ooh323c/README (original)
+++ trunk/asterisk-ooh323c/README Wed Jan 18 17:11:09 2006
@@ -12,7 +12,7 @@
Package Contents:
- asterisk-ooh323c-0.3
+ asterisk-ooh323c-0.4
|
|-src [H323 channel driver code]
|
@@ -49,7 +49,7 @@
mode and then run:
>make install
- 3. Open h323.conf.sample in asterisk-ooh323c-0.3 directory. Under [general]
+ 3. Open h323.conf.sample in asterisk-ooh323c-0.4 directory. Under [general]
you will see global configuration setting. Modify IP addresses of asterisk
server "bindaddr" to match your configuration.
@@ -82,7 +82,7 @@
CLI>stop now
Now to run tests, you will have to copy extensions.conf.sample in
- asterisk-ooh323c-0.3 directory to /etc/asterisk as extensions.conf. Make
+ asterisk-ooh323c-0.4 directory to /etc/asterisk as extensions.conf. Make
sure to save a backup copy of your existing extensions.conf. Now restart
the pbx as follows:
>/usr/sbin/asterisk -vvvc
Modified: trunk/asterisk-ooh323c/config.h
URL: http://svn.digium.com/view/asterisk-addons/trunk/asterisk-ooh323c/config.h?rev=188&r1=187&r2=188&view=diff
==============================================================================
--- trunk/asterisk-ooh323c/config.h (original)
+++ trunk/asterisk-ooh323c/config.h Wed Jan 18 17:11:09 2006
@@ -108,13 +108,13 @@
#define PACKAGE_NAME "ASTERISK-OOH323C"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "ASTERISK-OOH323C 0.3"
+#define PACKAGE_STRING "ASTERISK-OOH323C 0.4"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "asterisk-ooh323c"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.3"
+#define PACKAGE_VERSION "0.4"
/* Define to the type of arg 1 for `select'. */
#define SELECT_TYPE_ARG1 int
@@ -135,7 +135,7 @@
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
-#define VERSION "0.3"
+#define VERSION "0.4"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
Modified: trunk/asterisk-ooh323c/configure
URL: http://svn.digium.com/view/asterisk-addons/trunk/asterisk-ooh323c/configure?rev=188&r1=187&r2=188&view=diff
==============================================================================
--- trunk/asterisk-ooh323c/configure (original)
+++ trunk/asterisk-ooh323c/configure Wed Jan 18 17:11:09 2006
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for ASTERISK-OOH323C 0.3.
+# Generated by GNU Autoconf 2.57 for ASTERISK-OOH323C 0.4.
#
# Report bugs to <Objective Systems <support at obj-sys.com>>.
#
@@ -427,8 +427,8 @@
# Identity of this package.
PACKAGE_NAME='ASTERISK-OOH323C'
PACKAGE_TARNAME='asterisk-ooh323c'
-PACKAGE_VERSION='0.3'
-PACKAGE_STRING='ASTERISK-OOH323C 0.3'
+PACKAGE_VERSION='0.4'
+PACKAGE_STRING='ASTERISK-OOH323C 0.4'
PACKAGE_BUGREPORT='Objective Systems <support at obj-sys.com>'
ac_unique_file="src/chan_h323.c"
@@ -938,7 +938,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ASTERISK-OOH323C 0.3 to adapt to many kinds of systems.
+\`configure' configures ASTERISK-OOH323C 0.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1004,7 +1004,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ASTERISK-OOH323C 0.3:";;
+ short | recursive ) echo "Configuration of ASTERISK-OOH323C 0.4:";;
esac
cat <<\_ACEOF
@@ -1099,7 +1099,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-ASTERISK-OOH323C configure 0.3
+ASTERISK-OOH323C configure 0.4
generated by GNU Autoconf 2.57
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -1114,7 +1114,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ASTERISK-OOH323C $as_me 0.3, which was
+It was created by ASTERISK-OOH323C $as_me 0.4, which was
generated by GNU Autoconf 2.57. Invocation command line was
$ $0 $@
@@ -1451,7 +1451,7 @@
PACKAGE=asterisk-ooh323c
-VERSION=0.3
+VERSION=0.4
ac_aux_dir=
for ac_dir in config $srcdir/config; do
@@ -9612,7 +9612,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by ASTERISK-OOH323C $as_me 0.3, which was
+This file was extended by ASTERISK-OOH323C $as_me 0.4, which was
generated by GNU Autoconf 2.57. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -9675,7 +9675,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-ASTERISK-OOH323C config.status 0.3
+ASTERISK-OOH323C config.status 0.4
configured by $0, generated by GNU Autoconf 2.57,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Modified: trunk/asterisk-ooh323c/configure.in
URL: http://svn.digium.com/view/asterisk-addons/trunk/asterisk-ooh323c/configure.in?rev=188&r1=187&r2=188&view=diff
==============================================================================
--- trunk/asterisk-ooh323c/configure.in (original)
+++ trunk/asterisk-ooh323c/configure.in Wed Jan 18 17:11:09 2006
@@ -1,7 +1,7 @@
AC_PREREQ(2.57)
-AC_INIT([ASTERISK-OOH323C],[0.3],[Objective Systems <support at obj-sys.com>],[asterisk-ooh323c])
+AC_INIT([ASTERISK-OOH323C],[0.4],[Objective Systems <support at obj-sys.com>],[asterisk-ooh323c])
PACKAGE=asterisk-ooh323c
-VERSION=0.3
+VERSION=0.4
AC_CONFIG_AUX_DIR(config)
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
Modified: trunk/asterisk-ooh323c/ooh323c/src/eventHandler.c
URL: http://svn.digium.com/view/asterisk-addons/trunk/asterisk-ooh323c/ooh323c/src/eventHandler.c?rev=188&r1=187&r2=188&view=diff
==============================================================================
--- trunk/asterisk-ooh323c/ooh323c/src/eventHandler.c (original)
+++ trunk/asterisk-ooh323c/ooh323c/src/eventHandler.c Wed Jan 18 17:11:09 2006
@@ -62,7 +62,7 @@
}
void invokeBitStrValue (OOCTXT* pctxt, ASN1UINT numbits,
- const ASN1OCTET* data)
+ const ASN1OCTET* data)
{
if (0 != pctxt->pEventHandler) {
pctxt->pEventHandler->bitStrValue (numbits, data);
@@ -70,7 +70,7 @@
}
void invokeOctStrValue (OOCTXT* pctxt, ASN1UINT numocts,
- const ASN1OCTET* data)
+ const ASN1OCTET* data)
{
if (0 != pctxt->pEventHandler) {
pctxt->pEventHandler->octStrValue (numocts, data);
@@ -85,7 +85,7 @@
}
void invokeCharStr16BitValue (OOCTXT* pctxt, ASN1UINT nchars,
- ASN116BITCHAR* data)
+ ASN116BITCHAR* data)
{
if (0 != pctxt->pEventHandler) {
pctxt->pEventHandler->charStr16BitValue (nchars, data);
@@ -114,7 +114,7 @@
}
void invokeOpenTypeValue (OOCTXT* pctxt, ASN1UINT numocts,
- const ASN1OCTET* data)
+ const ASN1OCTET* data)
{
if (0 != pctxt->pEventHandler) {
pctxt->pEventHandler->openTypeValue (numocts, data);
Modified: trunk/asterisk-ooh323c/ooh323c/src/ooCalls.c
URL: http://svn.digium.com/view/asterisk-addons/trunk/asterisk-ooh323c/ooh323c/src/ooCalls.c?rev=188&r1=187&r2=188&view=diff
==============================================================================
--- trunk/asterisk-ooh323c/ooh323c/src/ooCalls.c (original)
+++ trunk/asterisk-ooh323c/ooh323c/src/ooCalls.c Wed Jan 18 17:11:09 2006
@@ -52,11 +52,13 @@
sprintf(call->callToken, "%s", callToken);
sprintf(call->callType, "%s", type);
call->callReference = 0;
- if(gH323ep.callerid){
+ if(gH323ep.callerid) {
strncpy(call->ourCallerId, gH323ep.callerid, sizeof(call->ourCallerId)-1);
call->ourCallerId[sizeof(call->ourCallerId)-1] = '\0';
- }else
+ }
+ else {
call->ourCallerId[0] = '\0';
+ }
memset(&call->callIdentifier, 0, sizeof(H225CallIdentifier));
memset(&call->confIdentifier, 0, sizeof(H225ConferenceIdentifier));
@@ -84,17 +86,20 @@
if(!strcmp(call->callType, "incoming"))
{
call->callingPartyNumber = NULL;
- }else{
+ }
+ else{
if(ooUtilsIsStrEmpty(gH323ep.callingPartyNumber))
{
call->callingPartyNumber = NULL;
- }else{
+ }
+ else{
call->callingPartyNumber = (char*) memAlloc(call->pctxt,
strlen(gH323ep.callingPartyNumber)+1);
if(call->callingPartyNumber)
{
strcpy(call->callingPartyNumber, gH323ep.callingPartyNumber);
- }else{
+ }
+ else{
OOTRACEERR3("Error:Memory - ooCreateCall - callingPartyNumber"
".(%s, %s)\n", call->callType, call->callToken);
freeContext(pctxt);
@@ -199,7 +204,8 @@
if(!call->pH225Channel || call->pH225Channel->sock ==0)
{
call->callState = OO_CALL_CLEARED;
- }else{
+ }
+ else{
if(!OO_TESTFLAG(call->flags, OO_M_RELEASE_BUILT))
{
if(call->callState == OO_CALL_CLEAR ||
@@ -243,7 +249,7 @@
OOCTXT *pctxt;
OOTRACEWARN4 ("Cleaning Call (%s, %s)- reason:%s\n",
- call->callType, call->callToken,
+ call->callType, call->callToken,
ooGetReasonCodeText (call->callEndReason));
/* First clean all the logical channels, if not already cleaned. */
@@ -299,7 +305,8 @@
OOTRACEERR3("Error:Failed to forward call (%s, %s)\n", call->callType,
call->callToken);
}
- }else {
+ }
+ else {
if(gH323ep.h323Callbacks.onCallCleared)
gH323ep.h323Callbacks.onCallCleared(call);
}
@@ -328,7 +335,8 @@
if(call->callingPartyNumber)
{
strcpy(call->callingPartyNumber, number);
- }else{
+ }
+ else{
OOTRACEERR3("Error:Memory - ooCallSetCallingPartyNumber - "
"callingPartyNumber.(%s, %s)\n", call->callType,
call->callToken);
@@ -366,7 +374,8 @@
if(call->calledPartyNumber)
{
strcpy(call->calledPartyNumber, number);
- }else{
+ }
+ else{
OOTRACEERR3("Error:Memory - ooCallSetCalledPartyNumber - "
"calledPartyNumber.(%s, %s)\n", call->callType,
call->callToken);
@@ -424,7 +433,8 @@
{
psNewAlias->next = call->ourAliases;
call->ourAliases = psNewAlias;
- }else {
+ }
+ else {
psNewAlias->next = call->remoteAliases;
call->remoteAliases = psNewAlias;
}
@@ -686,7 +696,7 @@
if(call->masterSlaveState == OO_MasterSlave_Master)
sessionID = call->nextSessionID++;
else{
- OOTRACEDBGC4("Session id for %s channel of type audio has to be "
+ OOTRACEDBGC4("Session id for %s channel of type audio has to be "
"provided by remote.(%s, %s)\n", dir, call->callType,
call->callToken);
sessionID = 0; /* Will be assigned by remote */
Modified: trunk/asterisk-ooh323c/ooh323c/src/ooCalls.h
URL: http://svn.digium.com/view/asterisk-addons/trunk/asterisk-ooh323c/ooh323c/src/ooCalls.h?rev=188&r1=187&r2=188&view=diff
==============================================================================
--- trunk/asterisk-ooh323c/ooh323c/src/ooCalls.h (original)
+++ trunk/asterisk-ooh323c/ooh323c/src/ooCalls.h Wed Jan 18 17:11:09 2006
@@ -111,9 +111,9 @@
* a particular call.
*/
typedef struct OOH323Channel {
- OOSOCKET sock; /*!< Socket connection for the channel */
- int port; /*!< Port assigned to the channel */
- DList outQueue; /*!< Output message queue */
+ OOSOCKET sock; /*!< Socket connection for the channel */
+ int port; /*!< Port assigned to the channel */
+ DList outQueue; /*!< Output message queue */
} OOH323Channel;
/**
@@ -142,8 +142,8 @@
OOMediaInfo *mediaInfo;
OOCallFwdData *pCallFwdData;
char localIP[20];/* Local IP address */
- OOH323Channel* pH225Channel;
- OOH323Channel* pH245Channel;
+ OOH323Channel* pH225Channel;
+ OOH323Channel* pH245Channel;
OOSOCKET *h245listener;
int *h245listenport;
char remoteIP[20];/* Remote IP address */
@@ -170,7 +170,7 @@
int logicalChanNoMax;
int logicalChanNoCur;
unsigned nextSessionID; /* Note by default 1 is audio session, 2 is video and 3 is data, from 3 onwards master decides*/
- DList timerList;
+ DList timerList;
ASN1UINT msdRetries;
void *usrData; /*!<User can set this to user specific data*/
struct OOH323CallData* next;
@@ -530,7 +530,7 @@
cb_StartReceiveChannel startReceiveChannel,
cb_StartTransmitChannel startTransmitChannel,
cb_StopReceiveChannel stopReceiveChannel,
- cb_StopTransmitChannel stopTransmitChannel);
+ cb_StopTransmitChannel stopTransmitChannel);
Modified: trunk/asterisk-ooh323c/ooh323c/src/ooCapability.c
URL: http://svn.digium.com/view/asterisk-addons/trunk/asterisk-ooh323c/ooh323c/src/ooCapability.c?rev=188&r1=187&r2=188&view=diff
==============================================================================
--- trunk/asterisk-ooh323c/ooh323c/src/ooCapability.c (original)
+++ trunk/asterisk-ooh323c/ooh323c/src/ooCapability.c Wed Jan 18 17:11:09 2006
@@ -30,7 +30,8 @@
{
gH323ep.dtmfmode |= OO_CAP_DTMF_RFC2833;
OOTRACEINFO1("Enabled RFC2833 DTMF capability for end-point\n");
- }else{
+ }
+ else{
call->dtmfmode |= OO_CAP_DTMF_RFC2833;
OOTRACEINFO3("Enabled RFC2833 DTMF capability for (%s, %s) \n",
call->callType, call->callToken);
@@ -50,7 +51,8 @@
if(!call){
gH323ep.dtmfmode ^= OO_CAP_DTMF_RFC2833;
OOTRACEINFO1("Disabled RFC2833 DTMF capability for end-point\n");
- }else{
+ }
+ else{
call->dtmfmode ^= OO_CAP_DTMF_RFC2833;
OOTRACEINFO3("Disabled RFC2833 DTMF capability for (%s, %s)\n",
call->callType, call->callToken);
@@ -64,7 +66,8 @@
if(!call){
gH323ep.dtmfmode |= OO_CAP_DTMF_H245_alphanumeric;
OOTRACEINFO1("Dtmf mode set to H.245(alphanumeric) for endpoint\n");
- }else {
+ }
+ else {
call->dtmfmode |= OO_CAP_DTMF_H245_alphanumeric;
OOTRACEINFO3("Dtmf mode set to H.245(alphanumeric) for (%s, %s)\n",
call->callType, call->callToken);
@@ -77,7 +80,8 @@
if(!call){
gH323ep.dtmfmode ^= OO_CAP_DTMF_H245_alphanumeric;
OOTRACEINFO1("Dtmf mode H.245(alphanumeric) disabled for endpoint\n");
- }else {
+ }
+ else {
call->dtmfmode ^= OO_CAP_DTMF_H245_alphanumeric;
OOTRACEINFO3("Dtmf mode H.245(alphanumeric) disabled for (%s, %s)\n",
call->callType, call->callToken);
@@ -90,7 +94,8 @@
if(!call){
gH323ep.dtmfmode |= OO_CAP_DTMF_H245_signal;
OOTRACEINFO1("Dtmf mode set to H.245(signal) for endpoint\n");
- }else {
+ }
+ else {
call->dtmfmode |= OO_CAP_DTMF_H245_signal;
OOTRACEINFO3("Dtmf mode set to H.245(signal) for (%s, %s)\n",
call->callType, call->callToken);
@@ -103,7 +108,8 @@
if(!call){
gH323ep.dtmfmode ^= OO_CAP_DTMF_H245_signal;
OOTRACEINFO1("Dtmf mode H.245(signal) disabled for endpoint\n");
- }else {
+ }
+ else {
call->dtmfmode ^= OO_CAP_DTMF_H245_signal;
OOTRACEINFO3("Dtmf mode H.245(signal) disabled for (%s, %s)\n",
call->callType, call->callToken);
@@ -116,7 +122,8 @@
if(!call){
gH323ep.dtmfmode |= OO_CAP_DTMF_Q931;
OOTRACEINFO1("Dtmf mode set to Q.931(keypad) for the endpoint\n");
- }else {
+ }
+ else {
call->dtmfmode |= OO_CAP_DTMF_Q931;
OOTRACEINFO3("Dtmf mode set to Q.931(keypad) for the call (%s, %s)\n",
call->callType, call->callToken);
@@ -129,7 +136,8 @@
if(!call){
gH323ep.dtmfmode ^= OO_CAP_DTMF_Q931;
OOTRACEINFO1("Dtmf mode Q.931(keypad) disabled for the endpoint\n");
- }else {
+ }
+ else {
call->dtmfmode ^= OO_CAP_DTMF_Q931;
OOTRACEINFO3("Dtmf mode Q.931(keypad) disabled for the call (%s, %s)\n",
call->callType, call->callToken);
@@ -280,7 +288,8 @@
{
epCap->dir = OORX;
epCap->dir |= OOTX;
- }else
+ }
+ else
epCap->dir = dir;
epCap->cap = OO_H263VIDEO;
@@ -305,18 +314,20 @@
}
ooAppendCapToCapPrefs(NULL, cap);
gH323ep.noOfCaps++;
- }else{
+ }
+ else{
if(remote)
{
/*Add as remote capability */
if(!call->remoteCaps)
call->remoteCaps = epCap;
else{
- cur = call->remoteCaps;
+ cur = call->remoteCaps;
while(cur->next) cur = cur->next;
cur->next = epCap;
}
- }else{
+ }
+ else{
/*Add as our capability */
OOTRACEDBGC4("Adding call specific H263 video capability %s. "
"(%s, %s)\n", pictureType, call->callType,
@@ -326,7 +337,7 @@
ooResetCapPrefs(call);
}
else{
- cur = call->ourCaps;
+ cur = call->ourCaps;
while(cur->next) cur = cur->next;
cur->next = epCap;
}
@@ -357,7 +368,7 @@
params = (OOCapParams*) memAlloc(pctxt, sizeof(OOCapParams));
if(!epCap || !params)
{
- OOTRACEERR1("Error:Memory - ooCapabilityAddSimpleCapability - "
+ OOTRACEERR1("ERROR: Memory - ooCapabilityAddSimpleCapability - "
"epCap/params\n");
return OO_FAILED;
}
@@ -371,12 +382,13 @@
else
params->silenceSuppression = FALSE; /* Set to false for g711 and g729*/
- if(dir & OORXANDTX)
- {
+ if(dir & OORXANDTX) {
epCap->dir = OORX;
epCap->dir |= OOTX;
- }else
+ }
+ else {
epCap->dir = dir;
+ }
epCap->cap = cap;
epCap->capType = OO_CAP_TYPE_AUDIO;
@@ -388,11 +400,13 @@
epCap->next = NULL;
if(!call)
- {/*Add as local capability */
+ {
+ /* Add as local capability */
OOTRACEDBGC2("Adding endpoint capability %s. \n",
ooGetCapTypeText(epCap->cap));
- if(!gH323ep.myCaps)
+ if(!gH323ep.myCaps) {
gH323ep.myCaps = epCap;
+ }
else{
cur = gH323ep.myCaps;
while(cur->next) cur = cur->next;
@@ -400,33 +414,36 @@
}
ooAppendCapToCapPrefs(NULL, cap);
gH323ep.noOfCaps++;
- }else{
+ }
+ else{
if(remote)
{
- /*Add as remote capability */
- if(!call->remoteCaps)
+ /* Add as remote capability */
+ if(!call->remoteCaps) {
call->remoteCaps = epCap;
+ }
else{
- cur = call->remoteCaps;
+ cur = call->remoteCaps;
while(cur->next) cur = cur->next;
cur->next = epCap;
}
- }else{
- /*Add as our capability */
- OOTRACEDBGC4("Adding call specific capability %s. (%s, %s)\n",
- ooGetCapTypeText(epCap->cap), call->callType,
- call->callToken);
- if(!call->ourCaps){
- call->ourCaps = epCap;
- ooResetCapPrefs(call);
- }
- else{
- cur = call->ourCaps;
- while(cur->next) cur = cur->next;
- cur->next = epCap;
- }
- ooAppendCapToCapPrefs(call, cap);
- }
+ }
+ else{
+ /* Add as our capability */
+ OOTRACEDBGC4("Adding call specific capability %s. (%s, %s)\n",
+ ooGetCapTypeText(epCap->cap), call->callType,
+ call->callToken);
+ if(!call->ourCaps){
+ call->ourCaps = epCap;
+ ooResetCapPrefs(call);
+ }
+ else{
+ cur = call->ourCaps;
+ while(cur->next) cur = cur->next;
+ cur->next = epCap;
+ }
+ ooAppendCapToCapPrefs(call, cap);
+ }
}
return OO_OK;
@@ -468,7 +485,8 @@
{
epCap->dir = OORX;
epCap->dir |= OOTX;
- }else
+ }
+ else
epCap->dir = dir;
epCap->cap = cap;
@@ -492,18 +510,20 @@
}
ooAppendCapToCapPrefs(NULL, cap);
gH323ep.noOfCaps++;
- }else{
+ }
+ else{
if(remote)
{
/*Add as remote capability */
if(!call->remoteCaps)
call->remoteCaps = epCap;
else{
- cur = call->remoteCaps;
+ cur = call->remoteCaps;
while(cur->next) cur = cur->next;
cur->next = epCap;
}
- }else{
+ }
+ else{
OOTRACEDBGC4("Adding call specific capability %s. (%s, %s)\n",
ooGetCapTypeText(epCap->cap), call->callType,
call->callToken);
@@ -513,7 +533,7 @@
ooResetCapPrefs(call);
}
else{
- cur = call->ourCaps;
+ cur = call->ourCaps;
while(cur->next) cur = cur->next;
cur->next = epCap;
}
@@ -558,7 +578,7 @@
case OO_EXTELEMVIDEO:
default:
OOTRACEERR2("ERROR: Don't know how to create video capability %s\n",
- ooGetCapTypeText(epCap->cap));
+ ooGetCapTypeText(epCap->cap));
}
return NULL;
}
@@ -597,7 +617,7 @@
return ooCapabilityCreateGSMFullRateCapability(epCap, pctxt, dir);
default:
OOTRACEERR2("ERROR: Don't know how to create audio capability %d\n",
- epCap->cap);
+ epCap->cap);
}
return NULL;
}
@@ -691,24 +711,23 @@
pVideo->u.h263VideoCapability = pH263Cap;
- if(params->picFormat == OO_PICFORMAT_SQCIF)
- {
+ if(params->picFormat == OO_PICFORMAT_SQCIF) {
pH263Cap->m.sqcifMPIPresent = TRUE;
pH263Cap->sqcifMPI = params->MPI;
- }else if(params->picFormat == OO_PICFORMAT_QCIF)
- {
+ }
+ else if(params->picFormat == OO_PICFORMAT_QCIF) {
pH263Cap->m.qcifMPIPresent = TRUE;
pH263Cap->qcifMPI = params->MPI;
- }else if(params->picFormat == OO_PICFORMAT_CIF)
- {
+ }
+ else if(params->picFormat == OO_PICFORMAT_CIF) {
pH263Cap->m.cifMPIPresent = TRUE;
pH263Cap->cifMPI = params->MPI;
- }else if(params->picFormat == OO_PICFORMAT_CIF4)
- {
+ }
+ else if(params->picFormat == OO_PICFORMAT_CIF4) {
pH263Cap->m.cif4MPIPresent = TRUE;
pH263Cap->cif4MPI = params->MPI;
- }else if(params->picFormat == OO_PICFORMAT_CIF16)
- {
+ }
+ else if(params->picFormat == OO_PICFORMAT_CIF16) {
pH263Cap->m.cif16MPIPresent = TRUE;
pH263Cap->cif16MPI = params->MPI;
}
@@ -982,10 +1001,11 @@
{
if(pH263Cap->m.sqcifMPIPresent)
{
- if(params->picFormat != OO_PICFORMAT_SQCIF)
+ if(params->picFormat != OO_PICFORMAT_SQCIF)
{
return FALSE;
- }else{
+ }
+ else{
if(pH263Cap->sqcifMPI >= params->MPI)
return TRUE;
else
@@ -997,7 +1017,8 @@
if(params->picFormat != OO_PICFORMAT_QCIF)
{
return FALSE;
- }else{
+ }
+ else{
if(pH263Cap->qcifMPI >= params->MPI)
return TRUE;
else
@@ -1009,7 +1030,8 @@
if(params->picFormat != OO_PICFORMAT_CIF)
{
return FALSE;
- }else{
+ }
+ else{
if(pH263Cap->cifMPI >= params->MPI)
return TRUE;
else
@@ -1021,7 +1043,8 @@
if(params->picFormat != OO_PICFORMAT_CIF4)
{
return FALSE;
- }else{
+ }
+ else{
if(pH263Cap->cif4MPI >= params->MPI)
return TRUE;
else
@@ -1033,7 +1056,8 @@
if(params->picFormat != OO_PICFORMAT_CIF16)
{
return FALSE;
- }else{
+ }
+ else{
if(pH263Cap->cif16MPI >= params->MPI)
return TRUE;
else
@@ -1050,7 +1074,8 @@
if(params->picFormat != OO_PICFORMAT_SQCIF)
{
return FALSE;
- }else{
+ }
+ else{
if(pH263Cap->sqcifMPI <= params->MPI)
return TRUE;
else
@@ -1062,7 +1087,8 @@
if(params->picFormat != OO_PICFORMAT_QCIF)
{
return FALSE;
- }else{
+ }
+ else{
if(pH263Cap->qcifMPI <= params->MPI)
return TRUE;
else
@@ -1074,7 +1100,8 @@
if(params->picFormat != OO_PICFORMAT_CIF)
{
return FALSE;
- }else{
+ }
+ else{
if(pH263Cap->cifMPI <= params->MPI)
return TRUE;
else
@@ -1086,7 +1113,8 @@
if(params->picFormat != OO_PICFORMAT_CIF4)
{
return FALSE;
- }else{
+ }
+ else{
if(pH263Cap->cif4MPI <= params->MPI)
return TRUE;
else
@@ -1098,7 +1126,8 @@
if(params->picFormat != OO_PICFORMAT_CIF16)
{
return FALSE;
- }else{
+ }
+ else{
if(pH263Cap->cif16MPI <= params->MPI)
return TRUE;
else
@@ -1400,7 +1429,7 @@
cap = OO_G7231;
break;
default:
- return NULL;
+ return NULL;
}
OOTRACEDBGC4("Determined Simple audio data type to be of type %s. Searching"
@@ -1418,7 +1447,7 @@
while(cur)
{
OOTRACEDBGC4("Local cap being compared %s. (%s, %s)\n",
- ooGetCapTypeText(cur->cap),call->callType, call->callToken);
+ ooGetCapTypeText(cur->cap),call->callType, call->callToken);
if(cur->cap == cap && (cur->dir & dir))
break;
@@ -1593,8 +1622,8 @@
if(cur->cap == cap && (cur->dir & dir))
{
- if(((OOH263CapParams*)cur->params)->picFormat == picFormat)
- break;
+ if(((OOH263CapParams*)cur->params)->picFormat == picFormat)
+ break;
}
cur = cur->next;
}
@@ -1609,16 +1638,16 @@
if(mpi < ((OOH263CapParams*)cur->params)->MPI)
return NULL;
else{
- epCap = (ooH323EpCapability*)memAlloc(call->pctxt,
+ epCap = (ooH323EpCapability*)memAlloc(call->pctxt,
sizeof(ooH323EpCapability));
params = (OOH263CapParams*) memAlloc(call->pctxt,
sizeof(OOH263CapParams));
if(!epCap || !params)
{
- OOTRACEERR3("Error:Memory - ooIsVideoDataTypeH263Supported - "
+ OOTRACEERR3("Error:Memory - ooIsVideoDataTypeH263Supported - "
"epCap/params. (%s, %s)\n", call->callType,
call->callToken);
- return NULL;
+ return NULL;
}
epCap->params = params;
epCap->cap = cur->cap;
@@ -1734,7 +1763,7 @@
return ooIsVideoDataTypeSupported(call, data->u.videoData, dir);
case T_H245DataType_audioData:
OOTRACEDBGC3("Looking for audio dataType support. (%s, %s)\n",
- call->callType, call->callToken);
+ call->callType, call->callToken);
return ooIsAudioDataTypeSupported(call, data->u.audioData, dir);
case T_H245DataType_data:
OOTRACEDBGC3("Data type not supported.(%s, %s)\n",
@@ -1888,7 +1917,7 @@
}
int ooAddRemoteAudioCapability(OOH323CallData *call,
- H245AudioCapability *audioCap,
+ H245AudioCapability *audioCap,
int dir)
{
int rxframes=0, txframes=0;
@@ -2025,9 +2054,10 @@
{
call->jointDtmfMode |= OO_CAP_DTMF_H245_alphanumeric;
return OO_OK;
- }else if((cap->u.receiveUserInputCapability->t ==
- T_H245UserInputCapability_dtmf) &&
- (call->dtmfmode & OO_CAP_DTMF_H245_signal))
+ }
+ else if((cap->u.receiveUserInputCapability->t ==
+ T_H245UserInputCapability_dtmf) &&
+ (call->dtmfmode & OO_CAP_DTMF_H245_signal))
{
call->jointDtmfMode |= OO_CAP_DTMF_H245_signal;
return OO_OK;
@@ -2055,7 +2085,7 @@
}
OOTRACEDBGC3("Not adding to joint capabilities. (%s, %s)\n", call->callType,
- call->callToken);
+ call->callToken);
return OO_OK;
}
Modified: trunk/asterisk-ooh323c/ooh323c/src/ooCapability.h
URL: http://svn.digium.com/view/asterisk-addons/trunk/asterisk-ooh323c/ooh323c/src/ooCapability.h?rev=188&r1=187&r2=188&view=diff
==============================================================================
--- trunk/asterisk-ooh323c/ooh323c/src/ooCapability.h (original)
+++ trunk/asterisk-ooh323c/ooh323c/src/ooCapability.h Wed Jan 18 17:11:09 2006
@@ -487,8 +487,8 @@
*/
ASN1BOOL ooCapabilityCheckCompatibility(struct OOH323CallData *call,
- ooH323EpCapability *epCap,
- H245DataType *dataType, int dir);
+ ooH323EpCapability *epCap,
+ H245DataType *dataType, int dir);
/**
Modified: trunk/asterisk-ooh323c/ooh323c/src/ooCmdChannel.c
URL: http://svn.digium.com/view/asterisk-addons/trunk/asterisk-ooh323c/ooh323c/src/ooCmdChannel.c?rev=188&r1=187&r2=188&view=diff
==============================================================================
--- trunk/asterisk-ooh323c/ooh323c/src/ooCmdChannel.c (original)
+++ trunk/asterisk-ooh323c/ooh323c/src/ooCmdChannel.c Wed Jan 18 17:11:09 2006
@@ -68,9 +68,6 @@
}
else
{
-
- //TODO:Need to add support for multihomed to work with channel driver
-
/*
bind socket to a port before connecting. Thus avoiding
implicit bind done by a connect call. Avoided on windows as
@@ -156,7 +153,8 @@
{
OOTRACEINFO1("Ignoring stack command as Gk Client is not registered"
" yet\n");
- }else {
+ }
+ else {
switch(cmd.type) {
case OO_CMD_MAKECALL:
OOTRACEINFO2("Processing MakeCall command %s\n",
Modified: trunk/asterisk-ooh323c/ooh323c/src/ooDateTime.c
URL: http://svn.digium.com/view/asterisk-addons/trunk/asterisk-ooh323c/ooh323c/src/ooDateTime.c?rev=188&r1=187&r2=188&view=diff
==============================================================================
--- trunk/asterisk-ooh323c/ooh323c/src/ooDateTime.c (original)
+++ trunk/asterisk-ooh323c/ooh323c/src/ooDateTime.c Wed Jan 18 17:11:09 2006
@@ -24,7 +24,7 @@
{
struct _timeb currSysTime;
_ftime(&currSysTime);
-
+
tv->tv_sec = currSysTime.time;
tv->tv_usec = currSysTime.millitm * 1000;
Modified: trunk/asterisk-ooh323c/ooh323c/src/ooGkClient.c
URL: http://svn.digium.com/view/asterisk-addons/trunk/asterisk-ooh323c/ooh323c/src/ooGkClient.c?rev=188&r1=187&r2=188&view=diff
==============================================================================
--- trunk/asterisk-ooh323c/ooh323c/src/ooGkClient.c (original)
+++ trunk/asterisk-ooh323c/ooh323c/src/ooGkClient.c Wed Jan 18 17:11:09 2006
@@ -87,7 +87,8 @@
{
OOTRACEINFO2("Using local RAS Ip address %s\n", cur->addr);
strcpy(pGkClient->localRASIP, cur->addr);
- }else{
+ }
+ else{
OOTRACEERR1("Error:Failed to assign a local RAS IP address\n");
return OO_FAILED;
}
@@ -153,10 +154,11 @@
OOTRACEINFO1("\tGatekeeper mode - UseSpecificGatekeeper\n");
OOTRACEINFO3("\tGatekeeper To Use - %s:%d\n", pGkClient->gkRasIP,
pGkClient->gkRasPort);
- }else if(pGkClient->gkMode == RasDiscoverGatekeeper)
- {
+ }
+ else if(pGkClient->gkMode == RasDiscoverGatekeeper) {
OOTRACEINFO1("\tGatekeeper mode - UseSpecificGatekeeper\n");
- }else{
+ }
+ else {
OOTRACEERR1("Invalid GatekeeperMode\n");
}
}
@@ -213,7 +215,7 @@
OOTRACEINFO1("Gatekeeper Mode - RasUseSpecificGatekeeper\n");
if(szGkAddr)
{
- if(strlen(szGkAddr)>MAX_IP_LEN)
+ if(strlen(szGkAddr)>MAX_IP_LEN)
{
OOTRACEERR2("Error:Invalid IP address specified - %s\n", szGkAddr);
return OO_FAILED;
@@ -227,11 +229,11 @@
OOTRACEINFO3("Gatekeeper IP:port set to - %s:%d\n",
szGkAddr, pGkClient->gkRasPort);
- }else if(eGkMode == RasDiscoverGatekeeper)
- {
+ }
+ else if(eGkMode == RasDiscoverGatekeeper) {
OOTRACEINFO1("Gatekeeper Mode - RasDiscoverGatekeeper\n");
- }else if(eGkMode == RasNoGatekeeper)
- {
+ }
+ else if(eGkMode == RasNoGatekeeper) {
OOTRACEINFO1("Gatekeeper Mode - RasNoGatekeeper\n");
}
return OO_OK;
@@ -412,7 +414,7 @@
if(iRet != OO_OK)
{
OOTRACEERR1("Error: Failed to handle received RAS message\n");
- //pGkClient->state = GkClientFailed;
+ //pGkClient->state = GkClientFailed;
}
memReset(pctxt);
}
@@ -567,16 +569,17 @@
OOTRACEERR1("Error sending RAS message\n");
return OO_FAILED;
}
- }else if(pGkClient->gkMode == RasDiscoverGatekeeper &&
- !pGkClient->discoveryComplete)
- {
+ }
+ else if(pGkClient->gkMode == RasDiscoverGatekeeper &&
+ !pGkClient->discoveryComplete) {
if(ASN_OK != ooSocketSendTo(pGkClient->rasSocket, msgPtr, iLen,
MULTICAST_GKADDRESS, MULTICAST_GKPORT))
{
OOTRACEERR1("Error sending multicast RAS message\n" );
return OO_FAILED;
}
- }else {/* should never go here */
+ }
+ else {/* should never go here */
OOTRACEERR1("Error: GkClient in invalid state.\n");
return OO_FAILED;
}
@@ -1072,7 +1075,8 @@
{
ooGkClientUpdateRegisteredAliases(pGkClient,
&pRegistrationConfirm->terminalAlias, TRUE);
- }else{/* Everything registered*/
+ }
+ else{/* Everything registered*/
ooGkClientUpdateRegisteredAliases(pGkClient, NULL, TRUE);
}
@@ -1109,7 +1113,8 @@
return OO_FAILED;
}
- }else{
+ }
+ else{
pGkClient->regTimeout = 0;
OOTRACEINFO1("Gatekeeper does not support KeepAlive.\n");
}
@@ -1379,7 +1384,8 @@
OOTRACEINFO1("Gatekeeper requested a list of aliases be unregistered\n");
ooGkClientUpdateRegisteredAliases(pGkClient,
&punregistrationRequest->endpointAlias, FALSE);
- }else{
+ }
+ else{
OOTRACEINFO1("Gatekeeper requested a all aliases to be unregistered\n");
ooGkClientUpdateRegisteredAliases(pGkClient, NULL, FALSE);
@@ -1521,7 +1527,8 @@
pAdmReq->srcCallSignalAddress.t = T_H225TransportAddress_ipAddress;
pAdmReq->srcCallSignalAddress.u.ipAddress = pIpAddressRemote;
}
- }else {
+ }
+ else {
pAdmReq->m.srcCallSignalAddressPresent = TRUE;
pAdmReq->srcCallSignalAddress.t = T_H225TransportAddress_ipAddress;
pAdmReq->srcCallSignalAddress.u.ipAddress = pIpAddressLocal;
@@ -1574,7 +1581,8 @@
destAliases = gH323ep.aliases;
srcAliases = call->remoteAliases;
- }else {
+ }
+ else {
if(call->ourAliases)
srcAliases = call->ourAliases;
else
@@ -1590,7 +1598,7 @@
if(OO_OK != ooPopulateAliasList(&pGkClient->msgCtxt, destAliases,
&pAdmReq->destinationInfo))
{
- OOTRACEERR1("Error:Failed to populate destination aliases - "
+ OOTRACEERR1("Error:Failed to populate destination aliases - "
"ARQ message\n");
pGkClient->state = GkClientFailed;
memReset(pctxt);
@@ -1672,7 +1680,8 @@
pCallAdmInfo->retries = 0;
pCallAdmInfo->requestSeqNum = pAdmReq->requestSeqNum;
dListAppend(&pGkClient->ctxt, &pGkClient->callsPendingList,pCallAdmInfo);
- }else{
+ }
+ else{
for(x=0; x<pGkClient->callsPendingList.count; x++)
{
pNode = dListFindByIndex(&pGkClient->callsPendingList, x);
@@ -1855,7 +1864,8 @@
" be matched with any pending call.\n",
pAdmissionReject->requestSeqNum);
return OO_OK;
- }else{
+ }
+ else{
call = pCallAdmInfo->call;
dListRemove(&pGkClient->callsPendingList, pNode);
memFreePtr(&pGkClient->ctxt, pCallAdmInfo);
@@ -2218,8 +2228,8 @@
"GkClient\n");
ooGkClientDestroy();
return OO_FAILED;
- }else if(pGkClient->state == GkClientGkErr)
- {
+ }
+ else if(pGkClient->state == GkClientGkErr) {
OOTRACEERR1("Error: Gatekeeper error. Either Gk not responding or "
"Gk sending invalid messages\n");
if(pGkClient->gkMode == RasUseSpecificGatekeeper)
[... 3360 lines stripped ...]
More information about the svn-commits
mailing list