From: Jason Parker <jparker@digium.com>
Date: Mon, 9 Jul 2007 20:18:15 +0000 (+0000)
Subject: Several chan_zap options were not working on reload because they were arbitrarily
X-Git-Tag: 1.2.21~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29da454042428251a02363fc6d784c2234459c59;p=thirdparty%2Fasterisk.git

Several chan_zap options were not working on reload because they were arbitrarily
 disallowed when reloading some/most PRI options (such as signalling) was disallowed.

Options such as polarityonanswerdelay and answeronpolarityswitch can safely be changed on a reload.
This corrects that behavior.

Issue 9186, patch by tzafrir.


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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 6471cb0fc3..e66e171db9 100644
--- 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")) {