freetdm: More spirou certification changes

         - Send RLC immediately even when in native bridge mode
         - Do not enqueue RLC coming from the network

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
index bcc21df7be8a74df15a2e7cd5bd0c1c658191c47..993ea68e5a76a92ee90410d6cdebd7a7a3ea473e 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
@@ -567,18 +567,20 @@ static void ftdm_sangoma_ss7_process_stack_event (sngss7_event_data_t *sngss7_ev
                sngss7_info->peer_data = NULL;
        }
 
-       /* clone the event and save it for later usage */
-       event_clone = ftdm_calloc(1, sizeof(*sngss7_event));
-       if (event_clone) {
-               memcpy(event_clone, sngss7_event, sizeof(*sngss7_event));
-               ftdm_queue_enqueue(sngss7_info->event_queue, event_clone);
-               if (sngss7_info->peer_data) {
-                       sngss7_span_data_t *sngss7_peer_span = (sngss7_span_data_t *)sngss7_info->peer_data->ftdmchan->span->signal_data;
-                       /* we already have a peer attached, wake him up */
-                       ftdm_queue_enqueue(sngss7_peer_span->peer_chans, sngss7_info->ftdmchan);
+       /* clone the event and save it for later usage, we do not clone RLC messages */
+       if (sngss7_event->event_id != SNGSS7_REL_CFM_EVENT) {
+               event_clone = ftdm_calloc(1, sizeof(*sngss7_event));
+               if (event_clone) {
+                       memcpy(event_clone, sngss7_event, sizeof(*sngss7_event));
+                       ftdm_queue_enqueue(sngss7_info->event_queue, event_clone);
+                       if (sngss7_info->peer_data) {
+                               sngss7_span_data_t *sngss7_peer_span = (sngss7_span_data_t *)sngss7_info->peer_data->ftdmchan->span->signal_data;
+                               /* we already have a peer attached, wake him up */
+                               ftdm_queue_enqueue(sngss7_peer_span->peer_chans, sngss7_info->ftdmchan);
+                       }
                }
        }
-       
+
        /* we could test for sngss7_info->peer_data too, bit this flag is set earlier, the earlier we know the better */
        if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_NATIVE_SIGBRIDGE)) {
                /* most messages are simply relayed in sig bridge mode, except for hangup which requires state changing */
@@ -981,6 +983,7 @@ static ftdm_status_t ftdm_sangoma_ss7_native_bridge_state_change(ftdm_channel_t
 
        case FTDM_CHANNEL_STATE_TERMINATING:
                {
+                       ft_to_sngss7_rlc(ftdmchan);
                        /* when receiving REL we move to TERMINATING and notify the user that the bridge is ending */
                        sngss7_send_signal(sngss7_info, FTDM_SIGEVENT_STOP);
                }