Opaquify char * and char[] in ast_channel

Review: https://reviewboard.asterisk.org/r/1733/


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

4 files changed, 18 insertions, 18 deletions

diff --git a/res/res_agi.c b/res/res_agi.c
index 2ad1023f8..511f44003 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -1742,8 +1742,8 @@ static void setup_env(struct ast_channel *chan, char *request, int fd, int enhan
 		S_COR(chan->redirecting.from.number.valid, chan->redirecting.from.number.str, "unknown"));
 
 	/* Context information */
-	ast_agi_send(fd, chan, "agi_context: %s\n", chan->context);
-	ast_agi_send(fd, chan, "agi_extension: %s\n", chan->exten);
+	ast_agi_send(fd, chan, "agi_context: %s\n", ast_channel_context(chan));
+	ast_agi_send(fd, chan, "agi_extension: %s\n", ast_channel_exten(chan));
 	ast_agi_send(fd, chan, "agi_priority: %d\n", chan->priority);
 	ast_agi_send(fd, chan, "agi_enhanced: %s\n", enhanced ? "1.0" : "0.0");
 
@@ -2207,7 +2207,7 @@ static int handle_setcontext(struct ast_channel *chan, AGI *agi, int argc, const
 
 	if (argc != 3)
 		return RESULT_SHOWUSAGE;
-	ast_copy_string(chan->context, argv[2], sizeof(chan->context));
+	ast_channel_context_set(chan, argv[2]);
 	ast_agi_send(agi->fd, chan, "200 result=0\n");
 	return RESULT_SUCCESS;
 }
@@ -2216,7 +2216,7 @@ static int handle_setextension(struct ast_channel *chan, AGI *agi, int argc, con
 {
 	if (argc != 3)
 		return RESULT_SHOWUSAGE;
-	ast_copy_string(chan->exten, argv[2], sizeof(chan->exten));
+	ast_channel_exten_set(chan, argv[2]);
 	ast_agi_send(agi->fd, chan, "200 result=0\n");
 	return RESULT_SUCCESS;
 }
@@ -2229,7 +2229,7 @@ static int handle_setpriority(struct ast_channel *chan, AGI *agi, int argc, cons
 		return RESULT_SHOWUSAGE;
 
 	if (sscanf(argv[2], "%30d", &pri) != 1) {
-		pri = ast_findlabel_extension(chan, chan->context, chan->exten, argv[2],
+		pri = ast_findlabel_extension(chan, ast_channel_context(chan), ast_channel_exten(chan), argv[2],
 			S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, NULL));
 		if (pri < 1)
 			return RESULT_SHOWUSAGE;
@@ -2632,7 +2632,7 @@ static int handle_verbose(struct ast_channel *chan, AGI *agi, int argc, const ch
 	if (argv[2])
 		sscanf(argv[2], "%30d", &level);
 
-	ast_verb(level, "%s: %s\n", chan->data, argv[1]);
+	ast_verb(level, "%s: %s\n", ast_channel_data(chan), argv[1]);
 
 	ast_agi_send(agi->fd, chan, "200 result=1\n");
 
diff --git a/res/res_calendar.c b/res/res_calendar.c
index 14846d316..382d34e08 100644
--- a/res/res_calendar.c
+++ b/res/res_calendar.c
@@ -791,8 +791,8 @@ static void *do_notify(void *data)
 
 		answered = ast_dial_answered_steal(dial);
 		if (ast_strlen_zero(event->owner->notify_app)) {
-			ast_copy_string(answered->context, event->owner->notify_context, sizeof(answered->context));
-			ast_copy_string(answered->exten, event->owner->notify_extension, sizeof(answered->exten));
+			ast_channel_context_set(answered, event->owner->notify_context);
+			ast_channel_exten_set(answered, event->owner->notify_extension);
 			answered->priority = 1;
 			ast_pbx_run(answered);
 		}
diff --git a/res/res_fax.c b/res/res_fax.c
index 35c03f32c..28b46a3ce 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -3357,7 +3357,7 @@ static struct ast_frame *fax_detect_framehook(struct ast_channel *chan, struct a
 	}
 
 	if (result) {
-		const char *target_context = S_OR(chan->macrocontext, chan->context);
+		const char *target_context = S_OR(ast_channel_macrocontext(chan), ast_channel_context(chan));
 		switch (result) {
 		case 'f':
 		case 't':
@@ -3367,7 +3367,7 @@ static struct ast_frame *fax_detect_framehook(struct ast_channel *chan, struct a
 				ast_channel_lock(chan);
 				ast_verb(2, "Redirecting '%s' to fax extension due to %s detection\n",
 					ast_channel_name(chan), (result == 'f') ? "CNG" : "T38");
-				pbx_builtin_setvar_helper(chan, "FAXEXTEN", chan->exten);
+				pbx_builtin_setvar_helper(chan, "FAXEXTEN", ast_channel_exten(chan));
 				if (ast_async_goto(chan, target_context, "fax", 1)) {
 					ast_log(LOG_NOTICE, "Failed to async goto '%s' into fax of '%s'\n", ast_channel_name(chan), target_context);
 				}
diff --git a/res/snmp/agent.c b/res/snmp/agent.c
index 71f02134f..9d02a7a5b 100644
--- a/res/snmp/agent.c
+++ b/res/snmp/agent.c
@@ -329,35 +329,35 @@ static u_char *ast_var_channels_table(struct variable *vp, oid *name, size_t *le
 		}
 		break;
 	case ASTCHANAPP:
-		if (chan->appl) {
-			strncpy(string_ret, chan->appl, sizeof(string_ret));
+		if (ast_channel_appl(chan)) {
+			strncpy(string_ret, ast_channel_appl(chan), sizeof(string_ret));
 			string_ret[sizeof(string_ret) - 1] = '\0';
 			*var_len = strlen(string_ret);
 			ret = (u_char *)string_ret;
 		}
 		break;
 	case ASTCHANDATA:
-		if (chan->data) {
-			strncpy(string_ret, chan->data, sizeof(string_ret));
+		if (ast_channel_data(chan)) {
+			strncpy(string_ret, ast_channel_data(chan), sizeof(string_ret));
 			string_ret[sizeof(string_ret) - 1] = '\0';
 			*var_len = strlen(string_ret);
 			ret = (u_char *)string_ret;
 		}
 		break;
 	case ASTCHANCONTEXT:
-		strncpy(string_ret, chan->context, sizeof(string_ret));
+		strncpy(string_ret, ast_channel_context(chan), sizeof(string_ret));
 		string_ret[sizeof(string_ret) - 1] = '\0';
 		*var_len = strlen(string_ret);
 		ret = (u_char *)string_ret;
 		break;
 	case ASTCHANMACROCONTEXT:
-		strncpy(string_ret, chan->macrocontext, sizeof(string_ret));
+		strncpy(string_ret, ast_channel_macrocontext(chan), sizeof(string_ret));
 		string_ret[sizeof(string_ret) - 1] = '\0';
 		*var_len = strlen(string_ret);
 		ret = (u_char *)string_ret;
 		break;
 	case ASTCHANMACROEXTEN:
-		strncpy(string_ret, chan->macroexten, sizeof(string_ret));
+		strncpy(string_ret, ast_channel_macroexten(chan), sizeof(string_ret));
 		string_ret[sizeof(string_ret) - 1] = '\0';
 		*var_len = strlen(string_ret);
 		ret = (u_char *)string_ret;
@@ -367,7 +367,7 @@ static u_char *ast_var_channels_table(struct variable *vp, oid *name, size_t *le
 		ret = (u_char *)&long_ret;
 		break;
 	case ASTCHANEXTEN:
-		strncpy(string_ret, chan->exten, sizeof(string_ret));
+		strncpy(string_ret, ast_channel_exten(chan), sizeof(string_ret));
 		string_ret[sizeof(string_ret) - 1] = '\0';
 		*var_len = strlen(string_ret);
 		ret = (u_char *)string_ret;