]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
ftmod_libpri: remove ftdm_channel_done(), only use ftdm_channel_close().
authorStefan Knoblich <s.knoblich@axsentis.de>
Sat, 18 Dec 2010 01:24:28 +0000 (02:24 +0100)
committerStefan Knoblich <s.knoblich@axsentis.de>
Sat, 18 Dec 2010 01:24:28 +0000 (02:24 +0100)
Signed-off-by: Stefan Knoblich <s.knoblich@axsentis.de>
libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c

index 68f0e9e5a4d030d4154bdd836db46c0078b371ab..8cbc0f4f45b76a8592255ba31ed1415e05ba7e36 100644 (file)
@@ -515,23 +515,17 @@ static __inline__ void state_advance(ftdm_channel_t *chan)
        switch (ftdm_channel_get_state(chan)) {
        case FTDM_CHANNEL_STATE_DOWN:
                {
+                       ftdm_channel_t *chtmp = chan;
                        chan->call_data = NULL;
-                       ftdm_channel_done(chan);
 
-                       /*
-                        * Close channel completely, BRI PTMP will thank us
-                        */
-                       if (ftdm_test_flag(chan, FTDM_CHANNEL_OPEN)) {
-                               ftdm_channel_t *chtmp = chan;
-                               if (ftdm_channel_close(&chtmp) != FTDM_SUCCESS) {
-                                       ftdm_log(FTDM_LOG_WARNING, "-- Failed to close channel %d:%d\n",
-                                               ftdm_channel_get_span_id(chan),
-                                               ftdm_channel_get_id(chan));
-                               } else {
-                                       ftdm_log(FTDM_LOG_DEBUG, "-- Closed channel %d:%d\n",
-                                               ftdm_channel_get_span_id(chan),
-                                               ftdm_channel_get_id(chan));
-                               }
+                       if (ftdm_channel_close(&chtmp) != FTDM_SUCCESS) {
+                               ftdm_log(FTDM_LOG_WARNING, "-- Failed to close channel %d:%d\n",
+                                       ftdm_channel_get_span_id(chan),
+                                       ftdm_channel_get_id(chan));
+                       } else {
+                               ftdm_log(FTDM_LOG_DEBUG, "-- Closed channel %d:%d\n",
+                                       ftdm_channel_get_span_id(chan),
+                                       ftdm_channel_get_id(chan));
                        }
                }
                break;