allow commented categories

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

diff --git a/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.c b/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.c
index 15cd84202736da7975fda3f2bb525c657f760935..2677085aa81ef2172749e119a989a519ab33bd8e 100644 (file)
--- a/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.c
+++ b/libs/openzap/src/ozmod/ozmod_analog/ozmod_analog.c
@@ -654,9 +654,9 @@ static void *zap_analog_channel_run(zap_thread_t *me, void *obj)
                }
 
                if ((zchan->dtmf_buffer && zap_buffer_inuse(zchan->dtmf_buffer)) || (zchan->fsk_buffer && zap_buffer_inuse(zchan->fsk_buffer))) {
-                       rlen = len;
-                       memset(frame, 0, len);
-                       zap_channel_write(zchan, frame, sizeof(frame), &rlen);
+                       //rlen = len;
+                       //memset(frame, 0, len);
+                       //zap_channel_write(zchan, frame, sizeof(frame), &rlen);
                        continue;
                }
                

diff --git a/libs/openzap/src/zap_io.c b/libs/openzap/src/zap_io.c
index 714160ca8e3d9f8e05c86bc3cfec73f1cae6f5ec..9dbfa9efd94add2e5f95f5b4b7f929d62c9d9b33 100644 (file)
--- a/libs/openzap/src/zap_io.c
+++ b/libs/openzap/src/zap_io.c
@@ -2098,7 +2098,12 @@ static zap_status_t load_config(void)
        }
        
        while (zap_config_next_pair(&cfg, &var, &val)) {
-               if (!strncasecmp(cfg.category, "span", 4)) {
+               if (*cfg.category == '#') {
+                       if (cfg.catno != catno) {
+                               zap_log(ZAP_LOG_DEBUG, "Skipping %s\n", cfg.category);
+                               catno = cfg.catno;
+                       }
+               } else if (!strncasecmp(cfg.category, "span", 4)) {
                        if (cfg.catno != catno) {
                                char *type = cfg.category + 4;
                                char *name;