fix ozmod_sangoma_boost compilation and linking

git-svn-id: http://svn.openzap.org/svn/openzap/branches/sangoma_boost@917 a93c3328-9c30-0410-af19-c9cd2b2d52af

diff --git a/libs/freetdm/src/include/openzap.h b/libs/freetdm/src/include/openzap.h
index ddcb9b0133b62130469b3b9d5cb5fe21e8a3ee6c..b114e844fb3ee49b4428c16a43868906094ca9ca 100644 (file)
--- a/libs/freetdm/src/include/openzap.h
+++ b/libs/freetdm/src/include/openzap.h
@@ -617,9 +617,7 @@ struct zap_io_interface {
        zio_api_t api;
 };
 
-struct zap_queue;
-#define zap_queue_t struct zap_queue
-
+typedef struct zap_queue zap_queue_t;
 typedef zap_status_t (*zap_queue_create_func_t)(zap_queue_t **queue, zap_size_t capacity);
 typedef zap_status_t (*zap_queue_enqueue_func_t)(zap_queue_t *queue, void *obj);
 typedef void *(*zap_queue_dequeue_func_t)(zap_queue_t *queue);

diff --git a/libs/freetdm/src/include/zap_dso.h b/libs/freetdm/src/include/zap_dso.h
index 9cfe87e962951eeb2df22e310754dec30ab52786..c5d1457b9580b3d8983b90ec2e0703e83a2fd416 100644 (file)
--- a/libs/freetdm/src/include/zap_dso.h
+++ b/libs/freetdm/src/include/zap_dso.h
@@ -28,9 +28,9 @@ extern "C" {
 typedef void (*zap_func_ptr_t) (void);
 typedef void * zap_dso_lib_t;
 
-void zap_dso_destroy(zap_dso_lib_t *lib);
-zap_dso_lib_t zap_dso_open(const char *path, char **err);
-void *zap_dso_func_sym(zap_dso_lib_t lib, const char *sym, char **err);
+OZ_DECLARE(void) zap_dso_destroy(zap_dso_lib_t *lib);
+OZ_DECLARE(zap_dso_lib_t) zap_dso_open(const char *path, char **err);
+OZ_DECLARE(void *) zap_dso_func_sym(zap_dso_lib_t lib, const char *sym, char **err);
 
 #ifdef __cplusplus
 }

diff --git a/libs/freetdm/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.2008.vcproj b/libs/freetdm/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.2008.vcproj
index 3f7ef8de43e166839385b691fcfcb70a179654c1..ee9bae316b1df6cdd4a9b0a928702665852238b4 100644 (file)
--- a/libs/freetdm/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.2008.vcproj
+++ b/libs/freetdm/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.2008.vcproj
@@ -63,7 +63,9 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
+                               AdditionalDependencies="openzap.lib"\r
                                LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                TargetMachine="1"\r

diff --git a/libs/freetdm/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.c b/libs/freetdm/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.c
index 60cda5467537b201f0a44227f80c45ad49d9a94d..f40669d9285c3c48ee7b23fc5f58767757902abd 100644 (file)
--- a/libs/freetdm/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.c
+++ b/libs/freetdm/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.c
@@ -1374,14 +1374,19 @@ static sangomabc_event_t *zap_boost_read_event(zap_span_t *span)
        mcon = &sangoma_boost_data->mcon;
        pcon = &sangoma_boost_data->pcon;
 
-       if (sangoma_boost_data->sigmod || FD_ISSET(pcon->socket, &sangoma_boost_data->rfds)) {
+       if (sangoma_boost_data->sigmod 
+#ifndef WIN32
+               || FD_ISSET(pcon->socket, &sangoma_boost_data->rfds)
+#endif
+               ) {
                event = sangomabc_connection_readp(pcon, sangoma_boost_data->iteration);
        }
-
+#ifndef WIN32
        /* if there is no event and this is not a sigmod-driven span it's time to try the other connection for events */
        if (!event && !sangoma_boost_data->sigmod && FD_ISSET(mcon->socket, &sangoma_boost_data->rfds)) {
                event = sangomabc_connection_readp(mcon, sangoma_boost_data->iteration);
        }
+#endif
        return event;
 }
 

diff --git a/libs/freetdm/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.2008.vcproj b/libs/freetdm/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.2008.vcproj
index 1c8685c6d47819d2637834cd75bde485a3d0ab8d..eb4cecb32dd8f560c599f971f5da78284211b06c 100644 (file)
--- a/libs/freetdm/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.2008.vcproj
+++ b/libs/freetdm/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.2008.vcproj
@@ -41,7 +41,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../../src/include;../../../src/isdn/include;../../../wanpipe/include"\r
+                               AdditionalIncludeDirectories="../../../src/include;../../../src/isdn/include;C:\wanpipe\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -64,7 +64,7 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="openzap.lib libsangoma.lib"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;../../../wanpipe/api/lib/x86"\r
+                               AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;C:\wanpipe\lib"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                RandomizedBaseAddress="1"\r

diff --git a/libs/freetdm/src/zap_dso.c b/libs/freetdm/src/zap_dso.c
index eefe6e819cd5adc0d4fbc69d5ce7d20f21281735..b222e242311a334dd6ec05b1185c07f21dab0298 100644 (file)
--- a/libs/freetdm/src/zap_dso.c
+++ b/libs/freetdm/src/zap_dso.c
@@ -27,14 +27,14 @@
 #include <stdio.h>
 
 
-void zap_dso_destroy(zap_dso_lib_t *lib) {
+OZ_DECLARE(void) zap_dso_destroy(zap_dso_lib_t *lib) {
        if (lib && *lib) {
                FreeLibrary(*lib);
                *lib = NULL;
        }
 }
 
-zap_dso_lib_t zap_dso_open(const char *path, char **err) {
+OZ_DECLARE(zap_dso_lib_t) zap_dso_open(const char *path, char **err) {
     HINSTANCE lib;
        
        lib = LoadLibraryEx(path, NULL, 0);
@@ -53,7 +53,7 @@ zap_dso_lib_t zap_dso_open(const char *path, char **err) {
        return lib;
 }
 
-void* zap_dso_func_sym(zap_dso_lib_t lib, const char *sym, char **err) {
+OZ_DECLARE(void*) zap_dso_func_sym(zap_dso_lib_t lib, const char *sym, char **err) {
        FARPROC func = GetProcAddress(lib, sym);
        if (!func) {
                DWORD error = GetLastError();
@@ -78,14 +78,14 @@ void* zap_dso_func_sym(zap_dso_lib_t lib, const char *sym, char **err) {
 
 #include <dlfcn.h>
 
-void zap_dso_destroy(zap_dso_lib_t *lib) {
+OZ_DECLARE(void) zap_dso_destroy(zap_dso_lib_t *lib) {
        if (lib && *lib) {
                dlclose(*lib);
                *lib = NULL;
        }
 }
 
-zap_dso_lib_t zap_dso_open(const char *path, char **err) {
+OZ_DECLARE(zap_dso_lib_t) zap_dso_open(const char *path, char **err) {
        void *lib = dlopen(path, RTLD_NOW | RTLD_LOCAL);
        if (lib == NULL) {
                *err = zap_strdup(dlerror());
@@ -93,7 +93,7 @@ zap_dso_lib_t zap_dso_open(const char *path, char **err) {
        return lib;
 }
 
-void *zap_dso_func_sym(zap_dso_lib_t lib, const char *sym, char **err) {
+OZ_DECLARE(void*) zap_dso_func_sym(zap_dso_lib_t lib, const char *sym, char **err) {
        void *func = dlsym(lib, sym);
        if (!func) {
                *err = zap_strdup(dlerror());

diff --git a/libs/freetdm/src/zap_queue.c b/libs/freetdm/src/zap_queue.c
index 6a0a05d683adeffcee034aef58ae7ce5d7d5aea3..969e1707834ab6f1bd25f9b1e0c2b68a507b7747 100644 (file)
--- a/libs/freetdm/src/zap_queue.c
+++ b/libs/freetdm/src/zap_queue.c
@@ -34,8 +34,13 @@
 
 #include "openzap.h"
 
-#undef zap_queue_t
-typedef struct zap_queue {
+static zap_status_t zap_std_queue_create(zap_queue_t **outqueue, zap_size_t capacity);
+static zap_status_t zap_std_queue_enqueue(zap_queue_t *queue, void *obj);
+static void *zap_std_queue_dequeue(zap_queue_t *queue);
+static zap_status_t zap_std_queue_wait(zap_queue_t *queue, int ms);
+static zap_status_t zap_std_queue_destroy(zap_queue_t **inqueue);
+
+struct zap_queue {
        zap_mutex_t *mutex;
        zap_condition_t *condition;
        zap_size_t capacity;
@@ -43,21 +48,15 @@ typedef struct zap_queue {
        unsigned rindex;
        unsigned windex;
        void **elements;
-} zap_queue_t;
-
-static zap_status_t zap_std_queue_create(zap_queue_t **outqueue, zap_size_t capacity);
-static zap_status_t zap_std_queue_enqueue(zap_queue_t *queue, void *obj);
-static void *zap_std_queue_dequeue(zap_queue_t *queue);
-static zap_status_t zap_std_queue_wait(zap_queue_t *queue, int ms);
-static zap_status_t zap_std_queue_destroy(zap_queue_t **inqueue);
+};
 
 OZ_DECLARE_DATA zap_queue_handler_t g_zap_queue_handler = 
 {
-       .create = zap_std_queue_create,
-       .enqueue = zap_std_queue_enqueue,
-       .dequeue = zap_std_queue_dequeue,
-       .wait = zap_std_queue_wait,
-       .destroy = zap_std_queue_destroy
+       /*.create = */ zap_std_queue_create,
+       /*.enqueue = */ zap_std_queue_enqueue,
+       /*.dequeue = */ zap_std_queue_dequeue,
+       /*.wait = */ zap_std_queue_wait,
+       /*.destroy = */ zap_std_queue_destroy
 };
 
 OZ_DECLARE(zap_status_t) zap_global_set_queue_handler(zap_queue_handler_t *handler)
@@ -76,11 +75,12 @@ OZ_DECLARE(zap_status_t) zap_global_set_queue_handler(zap_queue_handler_t *handl
 
 static zap_status_t zap_std_queue_create(zap_queue_t **outqueue, zap_size_t capacity)
 {
+       zap_queue_t *queue = NULL;
        zap_assert_return(outqueue, ZAP_FAIL, "Queue double pointer is null\n");
        zap_assert_return(capacity > 0, ZAP_FAIL, "Queue capacity is not bigger than 0\n");
 
        *outqueue = NULL;
-       zap_queue_t *queue = zap_calloc(1, sizeof(*queue));
+       queue = zap_calloc(1, sizeof(*queue));
        if (!queue) {
                return ZAP_FAIL;
        }