[Asterisk-cvs] asterisk-addons/asterisk-ooh323c/ooh323c/src
ooCalls.c, 1.2, 1.3 ooCapability.h, 1.2, 1.3 oochannels.c, 1.2,
1.3 oochannels.h, 1.2, 1.3 ooh245.c, 1.2, 1.3
vphirke at lists.digium.com
vphirke at lists.digium.com
Thu May 26 12:43:58 CDT 2005
Update of /usr/cvsroot/asterisk-addons/asterisk-ooh323c/ooh323c/src
In directory mongoose.digium.com:/tmp/cvs-serv6942/ooh323c/src
Modified Files:
ooCalls.c ooCapability.h oochannels.c oochannels.h ooh245.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.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ooCalls.c 26 May 2005 13:34:36 -0000 1.2
+++ ooCalls.c 26 May 2005 16:48:00 -0000 1.3
@@ -259,6 +259,12 @@
memFreePtr(call->pctxt, call->pH245Channel);
}
}
+
+ /* Close H.245 listener, if not already closed */
+ if(call->h245listener)
+ {
+ ooCloseH245Listener(call);
+ }
/* Close H225 connection, if not already closed. */
if (0 != call->pH225Channel && 0 != call->pH225Channel->sock)
Index: ooCapability.h
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/asterisk-ooh323c/ooh323c/src/ooCapability.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ooCapability.h 26 May 2005 13:34:36 -0000 1.2
+++ ooCapability.h 26 May 2005 16:48:00 -0000 1.3
@@ -69,15 +69,6 @@
OOBOOL comfortNoise;
} ooGSMCapParams;
-typedef struct OOH263CapParams {
- unsigned sqcifMPI;
- unsigned qcifMPI;
- unsigned cifMPI;
- unsigned cif16MPI;
- unsigned maxBitRate;
- unsigned frameRate;
-} OOH263CapParams;
-
struct OOH323CallData;
#ifdef __cplusplus
Index: oochannels.c
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/asterisk-ooh323c/ooh323c/src/oochannels.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- oochannels.c 26 May 2005 13:34:36 -0000 1.2
+++ oochannels.c 26 May 2005 16:48:00 -0000 1.3
@@ -1255,14 +1255,21 @@
OOTRACEDBGC3("Closed H245 connection. (%s, %s)\n", call->callType,
call->callToken);
}
+ call->h245SessionState = OO_H245SESSION_CLOSED;
+
+ return OO_OK;
+}
+
+int ooCloseH245Listener(OOH323CallData *call)
+{
+ OOTRACEINFO3("Closing H.245 Listener (%s, %s)\n", call->callType,
+ call->callToken);
if(call->h245listener)
{
ooSocketClose(*(call->h245listener));
memFreePtr(call->pctxt, call->h245listener);
call->h245listener = NULL;
}
- call->h245SessionState = OO_H245SESSION_CLOSED;
-
return OO_OK;
}
Index: oochannels.h
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/asterisk-ooh323c/ooh323c/src/oochannels.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- oochannels.h 26 May 2005 13:34:36 -0000 1.2
+++ oochannels.h 26 May 2005 16:48:00 -0000 1.3
@@ -67,6 +67,14 @@
EXTERN int ooCreateH245Listener(struct OOH323CallData *call);
/**
+ * This function is used to close an H245 listener for a call.
+ * @param call Pointer to call for which H245 Listener has to be closed.
+ *
+ * @return OO_OK, on success. OO_FAILED, on failure.
+ */
+EXTERN int ooCloseH245Listener(struct OOH323CallData *call);
+
+/**
* This function is used to accept incoming H.225 connections.
* @param None
*
Index: ooh245.c
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/asterisk-ooh323c/ooh323c/src/ooh245.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ooh245.c 26 May 2005 13:34:36 -0000 1.2
+++ ooh245.c 26 May 2005 16:48:00 -0000 1.3
@@ -262,7 +262,7 @@
request->t = T_H245RequestMessage_terminalCapabilitySet;
request->u.terminalCapabilitySet = (H245TerminalCapabilitySet*)
- ASN1MALLOC(pctxt, sizeof(H245TerminalCapabilitySet));
+ memAlloc(pctxt, sizeof(H245TerminalCapabilitySet));
termCap = request->u.terminalCapabilitySet;
memset(termCap, 0, sizeof(H245TerminalCapabilitySet));
termCap->m.multiplexCapabilityPresent = 0;
@@ -325,7 +325,7 @@
continue;
}
/* Add Capabilities to Capability Table */
- entry = (H245CapabilityTableEntry*) ASN1MALLOC(pctxt,
+ entry = (H245CapabilityTableEntry*) memAlloc(pctxt,
sizeof(H245CapabilityTableEntry));
memset(entry, 0, sizeof(H245CapabilityTableEntry));
entry->m.capabilityPresent = 1;
@@ -351,7 +351,7 @@
OOTRACEWARN3("WARN:Failed to add RFC2833 cap to TCS(%s, %s)\n",
call->callType, call->callToken);
}else {
- entry = (H245CapabilityTableEntry*) ASN1MALLOC(pctxt,
+ entry = (H245CapabilityTableEntry*) memAlloc(pctxt,
sizeof(H245CapabilityTableEntry));
if(!entry)
{
@@ -385,7 +385,7 @@
/* Define capability descriptior */
capDesc = (H245CapabilityDescriptor*)
- ASN1MALLOC(pctxt, sizeof(H245CapabilityDescriptor));
+ memAlloc(pctxt, sizeof(H245CapabilityDescriptor));
memset(capDesc, 0, sizeof(H245CapabilityDescriptor));
capDesc->m.simultaneousCapabilitiesPresent = 1;
capDesc->capabilityDescriptorNumber = 1;
@@ -398,7 +398,7 @@
for(j=0; j<i; j++)
{
altSet = (H245AlternativeCapabilitySet*)
- ASN1MALLOC(pctxt, sizeof(H245AlternativeCapabilitySet));
+ memAlloc(pctxt, sizeof(H245AlternativeCapabilitySet));
memset(altSet, 0, sizeof(H245AlternativeCapabilitySet));
altSet->n = 1;
altSet->elem[0] = j+1;
@@ -2568,17 +2568,14 @@
return ret;
}
-int ooAddFastStartToSetup(OOH323CallData *call, H225Setup_UUIE *setup)
-{
- return OO_OK;
-}
+
/* Used to build Audio OLCs for fast connect. Keep in mind that forward and
reverse
are always with respect to the endpoint which proposes channels
TODO: Need to clean logical channel in case of failure. */
int ooBuildOpenLogicalChannelAudio
- (OOH323CallData *call, H245OpenLogicalChannel *olc, ooH323EpCapability *epCap,
- OOCTXT*pctxt, int dir)
+ (OOH323CallData *call, H245OpenLogicalChannel *olc,
+ ooH323EpCapability *epCap, OOCTXT*pctxt, int dir)
{
int reverse=0, forward=0;
H245AudioCapability *audioCap=NULL;
More information about the svn-commits
mailing list