make echo stuff failure nonfatal

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

diff --git a/libs/openzap/.update b/libs/openzap/.update
index aee0582972f653462937055c38247421b2efe883..b7c238bea5819b310f38f639af5f9c0886716307 100644 (file)
--- a/libs/openzap/.update
+++ b/libs/openzap/.update
@@ -1 +1 @@
-Wed May 14 11:20:37 EDT 2008
+Wed May 14 11:24:37 EDT 2008

diff --git a/libs/openzap/src/zap_zt.c b/libs/openzap/src/zap_zt.c
index afcf3ca968c512b6c460c3ff67aa00a1af8f600f..ec6872b78292434164e669d50a354c2fcaeee32f 100644 (file)
--- a/libs/openzap/src/zap_zt.c
+++ b/libs/openzap/src/zap_zt.c
@@ -346,16 +346,18 @@ static ZIO_OPEN_FUNCTION(zt_open)
                } else if (zchan->type == ZAP_CHAN_TYPE_FXS || zchan->type == ZAP_CHAN_TYPE_FXO) {
                        int len = zt_globals.eclevel;
                        if (ioctl(zchan->sockfd, ZT_ECHOCANCEL, &len)) {
-                               snprintf(zchan->last_error, sizeof(zchan->last_error), "%s", strerror(errno));
-                               zap_log(ZAP_LOG_ERROR, "%s\n", zchan->last_error);
-                               return ZAP_FAIL;
-                       }
-                       
-                       len = zt_globals.etlevel;
-                       if (ioctl(zchan->sockfd, ZT_ECHOTRAIN, &len)) {
-                               snprintf(zchan->last_error, sizeof(zchan->last_error), "%s", strerror(errno));
-                               zap_log(ZAP_LOG_ERROR, "%s\n", zchan->last_error);
-                               return ZAP_FAIL;
+                               zap_log(ZAP_LOG_WARNING, "Echo cancel not available for %d:%d\n", zchan->span_id, zchan->chan_id);
+                               //snprintf(zchan->last_error, sizeof(zchan->last_error), "%s", strerror(errno));
+                               //zap_log(ZAP_LOG_ERROR, "%s\n", zchan->last_error);
+                               //return ZAP_FAIL;
+                       } else {
+                               len = zt_globals.etlevel;
+                               if (ioctl(zchan->sockfd, ZT_ECHOTRAIN, &len)) {
+                                       zap_log(ZAP_LOG_WARNING, "Echo training not available for %d:%d\n", zchan->span_id, zchan->chan_id);
+                                       //snprintf(zchan->last_error, sizeof(zchan->last_error), "%s", strerror(errno));
+                                       //zap_log(ZAP_LOG_ERROR, "%s\n", zchan->last_error);
+                                       //return ZAP_FAIL;
+                               }
                        }
                }
        }