Update of /usr/cvsroot/asterisk-addons/asterisk-ooh323c/ooh323c/src
In directory localhost.localdomain:/tmp/cvs-serv7074/ooh323c/src
Modified Files:
ooCapability.c ooSocket.c ooStackCmds.c oochannels.c ooq931.c
ootypes.h printHandler.c
Log Message:
updated
Index: ooCapability.c
===================================================================
RCS file:
/usr/cvsroot/asterisk-addons/asterisk-ooh323c/ooh323c/src/ooCapability.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ooCapability.c 16 Jun 2005 19:41:23 -0000 1.3
+++ ooCapability.c 6 Jul 2005 12:49:54 -0000 1.4
@@ -794,6 +794,7 @@
case T_H245AudioCapability_g7231:
cap = OO_G7231;
noofframes = audioCap->u.g7231->maxAl_sduAudioFrames;
+ break;
default:
return FALSE;
}
Index: ooSocket.c
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/asterisk-ooh323c/ooh323c/src/ooSocket.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ooSocket.c 24 Jun 2005 21:01:49 -0000 1.4
+++ ooSocket.c 6 Jul 2005 12:49:54 -0000 1.5
@@ -663,7 +663,7 @@
}
strcpy(pIf->addr, addr);
-
+#ifdef ifr_netmask
if (ioctl(sock, SIOCGIFNETMASK, &ifReq) < 0)
{
OOTRACEWARN2("Warn:Unable to determine mask for interface %s\n",
@@ -686,7 +686,7 @@
return -1;
}
strcpy(pIf->mask, mask);
-
+#endif
pIf->next = NULL;
/* Add to the list */
Index: ooStackCmds.c
===================================================================
RCS file:
/usr/cvsroot/asterisk-addons/asterisk-ooh323c/ooh323c/src/ooStackCmds.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ooStackCmds.c 23 Jun 2005 21:05:26 -0000 1.4
+++ ooStackCmds.c 6 Jul 2005 12:49:54 -0000 1.5
@@ -111,6 +111,13 @@
int ooAnswerCall(char *callToken)
{
OOStackCommand *cmd;
+
+ if(!callToken)
+ {
+ OOTRACEERR1("ERROR: Invalid callToken passed to ooHangCall\n");
+ return OO_FAILED;
+ }
+
#ifdef _WIN32
EnterCriticalSection(&gCmdMutex);
#else
@@ -154,6 +161,12 @@
int ooForwardCall(char* callToken, char *dest)
{
OOStackCommand *cmd;
+
+ if(!callToken || !dest)
+ {
+ OOTRACEERR1("ERROR: Invalid callToken/dest passed to ooHangCall\n");
+ return OO_FAILED;
+ }
#ifdef _WIN32
EnterCriticalSection(&gCmdMutex);
#else
@@ -195,14 +208,22 @@
}
-int ooHangCall(char * callToken, OOCallClearReason reason)
+int ooHangCall(char *callToken, OOCallClearReason reason)
{
OOStackCommand *cmd;
+
+ if(!callToken)
+ {
+ OOTRACEERR1("ERROR: Invalid callToken passed to ooHangCall\n");
+ return OO_FAILED;
+ }
+
#ifdef _WIN32
EnterCriticalSection(&gCmdMutex);
#else
pthread_mutex_lock(&gCmdMutex);
#endif
+
cmd = (OOStackCommand*)memAlloc(&gH323ep.ctxt, sizeof(OOStackCommand));
if(!cmd)
{
Index: oochannels.c
===================================================================
RCS file:
/usr/cvsroot/asterisk-addons/asterisk-ooh323c/ooh323c/src/oochannels.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- oochannels.c 24 Jun 2005 21:01:49 -0000 1.6
+++ oochannels.c 6 Jul 2005 12:49:54 -0000 1.7
@@ -28,6 +28,10 @@
#include "ooh323ep.h"
#include "ooStackCmds.h"
+#ifdef HAVE_PTHREAD_H
+#include <pthread.h>
+#endif
+
/** Global endpoint structure */
extern OOH323EndPoint gH323ep;
Index: ooq931.c
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/asterisk-ooh323c/ooh323c/src/ooq931.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ooq931.c 27 Jun 2005 15:28:31 -0000 1.7
+++ ooq931.c 6 Jul 2005 12:49:54 -0000 1.8
@@ -28,6 +28,7 @@
#include "ooUtils.h"
#include <time.h>
+
/** Global endpoint structure */
extern OOH323EndPoint gH323ep;
Index: ootypes.h
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/asterisk-ooh323c/ooh323c/src/ootypes.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ootypes.h 16 Jun 2005 19:41:23 -0000 1.4
+++ ootypes.h 6 Jul 2005 12:49:54 -0000 1.5
@@ -55,6 +55,14 @@
#include "H323-MESSAGES.h"
#include "ooasn1.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_PTHREAD_H
+#include <pthread.h>
+#endif
+
#define OOH323C_VERSION "vxx.aa"
#ifndef EXTERN
Index: printHandler.c
===================================================================
RCS file:
/usr/cvsroot/asterisk-addons/asterisk-ooh323c/ooh323c/src/printHandler.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- printHandler.c 23 May 2005 21:03:55 -0000 1.1
+++ printHandler.c 6 Jul 2005 12:49:54 -0000 1.2
@@ -18,7 +18,9 @@
format..
*/
#include <stdlib.h>
+#ifdef HAVE_MALLOC_H
#include <malloc.h>
+#endif
#include "printHandler.h"
#include "ootypes.h"
#include "rtctype.h"
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
