freetdm: add validation to ftdm_span_start and ftdm_span_stop

diff --git a/libs/freetdm/src/ftdm_io.c b/libs/freetdm/src/ftdm_io.c
index efd52542a61f504e682cf94168a095f1ec3a4cb0..21354c4442fda44186debe3493125b9d419082b9 100644 (file)
--- a/libs/freetdm/src/ftdm_io.c
+++ b/libs/freetdm/src/ftdm_io.c
@@ -733,11 +733,28 @@ static void ftdm_span_add(ftdm_span_t *span)
 
 FT_DECLARE(ftdm_status_t) ftdm_span_stop(ftdm_span_t *span)
 {
-       ftdm_status_t status =  FTDM_FAIL;
-       if (span->stop) {
-               status = span->stop(span);
-               span->stop = NULL;
+       ftdm_status_t status =  FTDM_SUCCESS;
+       
+       ftdm_mutex_lock(span->mutex);
+
+       if (!ftdm_test_flag(span, FTDM_SPAN_STARTED)) {
+               status = FTDM_EINVAL;
+               goto done;
+       }
+
+       if (!span->stop) {
+               status = FTDM_ENOSYS;
+               goto done;
        }
+
+       status = span->stop(span);
+       if (FTDM_SUCCESS == status) {
+               ftdm_clear_flag(span, FTDM_SPAN_STARTED);
+       }
+
+done:
+       ftdm_mutex_unlock(span->mutex);
+
        return status;
 }
 
@@ -5063,11 +5080,28 @@ FT_DECLARE(ftdm_status_t) ftdm_configure_span_signaling(ftdm_span_t *span, const
 
 FT_DECLARE(ftdm_status_t) ftdm_span_start(ftdm_span_t *span)
 {
-       if (span->start) {
-               return span->start(span);
+       ftdm_status_t status = FTDM_FAIL;
+
+       ftdm_mutex_lock(span->mutex);
+
+       if (ftdm_test_flag(span, FTDM_SPAN_STARTED)) {
+               status = FTDM_EINVAL;
+               goto done;
        }
 
-       return FTDM_FAIL;
+       if (!span->start) {
+               status = FTDM_ENOSYS;
+               goto done;
+       }
+
+       status = span->start(span);
+       if (status == FTDM_SUCCESS) {
+               ftdm_set_flag_locked(span, FTDM_SPAN_STARTED);
+       }
+
+done:
+       ftdm_mutex_unlock(span->mutex);
+       return status;
 }
 
 FT_DECLARE(ftdm_status_t) ftdm_channel_add_to_group(const char* name, ftdm_channel_t* ftdmchan)

diff --git a/libs/freetdm/src/include/private/ftdm_types.h b/libs/freetdm/src/include/private/ftdm_types.h
index 2d683e3098ac153aca9741abc427dbd5006040da..d79835733ba854f17910ff02869518eb38d015f2 100644 (file)
--- a/libs/freetdm/src/include/private/ftdm_types.h
+++ b/libs/freetdm/src/include/private/ftdm_types.h
@@ -168,7 +168,7 @@ typedef enum {
 
 typedef enum {
        FTDM_SPAN_CONFIGURED = (1 << 0),
-       FTDM_SPAN_READY = (1 << 1),
+       FTDM_SPAN_STARTED = (1 << 1),
        FTDM_SPAN_STATE_CHANGE = (1 << 2),
        FTDM_SPAN_SUSPENDED = (1 << 3),
        FTDM_SPAN_IN_THREAD = (1 << 4),