]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
freetdm: ftmod_r2 - rename ftdm_started flag to ftdm_call_started
authorArnaldo Pereira <arnaldo@sangoma.com>
Tue, 30 Nov 2010 18:01:08 +0000 (16:01 -0200)
committerArnaldo Pereira <arnaldo@sangoma.com>
Tue, 30 Nov 2010 18:01:08 +0000 (16:01 -0200)
libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c

index ffc39e8884727c2e1ed856d04d8be9fc7a9a871c..b98f7db99cf8e366af6ecde92ab1afa6d788ae45 100644 (file)
@@ -68,7 +68,7 @@ typedef struct ftdm_r2_call_t {
        int accepted:1;
        int answer_pending:1;
        int disconnect_rcvd:1;
-       int ftdm_started:1;
+       int ftdm_call_started:1;
        int protocol_error:1;
        ftdm_channel_state_t chanstate;
        ftdm_size_t dnis_index;
@@ -357,7 +357,7 @@ static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(r2_outgoing_call)
        }
 
        ft_r2_clean_call(ftdmchan->call_data);
-       R2CALL(ftdmchan)->ftdm_started = 1;
+       R2CALL(ftdmchan)->ftdm_call_started = 1;
        R2CALL(ftdmchan)->chanstate = FTDM_CHANNEL_STATE_DOWN;
     ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_DIALING);
 
@@ -503,7 +503,7 @@ static void ftdm_r2_on_call_disconnect(openr2_chan_t *r2chan, openr2_call_discon
        }
 
        /* if the call has not been started yet we must go to HANGUP right here */ 
-       if (!R2CALL(ftdmchan)->ftdm_started) {
+       if (!R2CALL(ftdmchan)->ftdm_call_started) {
                ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
                return;
        }
@@ -567,7 +567,7 @@ static void ftdm_r2_on_protocol_error(openr2_chan_t *r2chan, openr2_protocol_err
        R2CALL(ftdmchan)->disconnect_rcvd = 1;
        R2CALL(ftdmchan)->protocol_error = 1;
 
-       if (!R2CALL(ftdmchan)->ftdm_started) {
+       if (!R2CALL(ftdmchan)->ftdm_call_started) {
                ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
                return;
        }
@@ -1260,7 +1260,7 @@ static int ftdm_r2_state_advance(ftdm_channel_t *ftdmchan)
                                        ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_CANCEL);
                                        break; 
                                }
-                               R2CALL(ftdmchan)->ftdm_started = 1; 
+                               R2CALL(ftdmchan)->ftdm_call_started = 1; 
 
                                break;