Update of /usr/cvsroot/asterisk-addons/asterisk-ooh323c/src
In directory mongoose.digium.com:/tmp/cvs-serv18763/src
Modified Files:
chan_h323.c chan_h323.h ooh323cDriver.c
Log Message:
Updated stack source as well as channel driver
Index: chan_h323.c
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/asterisk-ooh323c/src/chan_h323.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- chan_h323.c 12 Oct 2005 01:54:32 -0000 1.12
+++ chan_h323.c 26 Oct 2005 20:49:41 -0000 1.13
@@ -46,52 +46,52 @@
/* Channel Definition */
-static struct ast_channel *h323_request(const char *type, int format,
+static struct ast_channel *ooh323_request(const char *type, int format,
void *data, int *cause);
-static int h323_digit(struct ast_channel *ast, char digit);
-static int h323_call(struct ast_channel *ast, char *dest, int timeout);
-static int h323_hangup(struct ast_channel *ast);
-static int h323_answer(struct ast_channel *ast);
-static struct ast_frame *h323_read(struct ast_channel *ast);
[...1696 lines suppressed...]
if (p->owner)
{
@@ -3079,7 +2966,7 @@
}
-int h323_convert_hangupcause_asteriskToH323(int cause)
+int ooh323_convert_hangupcause_asteriskToH323(int cause)
{
switch(cause)
{
@@ -3107,7 +2994,7 @@
}
-int h323_convert_hangupcause_h323ToAsterisk(int cause)
+int ooh323_convert_hangupcause_h323ToAsterisk(int cause)
{
switch(cause) {
case OO_REASON_REMOTE_REJECTED:
Index: chan_h323.h
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/asterisk-ooh323c/src/chan_h323.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- chan_h323.h 2 Sep 2005 14:27:10 -0000 1.2
+++ chan_h323.h 26 Oct 2005 20:49:41 -0000 1.3
@@ -53,10 +53,10 @@
#include <fcntl.h>
#include <sys/signal.h>
-#include <ootypes.h>
-#include <ooCapability.h>
-#include <oochannels.h>
-#include <ooh323ep.h>
+#include "ootypes.h"
+#include "ooCapability.h"
+#include "oochannels.h"
+#include "ooh323ep.h"
#include "ooh323cDriver.h"
#include "ooCalls.h"
#include "ooq931.h"
@@ -65,42 +65,42 @@
#include "ooGkClient.h"
-struct h323_pvt;
-struct h323_user;
-struct h323_peer;
+struct ooh323_pvt;
+struct ooh323_user;
+struct ooh323_peer;
/* Helper functions */
-struct h323_user *find_user(const char * name);
-struct h323_peer *find_peer(const char * name);
-void h323_delete_peer(struct h323_peer *peer);
+struct ooh323_user *find_user(const char * name);
+struct ooh323_peer *find_peer(const char * name);
+void ooh323_delete_peer(struct ooh323_peer *peer);
int delete_users(void);
int delete_peers(void);
-int h323_destroy(struct h323_pvt *p);
+int ooh323_destroy(struct ooh323_pvt *p);
int reload_config(void);
int restart_monitor(void);
int unload_module(void);
-int configure_local_rtp(struct h323_pvt *p, ooCallData* call);
+int configure_local_rtp(struct ooh323_pvt *p, ooCallData* call);
void setup_rtp_connection(ooCallData *call, const char *remoteIp,
int remotePort);
void close_rtp_connection(ooCallData *call);
-struct ast_frame *h323_rtp_read
- (struct ast_channel *ast, struct h323_pvt *p);
+struct ast_frame *ooh323_rtp_read
+ (struct ast_channel *ast, struct ooh323_pvt *p);
-void h323_set_write_format(ooCallData *call, int fmt);
-void h323_set_read_format(ooCallData *call, int fmt);
+void ooh323_set_write_format(ooCallData *call, int fmt);
+void ooh323_set_read_format(ooCallData *call, int fmt);
-int h323_update_capPrefsOrderForCall
+int ooh323_update_capPrefsOrderForCall
(ooCallData *call, struct ast_codec_pref *prefs);
-int h323_convertAsteriskCapToH323Cap(int cap);
+int ooh323_convertAsteriskCapToH323Cap(int cap);
-int h323_convert_hangupcause_asteriskToH323(int cause);
-int h323_convert_hangupcause_h323ToAsterisk(int cause);
-int update_our_aliases(ooCallData *call, struct h323_pvt *p);
+int ooh323_convert_hangupcause_asteriskToH323(int cause);
+int ooh323_convert_hangupcause_h323ToAsterisk(int cause);
+int update_our_aliases(ooCallData *call, struct ooh323_pvt *p);
/* h323 msg callbacks */
-int h323_onReceivedSetup(ooCallData *call, Q931Message *pmsg);
-int h323_onReceivedDigit(OOH323CallData *call, const char* digit);
+int ooh323_onReceivedSetup(ooCallData *call, Q931Message *pmsg);
+int ooh323_onReceivedDigit(OOH323CallData *call, const char* digit);
#endif
Index: ooh323cDriver.c
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/asterisk-ooh323c/src/ooh323cDriver.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ooh323cDriver.c 2 Sep 2005 14:27:10 -0000 1.5
+++ ooh323cDriver.c 26 Oct 2005 20:49:41 -0000 1.6
@@ -251,7 +251,7 @@
int fmt=-1;
fmt = convertH323CapToAsteriskCap(pChannel->chanCap->cap);
if(fmt>0)
- h323_set_read_format(call, fmt);
+ ooh323_set_read_format(call, fmt);
else{
ast_log(LOG_ERROR, "Invalid capability type for receive channel %s\n",
call->callToken);
@@ -265,7 +265,7 @@
int fmt=-1;
fmt = convertH323CapToAsteriskCap(pChannel->chanCap->cap);
if(fmt>0)
- h323_set_write_format(call, fmt);
+ ooh323_set_write_format(call, fmt);
else{
ast_log(LOG_ERROR, "Invalid capability type for receive channel %s\n",
call->callToken);
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
