freetdm: ftmod_r2 - reject collect calls when allow_collect_calls isn't true

diff --git a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
index d1a46d8f1d242b8866039a5425b5ef0cf56a5911..7439ddd3d76c2559da9d25bb4ce5b742ffb1a327 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
+++ b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
@@ -515,13 +515,20 @@ static void ftdm_r2_on_call_offered(openr2_chan_t *r2chan, const char *ani, cons
        ftdm_r2_data_t *r2data = ftdmchan->span->signal_data;
 
        ftdm_log_chan(ftdmchan, FTDM_LOG_NOTICE, "Call offered with ANI = %s, DNIS = %s, Category = (%d)\n", ani, dnis, category);
-       ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RING);
 
        /* nothing went wrong during call setup, MF has ended, we can and must disable the MF dump */
        if (r2data->mf_dump_size) {
                ftdm_channel_command(ftdmchan, FTDM_COMMAND_DISABLE_INPUT_DUMP, NULL);
                ftdm_channel_command(ftdmchan, FTDM_COMMAND_DISABLE_OUTPUT_DUMP, NULL);
        }
+
+       /* check if this is a collect call and if we should accept it */
+       if (!r2data->allow_collect_calls && category == OR2_CALLING_PARTY_CATEGORY_COLLECT_CALL) {
+               ftdm_log_chan_msg(ftdmchan, FTDM_LOG_NOTICE, "Rejecting collect call\n");
+               openr2_chan_disconnect_call(r2chan, OR2_CAUSE_COLLECT_CALL_REJECTED);
+       } else {
+               ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RING);
+       }
 }
 
 /*