freetdm: ftmod_r2 - implemented ftdm_r2_get_span_sig_status() and ftdm_r2_set_span_si...

         mod_freetdm - created sigstatus api command

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index 38197bb2f0f090c3b77598658a10c28fa91ff087..daddc9abc12fd8403e99bdde5314e4ae7d94c195 100755 (executable)
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -3542,7 +3542,83 @@ SWITCH_STANDARD_API(ft_function)
                goto end;
        }
 
-       if (!strcasecmp(argv[0], "dump")) {
+       if (!strcasecmp(argv[0], "sigstatus")) {
+               ftdm_span_t *span = NULL;
+               ftdm_signaling_status_t sigstatus;
+
+               if (argc < 3) {
+                       stream->write_function(stream, "-ERR Usage: ftdm sigstatus get|set [<span_id>] [<channel>] [<sigstatus>]\n");
+                       goto end;
+               }
+               if (!strcasecmp(argv[1], "get") && argc < 3) {
+                       stream->write_function(stream, "-ERR sigstatus get usage: get <span_id>\n");
+                       goto end;
+               }
+               if (!strcasecmp(argv[1], "set") && argc != 5) {
+                       stream->write_function(stream, "-ERR sigstatus set usage: set <span_id> <channel>|all <sigstatus>\n");
+                       goto end;
+               }
+
+               ftdm_span_find_by_name(argv[2], &span);
+               if (!span) {
+                       stream->write_function(stream, "-ERR invalid span\n");
+                       goto end;
+               }
+
+               if (!strcasecmp(argv[1], "get")) {
+                       if (argc == 4) {
+                               uint32_t chan_id = atol(argv[3]);
+                               ftdm_channel_t *fchan = ftdm_span_get_channel(span, chan_id);
+                               if (!fchan) {
+                                       stream->write_function(stream, "-ERR failed to get channel id '%d'\n", chan_id);
+                                       goto end;
+                               }
+
+                               if ((FTDM_SUCCESS == ftdm_channel_get_sig_status(fchan, &sigstatus))) {
+                                       stream->write_function(stream, "channel %d signaling status: %s\n", chan_id, ftdm_signaling_status2str(sigstatus));
+                               } else {
+                                       stream->write_function(stream, "-ERR failed to get channel sigstatus\n");
+                               }
+                               goto end;
+                       } else {
+                               if ((FTDM_SUCCESS == ftdm_span_get_sig_status(span, &sigstatus))) {
+                                       stream->write_function(stream, "signaling_status: %s\n", ftdm_signaling_status2str(sigstatus));
+                               } else {
+                                       stream->write_function(stream, "-ERR failed to read span status: %s\n", ftdm_span_get_last_error(span));
+                               }
+                       }
+                       goto end;
+               }
+               if (!strcasecmp(argv[1], "set")) {
+                       sigstatus = ftdm_str2ftdm_signaling_status(argv[4]);
+
+                       if (!strcasecmp(argv[3], "all")) {
+                               if ((FTDM_SUCCESS == ftdm_span_set_sig_status(span, sigstatus))) {
+                                       stream->write_function(stream, "Signaling status of all channels from span %s set to %s\n",
+                                                       ftdm_span_get_name(span), ftdm_signaling_status2str(sigstatus));
+                               } else {
+                                       stream->write_function(stream, "-ERR failed to set span sigstatus to '%s'\n", ftdm_signaling_status2str(sigstatus));
+                               }
+                               goto end;
+                       } else {
+                               uint32_t chan_id = atol(argv[3]);
+                               ftdm_channel_t *fchan = ftdm_span_get_channel(span, chan_id);
+                               if (!fchan) {
+                                       stream->write_function(stream, "-ERR failed to get channel id '%d'\n", chan_id);
+                                       goto end;
+                               }
+
+                               if ((FTDM_SUCCESS == ftdm_channel_set_sig_status(fchan, sigstatus))) {
+                                       stream->write_function(stream, "Signaling status of channel %d set to %s\n", chan_id,
+                                                       ftdm_signaling_status2str(sigstatus));
+                               } else {
+                                       stream->write_function(stream, "-ERR failed to set span sigstatus to '%s'\n", ftdm_signaling_status2str(sigstatus));
+                               }
+                               goto end;
+                       }
+               }
+
+       } else if (!strcasecmp(argv[0], "dump")) {
                if (argc < 2) {
                        stream->write_function(stream, "-ERR Usage: ftdm dump <span_id> [<chan_id>]\n");
                        goto end;

diff --git a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
index ef9201bbe665025ff939921b8b5569c27af913d0..b4e9e138cc944f0f69d2cca2b974fcd2a20fa56f 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
+++ b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
@@ -461,12 +461,79 @@ static FIO_CHANNEL_SET_SIG_STATUS_FUNCTION(ftdm_r2_set_channel_sig_status)
                        openr2_chan_set_idle(r2chan);
                        break;
                default:
-                       ftdm_log_chan(ftdmchan, FTDM_LOG_WARNING, "Cannot set signaling status to unknown value '%s'\n", status);
+                       ftdm_log_chan(ftdmchan, FTDM_LOG_WARNING, "Cannot set signaling status to unknown value '%d'\n", status);
                        return FTDM_FAIL;
        }
        return FTDM_SUCCESS;
 }
 
+static FIO_SPAN_GET_SIG_STATUS_FUNCTION(ftdm_r2_get_span_sig_status)
+{
+       ftdm_iterator_t *chaniter = NULL;
+       ftdm_iterator_t *citer = NULL;
+       uint32_t i;
+
+       chaniter = ftdm_span_get_chan_iterator(span, NULL);
+       if (!chaniter) {
+               ftdm_log(FTDM_LOG_CRIT, "Failed to allocate channel iterator for span %s!\n", span->name);
+               return FTDM_FAIL;
+       }
+       /* if ALL channels are non-idle, report SUSPENDED. UP otherwise. */
+       *status = FTDM_SIG_STATE_SUSPENDED;
+       for (i = 1, citer = chaniter; citer; citer = ftdm_iterator_next(citer), i++) {
+               ftdm_channel_t *fchan = ftdm_iterator_current(citer);
+
+               if (ftdm_test_flag(fchan, FTDM_CHANNEL_SIG_UP)) {
+                       *status = FTDM_SIG_STATE_UP;
+                       break;
+               }
+       }
+       ftdm_iterator_free(chaniter);
+       return FTDM_SUCCESS;
+}
+
+static FIO_SPAN_SET_SIG_STATUS_FUNCTION(ftdm_r2_set_span_sig_status)
+{
+       ftdm_iterator_t *chaniter = NULL;
+       ftdm_iterator_t *citer = NULL;
+       uint32_t span_opr = -1;
+       uint32_t i;
+
+       /* we either set the channels to BLOCK or IDLE */
+       switch(status) {
+               case FTDM_SIG_STATE_DOWN:
+               case FTDM_SIG_STATE_SUSPENDED:
+                       span_opr = 0;
+                       break;
+               case FTDM_SIG_STATE_UP:
+                       span_opr = 1;
+                       break;
+               default:
+                       ftdm_log(FTDM_LOG_WARNING, "Cannot set signaling status to unknown value '%d'\n", status);
+                       return FTDM_FAIL;
+       }
+
+       chaniter = ftdm_span_get_chan_iterator(span, NULL);
+       if (!chaniter) {
+               ftdm_log(FTDM_LOG_CRIT, "Failed to allocate channel iterator for span %s!\n", span->name);
+               return FTDM_FAIL;
+       }
+       /* iterate over all channels, setting them to the requested state */
+       for (i = 1, citer = chaniter; citer; citer = ftdm_iterator_next(citer), i++) {
+               ftdm_channel_t *fchan = ftdm_iterator_current(citer);
+               openr2_chan_t *r2chan = R2CALL(fchan)->r2chan;
+               if (span_opr == 0) {
+                       openr2_chan_set_blocked(r2chan);
+                       ftdm_log_chan_msg(fchan, FTDM_LOG_NOTICE, "Channel blocked\n");
+               } else {
+                       openr2_chan_set_idle(r2chan);
+                       ftdm_log_chan_msg(fchan, FTDM_LOG_NOTICE, "Channel idle\n");
+               }
+       }
+       ftdm_iterator_free(chaniter);
+       return FTDM_SUCCESS;
+}
+
 /* always called from the monitor thread */
 static void ftdm_r2_on_call_init(openr2_chan_t *r2chan)
 {
@@ -1441,6 +1508,8 @@ static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(ftdm_r2_configure_span_signaling)
        span->signal_type = FTDM_SIGTYPE_R2;
        span->signal_data = r2data;
        span->outgoing_call = r2_outgoing_call;
+       span->get_span_sig_status = ftdm_r2_get_span_sig_status;
+       span->set_span_sig_status = ftdm_r2_set_span_sig_status;
        span->get_channel_sig_status = ftdm_r2_get_channel_sig_status;
        span->set_channel_sig_status = ftdm_r2_set_channel_sig_status;