freetdm: fix small bug reported in freeswitch-dev where the call_id member of sigmsg

         is not being set for SIGEVENT_START event

diff --git a/libs/freetdm/src/ftdm_io.c b/libs/freetdm/src/ftdm_io.c
index e190becd350d0c9feae86aef126c45b3e94d630e..95626299bbbad0729ee783faa2eae276922662c1 100644 (file)
--- a/libs/freetdm/src/ftdm_io.c
+++ b/libs/freetdm/src/ftdm_io.c
@@ -5465,10 +5465,6 @@ FT_DECLARE(ftdm_status_t) ftdm_span_send_signal(ftdm_span_t *span, ftdm_sigmsg_t
        if (sigmsg->channel) {
                fchan = sigmsg->channel;
                ftdm_channel_lock(fchan);
-               sigmsg->chan_id = fchan->chan_id;
-               sigmsg->span_id = fchan->span_id;
-               sigmsg->call_id = fchan->caller_data.call_id;
-               sigmsg->call_priv = fchan->caller_data.priv;
        }
        
        /* some core things to do on special events */
@@ -5558,6 +5554,14 @@ FT_DECLARE(ftdm_status_t) ftdm_span_send_signal(ftdm_span_t *span, ftdm_sigmsg_t
 
        }
 
+       if (fchan) {
+               /* set members of the sigmsg that must be present for all events */
+               sigmsg->chan_id = fchan->chan_id;
+               sigmsg->span_id = fchan->span_id;
+               sigmsg->call_id = fchan->caller_data.call_id;
+               sigmsg->call_priv = fchan->caller_data.priv;
+       }
+
        /* if the signaling module uses a queue for signaling notifications, then enqueue it */
        if (ftdm_test_flag(span, FTDM_SPAN_USE_SIGNALS_QUEUE)) {
                ftdm_span_queue_signal(span, sigmsg);