some more alterations to prep for boost

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@406 a93c3328-9c30-0410-af19-c9cd2b2d52af

diff --git a/libs/openzap/src/include/openzap.h b/libs/openzap/src/include/openzap.h
index 705ac4bb5e2cb0b1fad73212b9315bcdd44cbbba..4c48e2baab5f0964417ea621738fbc2b6c74c20f 100644 (file)
--- a/libs/openzap/src/include/openzap.h
+++ b/libs/openzap/src/include/openzap.h
@@ -428,6 +428,7 @@ struct zap_span {
        zap_channel_t *channels_local_crv[32768];
        zap_channel_t *channels_remote_crv[32768];
        zio_channel_outgoing_call_t outgoing_call;
+       zio_channel_request_t channel_request;
        void *mod_data;
        char *type;
 };

diff --git a/libs/openzap/src/include/zap_types.h b/libs/openzap/src/include/zap_types.h
index 7e49ce5f628ad1e7400da8626c4c877014d7892b..3465eca470bf6ecf7055b4da9670f30d5b04158c 100644 (file)
--- a/libs/openzap/src/include/zap_types.h
+++ b/libs/openzap/src/include/zap_types.h
@@ -163,7 +163,8 @@ typedef enum {
        ZAP_SIGTYPE_NONE,
        ZAP_SIGTYPE_ISDN,
        ZAP_SIGTYPE_RBS,
-       ZAP_SIGTYPE_ANALOG
+       ZAP_SIGTYPE_ANALOG,
+       ZAP_SIGTYPE_SS7BOOST
 } zap_signal_type_t;
 
 typedef enum {
@@ -336,6 +337,7 @@ typedef struct zap_event zap_event_t;
 typedef struct zap_sigmsg zap_sigmsg_t;
 typedef struct zap_span zap_span_t;
 
+#define ZIO_CHANNEL_REQUEST_ARGS (zap_span_t *span, zap_direction_t direction, zap_channel_t **zchan)
 #define ZIO_CHANNEL_OUTGOING_CALL_ARGS (zap_channel_t *zchan)
 #define ZIO_SPAN_POLL_EVENT_ARGS (zap_span_t *span, uint32_t ms)
 #define ZIO_SPAN_NEXT_EVENT_ARGS (zap_span_t *span, zap_event_t **event)
@@ -354,6 +356,7 @@ typedef struct zap_span zap_span_t;
 #define ZIO_READ_ARGS (zap_channel_t *zchan, void *data, zap_size_t *datalen)
 #define ZIO_WRITE_ARGS (zap_channel_t *zchan, void *data, zap_size_t *datalen)
 
+typedef zap_status_t (*zio_channel_request_t) ZIO_CHANNEL_REQUEST_ARGS ;
 typedef zap_status_t (*zio_channel_outgoing_call_t) ZIO_CHANNEL_OUTGOING_CALL_ARGS ;
 typedef zap_status_t (*zio_span_poll_event_t) ZIO_SPAN_POLL_EVENT_ARGS ;
 typedef zap_status_t (*zio_span_next_event_t) ZIO_SPAN_NEXT_EVENT_ARGS ;
@@ -372,6 +375,7 @@ typedef zap_status_t (*zio_wait_t) ZIO_WAIT_ARGS ;
 typedef zap_status_t (*zio_read_t) ZIO_READ_ARGS ;
 typedef zap_status_t (*zio_write_t) ZIO_WRITE_ARGS ;
 
+#define ZIO_CHANNEL_REQUEST_FUNCTION(name) zap_status_t name ZIO_CHANNEL_REQUEST_ARGS
 #define ZIO_CHANNEL_OUTGOING_CALL_FUNCTION(name) zap_status_t name ZIO_CHANNEL_OUTGOING_CALL_ARGS
 #define ZIO_SPAN_POLL_EVENT_FUNCTION(name) zap_status_t name ZIO_SPAN_POLL_EVENT_ARGS
 #define ZIO_SPAN_NEXT_EVENT_FUNCTION(name) zap_status_t name ZIO_SPAN_NEXT_EVENT_ARGS

diff --git a/libs/openzap/src/zap_io.c b/libs/openzap/src/zap_io.c
index 3f0cb2810be53fd2841a85e4d84b456b4680246f..f128037ba3ff537324ba1d70f67484b3ea49dd19 100644 (file)
--- a/libs/openzap/src/zap_io.c
+++ b/libs/openzap/src/zap_io.c
@@ -689,6 +689,11 @@ zap_status_t zap_channel_open_any(uint32_t span_id, zap_direction_t direction, z
 
        zap_mutex_lock(globals.mutex);
 
+       if (span_id && globals.spans[span_id].channel_request) {
+               status = globals.spans[span_id].channel_request(&globals.spans[span_id], direction, zchan);
+               goto done;
+       }
+
        if (span_id) {
                span_max = span_id;
                j = span_id;
@@ -846,6 +851,11 @@ zap_status_t zap_channel_open(uint32_t span_id, uint32_t chan_id, zap_channel_t
 
        zap_mutex_lock(globals.mutex);
 
+       if (span_id && globals.spans[span_id].channel_request) {
+               zap_log(ZAP_LOG_ERROR, "Individual channel selection not implemented on this span.\n");
+               goto done;
+       }
+
        if (span_id < ZAP_MAX_SPANS_INTERFACE && chan_id < ZAP_MAX_CHANNELS_SPAN) {
                zap_channel_t *check;