Merged revisions 371199,371203 via svnmerge from

file:///srv/subversion/repos/asterisk/branches/10

................
  r371199 | mmichelson | 2012-08-13 14:51:19 -0500 (Mon, 13 Aug 2012) | 5 lines

  Fix problem where incorrect pointer was checked for nullity.
  ........

  Merged revisions 371198 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................
  r371203 | kmoore | 2012-08-13 15:04:15 -0500 (Mon, 13 Aug 2012) | 13 lines

  Add test instrumentation

  This adds test instrumentation for loading and unloading of modules
  and for certain actions in MeetMe to be used in the testsuite or any
  other consumer of AMI events.  These will only be generated when
  Asterisk is built with TEST_FRAMEWORK enabled.

  (issue PQ-1131)
  (issue PQ-1133)
  ........

  Merged revisions 371201 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@371226 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 4ba43ca78397387fea7cd5158afb0932e5ad305e..1f76ad43303bd7cdd002e2c0c5c3fe15cf9456c8 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2830,6 +2830,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
                        ast_channel_setoption(chan, AST_OPTION_TONE_VERIFY, &x, sizeof(char), 0);
                }
        } else {
+               int lastusers = conf->users;
                if (user->dahdichannel && ast_test_flag64(confflags, CONFFLAG_STARMENU)) {
                        /*  Set CONFMUTE mode on DAHDI channel to mute DTMF tones when the menu is enabled */
                        x = 1;
@@ -3109,7 +3110,15 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, struc
                                }
                                break;
                        }
-       
+
+                       /* Throw a TestEvent if a user exit did not cause this user to leave the conference */
+                       if (conf->users != lastusers) {
+                               if (conf->users < lastusers) {
+                                       ast_test_suite_event_notify("NOEXIT", "Message: CONFFLAG_MARKEDEXIT\r\nLastUsers: %d\r\nUsers: %d", lastusers, conf->users);
+                               }
+                               lastusers = conf->users;
+                       }
+
                        /* Check if my modes have changed */
 
                        /* If I should be muted but am still talker, mute me */

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index dff35aa6a272787aaf1970b445809f9f91ec18b5..519eaec08473d8c8df1a3568fd8faf5cbe533671 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -15941,7 +15941,7 @@ static int get_rdnis(struct sip_pvt *p, struct sip_request *oreq, char **name, c
                pbx_builtin_setvar_helper(p->owner, "__SIPRDNISDOMAIN", rdomain);
 
        if (sip_debug_test_pvt(p))
-               ast_verbose("RDNIS for this call is %s (reason %s)\n", exten, reason ? reason_param : "");
+               ast_verbose("RDNIS for this call is %s (reason %s)\n", exten, S_OR(reason_param, ""));
 
        /*ast_string_field_set(p, rdnis, rexten);*/
 

diff --git a/main/loader.c b/main/loader.c
index 97adb6b004c6120dce3a89ae0a84ce11af3be5e4..4d1da976deed1825e99fdf409733ec38f6085a38 100644 (file)
--- a/main/loader.c
+++ b/main/loader.c
@@ -54,6 +54,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/udptl.h"
 #include "asterisk/heap.h"
 #include "asterisk/app.h"
+#include "asterisk/test.h"
 
 #include <dlfcn.h>
 
@@ -567,8 +568,10 @@ int ast_unload_resource(const char *resource_name, enum ast_module_unload_mode f
                mod->info->restore_globals();
 
 #ifdef LOADABLE_MODULES
-       if (!error)
+       if (!error) {
                unload_dynamic_module(mod);
+               ast_test_suite_event_notify("MODULE_UNLOAD", "Message: %s", resource_name);
+       }
 #endif
 
        if (!error)
@@ -899,6 +902,7 @@ int ast_load_resource(const char *resource_name)
        int res;
        AST_LIST_LOCK(&module_list);
        res = load_resource(resource_name, 0, NULL, 0);
+       ast_test_suite_event_notify("MODULE_LOAD", "Message: %s", resource_name);
        AST_LIST_UNLOCK(&module_list);
 
        return res;