make error more clear about missing trunk_type param in openzap.conf (and auto tolera...

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

diff --git a/libs/openzap/mod_openzap/mod_openzap.c b/libs/openzap/mod_openzap/mod_openzap.c
index c562808ac9cd95af44fada3477f6edb758c46e7d..935f367c6109d16d84e3d0a9df1a98285b3a59f9 100644 (file)
--- a/libs/openzap/mod_openzap/mod_openzap.c
+++ b/libs/openzap/mod_openzap/mod_openzap.c
@@ -1897,7 +1897,7 @@ static switch_status_t load_config(void)
                                                                   "q921loglevel", q921loglevel,
                                                                   "q931loglevel", q931loglevel,
                                                                   TAG_END) != ZAP_SUCCESS) {
-                               zap_log(ZAP_LOG_ERROR, "Error starting OpenZAP span %d mode: %d dialect: %d error: %s\n", span_id, mode, dialect, span->last_error);
+                               zap_log(ZAP_LOG_ERROR, "Error starting OpenZAP span %d mode: %s dialect: %s error: %s\n", span_id, mode, dialect, span->last_error);
                                continue;
                        }
 

diff --git a/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.c b/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.c
index 23f5acd8d8ec8a347934b1f8d734140b08b1aceb..c374eeded4bca06a644cf49510d45f33cdba55e5 100644 (file)
--- a/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.c
+++ b/libs/openzap/src/ozmod/ozmod_isdn/ozmod_isdn.c
@@ -1703,8 +1703,8 @@ static ZIO_SIG_CONFIGURE_FUNCTION(zap_isdn_configure_span)
        }
 
        if (span->trunk_type >= ZAP_TRUNK_NONE) {
-               snprintf(span->last_error, sizeof(span->last_error), "Unknown trunk type!");
-               return ZAP_FAIL;
+               zap_log(ZAP_LOG_WARNING, "Invalid trunk type '%s' defaulting to T1.\n", zap_trunk_type2str(span->trunk_type));
+               span->trunk_type = ZAP_TRUNK_T1;
        }
        
        for(i = 1; i <= span->chan_count; i++) {
@@ -1785,6 +1785,7 @@ static ZIO_SIG_CONFIGURE_FUNCTION(zap_isdn_configure_span)
                }
        }
 
+
        if (!digit_timeout) {
                digit_timeout = DEFAULT_DIGIT_TIMEOUT;
        }

diff --git a/libs/openzap/src/zap_io.c b/libs/openzap/src/zap_io.c
index dcc0f0a3aae04bb0a8977a8ba434540ab27b71f3..714160ca8e3d9f8e05c86bc3cfec73f1cae6f5ec 100644 (file)
--- a/libs/openzap/src/zap_io.c
+++ b/libs/openzap/src/zap_io.c
@@ -2482,6 +2482,7 @@ zap_status_t zap_configure_span(const char *type, zap_span_t *span, zio_signal_c
                va_end(ap);
        } else {
                zap_log(ZAP_LOG_ERROR, "can't find '%s'\n", type);
+               status = ZAP_FAIL;
        }
 
        return status;