git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6094 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/endpoints/mod_opal/Makefile.am

@@ -12,16 +12,14 @@ moddir=$(prefix)/mod
 
 MODNAME=mod_opal
 
-OPAL_DIR=$(switch_builddir)/libs/opal
+OPALDIR=$(switch_builddir)/libs/opal
 
 mod_LTLIBRARIES = mod_opal.la
 mod_opal_la_SOURCES = opalh323_backend.cpp mod_opalh323.cpp
-mod_opal_la_CFLAGS  = $(AM_CFLAGS) 
-mod_opal_la_CFLAGS += -I. -I$(OPAL_DIR)/include
-mod_opal_la_CPPFLAGS = $(AM_CPPFLAGS)
-mod_opal_la_CPPFLAGS += -I. -I$(OPAL_DIR)/include
+mod_opal_la_CPPFLAGS = $(AM_CPPFLAGS) -D_REENTRANT -fno-exceptions -Wall -DPTRACING -Os -felide-constructors -Wreorder -I$(OPALDIR)/include
+
 mod_opal_la_LIBADD = $(switch_builddir)/libfreeswitch.la    
-mod_opal_la_LDFLAGS = -avoid-version -module -no-undefined
+mod_opal_la_LDFLAGS = -avoid-version -module -no-undefined -export-symbols-regex ^switch_module_.*$ -rpath $(PREFIX)/$(libdir) -L$(OPALDIR)/lib -lopal_linux_x86_r -lpt_linux_x86_r -lpthread -lsasl2 -lssl -lcrypto -lexpat -ldl
 
 #Override the linstall target so we just install the .so/.dylib
 
@@ -34,5 +32,3 @@ $(DESTDIR)$(PREFIX)/$(moddir)/$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).la
 	else \
 	  $(LIBTOOL) --mode=install $(INSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/$(moddir) >/dev/null  ; \
 	fi
-
-##include $(OPAL_DIR)/opal_inc.mak

src/mod/endpoints/mod_opal/opalh323_backend.h

@@ -94,12 +94,27 @@ public:
     switch_status_t io_read_video_frame(switch_core_session_t *, switch_frame_t **, int, switch_io_flag_t, int);
     switch_status_t io_write_video_frame(switch_core_session_t *, switch_frame_t *, int, switch_io_flag_t, int);
     
+    virtual BOOL OnIncomingConnection(
+        OpalConnection & connection,   ///<  Connection that is calling
+        unsigned options,              ///<  options for new connection (can't use default as overrides will fail)
+        OpalConnection::StringOptions * stringOptions
+        );
+    virtual BOOL OnIncomingConnection(
+        OpalConnection & connection,   ///<  Connection that is calling
+        unsigned options               ///<  options for new connection (can't use default as overrides will fail)
+        );
+    
+    virtual BOOL OnIncomingConnection(
+        OpalConnection & connection   ///<  Connection that is calling
+        );
+        
+        
     
 private:          
     
-    void                   saveSessionToken(PString &i_token,switch_core_session_t* i_session);
-    switch_core_session_t* getSessionToken(PString &i_token);
-    void                   deleteToken(PString &i_token);
+    void                   saveSessionToken(const PString &i_token,switch_core_session_t* i_session);
+    switch_core_session_t* getSessionToken(const PString &i_token);
+    void                   deleteSessionToken(const PString &i_token);
     
     
     const char                          *m_pModuleName;             /* name of this module */