mod_limit is now a backwards compatible shim

diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c
index e2146056b53905d70828b18bf042e1b9e13249dd..8c83dfc86f9ee4fb527128b87a091404d1c00f97 100644 (file)
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@ -4240,6 +4240,7 @@ SWITCH_STANDARD_API(limit_usage_function)
                argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
        }
        
+       /* backwards compat version */
        if (argc == 2) {
                switch_safe_free(mydata);
                /* allocate space for "db " */
@@ -4250,7 +4251,6 @@ SWITCH_STANDARD_API(limit_usage_function)
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Using deprecated limit api: Please specify backend.  Defaulting to 'db' backend.\n");
        }
        
-       /* backwards compat version */
        if (argc < 3) {
                stream->write_function(stream, "USAGE: limit_usage %s\n", LIMIT_USAGE_USAGE);
                goto end;

diff --git a/src/mod/applications/mod_dptools/mod_dptools.c b/src/mod/applications/mod_dptools/mod_dptools.c
index fd582895536757af17f07dfba8eaf20669b66337..aba73df20c2cfbc0954c5ccef4fddb75373b9b50 100755 (executable)
--- a/src/mod/applications/mod_dptools/mod_dptools.c
+++ b/src/mod/applications/mod_dptools/mod_dptools.c
@@ -3030,22 +3030,29 @@ SWITCH_STANDARD_APP(limit_function)
                argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
        }
        
-       if (argc < 3) {
-               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "USAGE: limit %s\n", LIMIT_USAGE);
+       backend = argv[0];
+
+       /* must have at least one item */
+       if (argc < 1) {
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "USAGE: limit %s\n", LIMIT_USAGE);
                return;
        }
-
-       backend = argv[0];
        
        /* if this is an invalid backend, fallback to db backend */
        /* TODO: remove this when we can! */
-       if (!(limit = switch_loadable_module_get_limit_interface(backend))) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unknown backend '%s'.  To maintain backwards compatability, falling back on db backend and shifting argumens. Either update your diaplan to include the backend, fix the typo, or load the appropriate limit implementation module.", backend);
+       if (switch_true(switch_channel_get_variable(channel, "switch_limit_backwards_compat_flag")) && 
+                       !(limit = switch_loadable_module_get_limit_interface(backend))) {
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unknown backend '%s'.  To maintain backwards compatability, falling back on db backend and shifting argumens. Either update your diaplan to include the backend, fix the typo, or load the appropriate limit implementation module.\n", backend);
                mydata = switch_core_session_sprintf(session, "db %s", data);
                argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
                backend = argv[0];
        }
 
+       if (argc < 3) {
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "USAGE: limit %s\n", LIMIT_USAGE);
+               return;
+       }
+
        realm = argv[1];
        id = argv[2];
 
@@ -3089,9 +3096,15 @@ SWITCH_STANDARD_APP(limit_function)
 SWITCH_STANDARD_APP(limit_hash_function)
 {
        char *mydata = NULL;
-       mydata = switch_core_session_sprintf(session, "hash %s", data);
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Using deprecated 'limit_hash' api: Please use 'limit hash'.\n");
-       limit_function(session, mydata);
+       switch_channel_t *channel = switch_core_session_get_channel(session);
+
+       if (switch_true(switch_channel_get_variable(channel, "switch_limit_backwards_compat_flag"))) {
+               mydata = switch_core_session_sprintf(session, "hash %s", data);
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Using deprecated 'limit_hash' api: Please use 'limit hash'.\n");
+               limit_function(session, mydata);
+       } else {
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "'limit_hash' (deprecated) is only available after loading mod_limit.\n");
+       }
 }
 
 #define LIMITEXECUTE_USAGE "<backend> <realm> <id> <max>[/interval] <application> [application arguments]"
@@ -3108,6 +3121,7 @@ SWITCH_STANDARD_APP(limit_execute_function)
        char *app_arg = NULL;
        int max = -1;
        int interval = 0;
+       switch_channel_t *channel = switch_core_session_get_channel(session);
 
        /* Parse application data  */
        if (!zstr(data)) {
@@ -3116,14 +3130,15 @@ SWITCH_STANDARD_APP(limit_execute_function)
        }
        
        /* backwards compat version, if we have 5, just prepend with db and reparse */
-       if (argc == 5) {
+       if (switch_true(switch_channel_get_variable(channel, "switch_limit_backwards_compat_flag")) && 
+                       argc == 5) {
                mydata = switch_core_session_sprintf(session, "db %s", data);
                argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Using deprecated limit api: Please specify backend.  Defaulting to 'db' backend.\n");
        }
 
        if (argc < 6) {
-               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "USAGE: limit_execute %s\n", LIMITEXECUTE_USAGE);
+               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "USAGE: limit_execute %s\n", LIMITEXECUTE_USAGE);
                return;
        }
 
@@ -3172,9 +3187,15 @@ SWITCH_STANDARD_APP(limit_execute_function)
 SWITCH_STANDARD_APP(limit_hash_execute_function)
 {
        char *mydata = NULL;
-       mydata = switch_core_session_sprintf(session, "hash %s", data);
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Using deprecated 'limit_hash_execute' api: Please use 'limit_execute hash'.\n");
-       limit_execute_function(session, mydata);
+       switch_channel_t *channel = switch_core_session_get_channel(session);
+
+       if (switch_true(switch_channel_get_variable(channel, "switch_limit_backwards_compat_flag"))) {
+               mydata = switch_core_session_sprintf(session, "hash %s", data);
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Using deprecated 'limit_hash_execute' api: Please use 'limit_execute hash'.\n");
+               limit_execute_function(session, mydata);
+       } else {
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "'limit_hash_execute' (deprecated) is only available after loading mod_limit.\n");
+       }
 }
 
 #define SPEAK_DESC "Speak text to a channel via the tts interface"

diff --git a/src/mod/applications/mod_limit/mod_limit.c b/src/mod/applications/mod_limit/mod_limit.c
index ead6dff8c085be704c299276fefc666957fa4274..3378cfda93c7528d554e2bdcae6a8ec8ce94b627 100644 (file)
--- a/src/mod/applications/mod_limit/mod_limit.c
+++ b/src/mod/applications/mod_limit/mod_limit.c
@@ -61,6 +61,9 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_limit_load)
                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to load mod_db (%s)!\n", err);
                }
        }
+       
+       /* set compat flag */
+       switch_core_set_variable("switch_limit_backwards_compat_flag", "true");
 
        /* indicate that the module should continue to be loaded */
        return SWITCH_STATUS_SUCCESS;
@@ -68,6 +71,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_limit_load)
 
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_limit_shutdown)
 {
+       switch_core_set_variable("switch_limit_backwards_compat_flag", "false");
        return SWITCH_STATUS_SUCCESS;
 }