freetdm/openzap: OPENZAP-110 - John Wehle rocks!

diff --git a/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c b/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
index d9000a6bbb04e5a1d46dce376f87073d6ea1ff0a..ae9398418afe91ea4bdd29fc02d3e4cdb8ecfc8c 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
+++ b/libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c
@@ -974,7 +974,7 @@ FIO_SPAN_POLL_EVENT_FUNCTION(zt_poll_event)
  */
 FIO_SPAN_NEXT_EVENT_FUNCTION(zt_next_event)
 {
-       uint32_t i, event_id = 0;
+       uint32_t i, event_id = FTDM_OOB_INVALID;
        zt_event_t zt_event_id = 0;
 
        for(i = 1; i <= span->chan_count; i++) {
@@ -1022,6 +1022,8 @@ FIO_SPAN_NEXT_EVENT_FUNCTION(zt_next_event)
                                                event_id = FTDM_OOB_OFFHOOK;
                                        } else if (span->channels[i]->type == FTDM_CHAN_TYPE_FXO) {
                                                event_id = FTDM_OOB_RING_START;
+                                       } else {
+                                               event_id = FTDM_OOB_NOOP;
                                        }
                                }
                                break;

diff --git a/libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.c b/libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.c
index 0eaf955196bc1d40ed4a130ca33f8cce10b799fa..ca42c2c5788b57efab36cc01459cd3b4b67c8082 100644 (file)
--- a/libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.c
+++ b/libs/openzap/src/ozmod/ozmod_zt/ozmod_zt.c
@@ -977,7 +977,7 @@ ZIO_SPAN_POLL_EVENT_FUNCTION(zt_poll_event)
  */
 ZIO_SPAN_NEXT_EVENT_FUNCTION(zt_next_event)
 {
-       uint32_t i, event_id = 0;
+       uint32_t i, event_id = ZAP_OOB_INVALID;
        zt_event_t zt_event_id = 0;
 
        for(i = 1; i <= span->chan_count; i++) {
@@ -1025,6 +1025,8 @@ ZIO_SPAN_NEXT_EVENT_FUNCTION(zt_next_event)
                                                event_id = ZAP_OOB_OFFHOOK;
                                        } else if (span->channels[i]->type == ZAP_CHAN_TYPE_FXO) {
                                                event_id = ZAP_OOB_RING_START;
+                                       } else {
+                                               event_id = ZAP_OOB_NOOP;
                                        }
                                }
                                break;