automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@74210 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 6471cb0fc3061a46685d31e6a07deee088244967..e66e171db9b7c78dfab32e2ad0547104a31ae946 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -10664,6 +10664,14 @@ static int setup_zap(int reload)
                                ast_log(LOG_WARNING, "Invalid AMA flags: %s at line %d\n", v->value, v->lineno);
                        else
                                chan_conf.amaflags = y;
+               } else if (!strcasecmp(v->name, "polarityonanswerdelay")) {
+                       chan_conf.polarityonanswerdelay = atoi(v->value);
+               } else if (!strcasecmp(v->name, "answeronpolarityswitch")) {
+                       chan_conf.answeronpolarityswitch = ast_true(v->value);
+               } else if (!strcasecmp(v->name, "hanguponpolarityswitch")) {
+                       chan_conf.hanguponpolarityswitch = ast_true(v->value);
+               } else if (!strcasecmp(v->name, "sendcalleridafter")) {
+                       chan_conf.sendcalleridafter = atoi(v->value);
                } else if(!reload){ 
                         if (!strcasecmp(v->name, "signalling")) {
                                if (!strcasecmp(v->value, "em")) {
@@ -11042,14 +11050,6 @@ static int setup_zap(int reload)
                                        }
                                }
                                close(ctlfd);
-                       } else if (!strcasecmp(v->name, "polarityonanswerdelay")) {
-                               chan_conf.polarityonanswerdelay = atoi(v->value);
-                       } else if (!strcasecmp(v->name, "answeronpolarityswitch")) {
-                               chan_conf.answeronpolarityswitch = ast_true(v->value);
-                       } else if (!strcasecmp(v->name, "hanguponpolarityswitch")) {
-                               chan_conf.hanguponpolarityswitch = ast_true(v->value);
-                       } else if (!strcasecmp(v->name, "sendcalleridafter")) {
-                               chan_conf.sendcalleridafter = atoi(v->value);
                        } else if (!strcasecmp(v->name, "defaultcic")) {
                                ast_copy_string(defaultcic, v->value, sizeof(defaultcic));
                        } else if (!strcasecmp(v->name, "defaultozz")) {

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 7649d6f5b537ce5e18a98c265dec45a65cde122b..f091793c13fc295faba40fd1c9ec940e65b5aaca 100644 (file)
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -636,6 +636,7 @@ static struct mohclass *get_mohbyname(char *name)
                        return moh;
                moh = moh->next;
        }
+       ast_log(LOG_WARNING, "Music on Hold class '%s' not found\n", name);
        return NULL;
 }
 
@@ -908,20 +909,19 @@ static void local_ast_moh_cleanup(struct ast_channel *chan)
 
 static int local_ast_moh_start(struct ast_channel *chan, char *class)
 {
-       struct mohclass *mohclass;
+       struct mohclass *mohclass = NULL;
 
-       if (ast_strlen_zero(class))
-               class = chan->musicclass;
-       if (ast_strlen_zero(class))
-               class = "default";
        ast_mutex_lock(&moh_lock);
-       mohclass = get_mohbyname(class);
+       if (!ast_strlen_zero(class))
+               mohclass = get_mohbyname(class);
+       if (!mohclass && !ast_strlen_zero(chan->musicclass))
+               mohclass = get_mohbyname(chan->musicclass);
+       if (!mohclass)
+               mohclass = get_mohbyname("default");
        ast_mutex_unlock(&moh_lock);
 
-       if (!mohclass) {
-               ast_log(LOG_WARNING, "No class: %s\n", (char *)class);
+       if (!mohclass)
                return -1;
-       }
 
        ast_set_flag(chan, AST_FLAG_MOH);
        if (mohclass->total_files) {