summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/res_agi.c38
-rw-r--r--res/res_fax.c2
-rw-r--r--res/res_monitor.c4
-rw-r--r--res/res_musiconhold.c18
-rw-r--r--res/snmp/agent.c18
5 files changed, 40 insertions, 40 deletions
diff --git a/res/res_agi.c b/res/res_agi.c
index a5cd5ecc8..2ad1023f8 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -1722,9 +1722,9 @@ static void setup_env(struct ast_channel *chan, char *request, int fd, int enhan
thing */
ast_agi_send(fd, chan, "agi_request: %s\n", request);
ast_agi_send(fd, chan, "agi_channel: %s\n", ast_channel_name(chan));
- ast_agi_send(fd, chan, "agi_language: %s\n", chan->language);
+ ast_agi_send(fd, chan, "agi_language: %s\n", ast_channel_language(chan));
ast_agi_send(fd, chan, "agi_type: %s\n", chan->tech->type);
- ast_agi_send(fd, chan, "agi_uniqueid: %s\n", chan->uniqueid);
+ ast_agi_send(fd, chan, "agi_uniqueid: %s\n", ast_channel_uniqueid(chan));
ast_agi_send(fd, chan, "agi_version: %s\n", ast_get_version());
/* ANI/DNIS */
@@ -1748,7 +1748,7 @@ static void setup_env(struct ast_channel *chan, char *request, int fd, int enhan
ast_agi_send(fd, chan, "agi_enhanced: %s\n", enhanced ? "1.0" : "0.0");
/* User information */
- ast_agi_send(fd, chan, "agi_accountcode: %s\n", chan->accountcode ? chan->accountcode : "");
+ ast_agi_send(fd, chan, "agi_accountcode: %s\n", ast_channel_accountcode(chan) ? ast_channel_accountcode(chan) : "");
ast_agi_send(fd, chan, "agi_threadid: %ld\n", (long)pthread_self());
/* Send any parameters to the fastagi server that have been passed via the agi application */
@@ -1946,12 +1946,12 @@ static int handle_streamfile(struct ast_channel *chan, AGI *agi, int argc, const
return RESULT_SHOWUSAGE;
}
- if (!(fs = ast_openstream(chan, argv[2], chan->language))) {
+ if (!(fs = ast_openstream(chan, argv[2], ast_channel_language(chan)))) {
ast_agi_send(agi->fd, chan, "200 result=%d endpos=%ld\n", 0, sample_offset);
return RESULT_SUCCESS;
}
- if ((vfs = ast_openvstream(chan, argv[2], chan->language))) {
+ if ((vfs = ast_openvstream(chan, argv[2], ast_channel_language(chan)))) {
ast_debug(1, "Ooh, found a video stream, too\n");
}
@@ -2004,13 +2004,13 @@ static int handle_getoption(struct ast_channel *chan, AGI *agi, int argc, const
timeout = chan->pbx->dtimeoutms; /* in msec */
}
- if (!(fs = ast_openstream(chan, argv[2], chan->language))) {
+ if (!(fs = ast_openstream(chan, argv[2], ast_channel_language(chan)))) {
ast_agi_send(agi->fd, chan, "200 result=%d endpos=%ld\n", 0, sample_offset);
ast_log(LOG_WARNING, "Unable to open %s\n", argv[2]);
return RESULT_SUCCESS;
}
- if ((vfs = ast_openvstream(chan, argv[2], chan->language)))
+ if ((vfs = ast_openvstream(chan, argv[2], ast_channel_language(chan))))
ast_debug(1, "Ooh, found a video stream, too\n");
ast_verb(3, "Playing '%s' (escape_digits=%s) (timeout %d)\n", argv[2], edigits, timeout);
@@ -2060,7 +2060,7 @@ static int handle_saynumber(struct ast_channel *chan, AGI *agi, int argc, const
return RESULT_SHOWUSAGE;
if (sscanf(argv[2], "%30d", &num) != 1)
return RESULT_SHOWUSAGE;
- res = ast_say_number_full(chan, num, argv[3], chan->language, argc > 4 ? argv[4] : NULL, agi->audio, agi->ctrl);
+ res = ast_say_number_full(chan, num, argv[3], ast_channel_language(chan), argc > 4 ? argv[4] : NULL, agi->audio, agi->ctrl);
if (res == 1)
return RESULT_SUCCESS;
ast_agi_send(agi->fd, chan, "200 result=%d\n", res);
@@ -2076,7 +2076,7 @@ static int handle_saydigits(struct ast_channel *chan, AGI *agi, int argc, const
if (sscanf(argv[2], "%30d", &num) != 1)
return RESULT_SHOWUSAGE;
- res = ast_say_digit_str_full(chan, argv[2], argv[3], chan->language, agi->audio, agi->ctrl);
+ res = ast_say_digit_str_full(chan, argv[2], argv[3], ast_channel_language(chan), agi->audio, agi->ctrl);
if (res == 1) /* New command */
return RESULT_SUCCESS;
ast_agi_send(agi->fd, chan, "200 result=%d\n", res);
@@ -2090,7 +2090,7 @@ static int handle_sayalpha(struct ast_channel *chan, AGI *agi, int argc, const c
if (argc != 4)
return RESULT_SHOWUSAGE;
- res = ast_say_character_str_full(chan, argv[2], argv[3], chan->language, agi->audio, agi->ctrl);
+ res = ast_say_character_str_full(chan, argv[2], argv[3], ast_channel_language(chan), agi->audio, agi->ctrl);
if (res == 1) /* New command */
return RESULT_SUCCESS;
ast_agi_send(agi->fd, chan, "200 result=%d\n", res);
@@ -2105,7 +2105,7 @@ static int handle_saydate(struct ast_channel *chan, AGI *agi, int argc, const ch
return RESULT_SHOWUSAGE;
if (sscanf(argv[2], "%30d", &num) != 1)
return RESULT_SHOWUSAGE;
- res = ast_say_date(chan, num, argv[3], chan->language);
+ res = ast_say_date(chan, num, argv[3], ast_channel_language(chan));
if (res == 1)
return RESULT_SUCCESS;
ast_agi_send(agi->fd, chan, "200 result=%d\n", res);
@@ -2120,7 +2120,7 @@ static int handle_saytime(struct ast_channel *chan, AGI *agi, int argc, const ch
return RESULT_SHOWUSAGE;
if (sscanf(argv[2], "%30d", &num) != 1)
return RESULT_SHOWUSAGE;
- res = ast_say_time(chan, num, argv[3], chan->language);
+ res = ast_say_time(chan, num, argv[3], ast_channel_language(chan));
if (res == 1)
return RESULT_SUCCESS;
ast_agi_send(agi->fd, chan, "200 result=%d\n", res);
@@ -2140,7 +2140,7 @@ static int handle_saydatetime(struct ast_channel *chan, AGI *agi, int argc, cons
format = argv[4];
} else {
/* XXX this doesn't belong here, but in the 'say' module */
- if (!strcasecmp(chan->language, "de")) {
+ if (!strcasecmp(ast_channel_language(chan), "de")) {
format = "A dBY HMS";
} else {
format = "ABdY 'digits/at' IMp";
@@ -2153,7 +2153,7 @@ static int handle_saydatetime(struct ast_channel *chan, AGI *agi, int argc, cons
if (ast_get_time_t(argv[2], &unixtime, 0, NULL))
return RESULT_SHOWUSAGE;
- res = ast_say_date_with_format(chan, unixtime, argv[3], chan->language, format, zone);
+ res = ast_say_date_with_format(chan, unixtime, argv[3], ast_channel_language(chan), format, zone);
if (res == 1)
return RESULT_SUCCESS;
@@ -2168,7 +2168,7 @@ static int handle_sayphonetic(struct ast_channel *chan, AGI *agi, int argc, cons
if (argc != 4)
return RESULT_SHOWUSAGE;
- res = ast_say_phonetic_str_full(chan, argv[2], argv[3], chan->language, agi->audio, agi->ctrl);
+ res = ast_say_phonetic_str_full(chan, argv[2], argv[3], ast_channel_language(chan), agi->audio, agi->ctrl);
if (res == 1) /* New command */
return RESULT_SUCCESS;
ast_agi_send(agi->fd, chan, "200 result=%d\n", res);
@@ -2306,10 +2306,10 @@ static int handle_recordfile(struct ast_channel *chan, AGI *agi, int argc, const
* caught below and taken to be a beep, else if it is a digit then it is a
* offset */
if ((argc >6) && (sscanf(argv[6], "%30ld", &sample_offset) != 1) && (!strchr(argv[6], '=')))
- res = ast_streamfile(chan, "beep", chan->language);
+ res = ast_streamfile(chan, "beep", ast_channel_language(chan));
if ((argc > 7) && (!strchr(argv[7], '=')))
- res = ast_streamfile(chan, "beep", chan->language);
+ res = ast_streamfile(chan, "beep", ast_channel_language(chan));
if (!res)
res = ast_waitstream(chan, argv[4]);
@@ -2947,7 +2947,7 @@ static int handle_speechrecognize(struct ast_channel *chan, AGI *agi, int argc,
}
/* Start playing prompt */
- speech_streamfile(chan, prompt, chan->language, offset);
+ speech_streamfile(chan, prompt, ast_channel_language(chan), offset);
/* Go into loop reading in frames, passing to speech thingy, checking for hangup, all that jazz */
while (ast_strlen_zero(reason)) {
@@ -3005,7 +3005,7 @@ static int handle_speechrecognize(struct ast_channel *chan, AGI *agi, int argc,
ast_stopstream(chan);
/* If a processing sound exists, or is not none - play it */
if (!ast_strlen_zero(speech->processing_sound) && strcasecmp(speech->processing_sound, "none"))
- speech_streamfile(chan, speech->processing_sound, chan->language, 0);
+ speech_streamfile(chan, speech->processing_sound, ast_channel_language(chan), 0);
}
break;
case AST_SPEECH_STATE_DONE:
diff --git a/res/res_fax.c b/res/res_fax.c
index 95d46f3bd..7e1a0c20a 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -1009,7 +1009,7 @@ static struct ast_fax_session *fax_session_new(struct ast_fax_session_details *d
return NULL;
}
- if (!(s->chan_uniqueid = ast_strdup(chan->uniqueid))) {
+ if (!(s->chan_uniqueid = ast_strdup(ast_channel_uniqueid(chan)))) {
fax_session_release(s, token);
ao2_ref(s, -1);
return NULL;
diff --git a/res/res_monitor.c b/res/res_monitor.c
index c5ecda4e4..be9c2a84d 100644
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -393,7 +393,7 @@ int AST_OPTIONAL_API_NAME(ast_monitor_start)(struct ast_channel *chan, const cha
"Channel: %s\r\n"
"Uniqueid: %s\r\n",
ast_channel_name(chan),
- chan->uniqueid);
+ ast_channel_uniqueid(chan));
} else {
ast_debug(1,"Cannot start monitoring %s, already monitored\n", ast_channel_name(chan));
res = -1;
@@ -511,7 +511,7 @@ int AST_OPTIONAL_API_NAME(ast_monitor_stop)(struct ast_channel *chan, int need_l
"Channel: %s\r\n"
"Uniqueid: %s\r\n",
ast_channel_name(chan),
- chan->uniqueid
+ ast_channel_uniqueid(chan)
);
pbx_builtin_setvar_helper(chan, "MONITORED", NULL);
}
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 7ef43ea23..e505c3ee1 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -297,7 +297,7 @@ static int ast_moh_files_next(struct ast_channel *chan)
if (ast_test_flag(state->class, MOH_ANNOUNCEMENT) && state->announcement == 0) {
state->announcement = 1;
- if (ast_openstream_full(chan, state->class->announcement, chan->language, 1)) {
+ if (ast_openstream_full(chan, state->class->announcement, ast_channel_language(chan), 1)) {
ast_debug(1, "%s Opened announcement '%s'\n", ast_channel_name(chan), state->class->announcement);
return 0;
}
@@ -336,7 +336,7 @@ static int ast_moh_files_next(struct ast_channel *chan)
}
for (tries = 0; tries < state->class->total_files; ++tries) {
- if (ast_openstream_full(chan, state->class->filearray[state->pos], chan->language, 1)) {
+ if (ast_openstream_full(chan, state->class->filearray[state->pos], ast_channel_language(chan), 1)) {
break;
}
@@ -504,7 +504,7 @@ static void moh_handle_digit(struct ast_channel *chan, char digit)
if ((class = get_mohbydigit(digit))) {
classname = ast_strdupa(class->name);
class = mohclass_unref(class, "Unreffing ao2_find from finding by digit");
- ast_string_field_set(chan,musicclass,classname);
+ ast_channel_musicclass_set(chan, classname);
ast_moh_stop(chan);
ast_moh_start(chan, classname, NULL);
}
@@ -847,7 +847,7 @@ static int set_moh_exec(struct ast_channel *chan, const char *data)
ast_log(LOG_WARNING, "SetMusicOnHold requires an argument (class)\n");
return -1;
}
- ast_string_field_set(chan, musicclass, data);
+ ast_channel_musicclass_set(chan, data);
return 0;
}
@@ -1371,10 +1371,10 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
* option.
* 4) The default class.
*/
- if (!ast_strlen_zero(chan->musicclass)) {
- mohclass = get_mohbyname(chan->musicclass, 1, 0);
+ if (!ast_strlen_zero(ast_channel_musicclass(chan))) {
+ mohclass = get_mohbyname(ast_channel_musicclass(chan), 1, 0);
if (!mohclass && realtime_possible) {
- var = ast_load_realtime("musiconhold", "name", chan->musicclass, SENTINEL);
+ var = ast_load_realtime("musiconhold", "name", ast_channel_musicclass(chan), SENTINEL);
}
}
if (!mohclass && !var && !ast_strlen_zero(mclass)) {
@@ -1556,7 +1556,7 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
"Channel: %s\r\n"
"UniqueID: %s\r\n"
"Class: %s\r\n",
- ast_channel_name(chan), chan->uniqueid,
+ ast_channel_name(chan), ast_channel_uniqueid(chan),
mohclass->name);
ast_set_flag(chan, AST_FLAG_MOH);
@@ -1589,7 +1589,7 @@ static void local_ast_moh_stop(struct ast_channel *chan)
"State: Stop\r\n"
"Channel: %s\r\n"
"UniqueID: %s\r\n",
- ast_channel_name(chan), chan->uniqueid);
+ ast_channel_name(chan), ast_channel_uniqueid(chan));
ast_channel_unlock(chan);
}
diff --git a/res/snmp/agent.c b/res/snmp/agent.c
index ff5410d96..153106e0d 100644
--- a/res/snmp/agent.c
+++ b/res/snmp/agent.c
@@ -276,8 +276,8 @@ static u_char *ast_var_channels_table(struct variable *vp, oid *name, size_t *le
}
break;
case ASTCHANLANGUAGE:
- if (!ast_strlen_zero(chan->language)) {
- strncpy(string_ret, chan->language, sizeof(string_ret));
+ if (!ast_strlen_zero(ast_channel_language(chan))) {
+ strncpy(string_ret, ast_channel_language(chan), sizeof(string_ret));
string_ret[sizeof(string_ret) - 1] = '\0';
*var_len = strlen(string_ret);
ret = (u_char *)string_ret;
@@ -290,8 +290,8 @@ static u_char *ast_var_channels_table(struct variable *vp, oid *name, size_t *le
ret = (u_char *)string_ret;
break;
case ASTCHANMUSICCLASS:
- if (!ast_strlen_zero(chan->musicclass)) {
- strncpy(string_ret, chan->musicclass, sizeof(string_ret));
+ if (!ast_strlen_zero(ast_channel_musicclass(chan))) {
+ strncpy(string_ret, ast_channel_musicclass(chan), sizeof(string_ret));
string_ret[sizeof(string_ret) - 1] = '\0';
*var_len = strlen(string_ret);
ret = (u_char *)string_ret;
@@ -377,23 +377,23 @@ static u_char *ast_var_channels_table(struct variable *vp, oid *name, size_t *le
ret = (u_char *)&long_ret;
break;
case ASTCHANACCOUNTCODE:
- if (!ast_strlen_zero(chan->accountcode)) {
- strncpy(string_ret, chan->accountcode, sizeof(string_ret));
+ if (!ast_strlen_zero(ast_channel_accountcode(chan))) {
+ strncpy(string_ret, ast_channel_accountcode(chan), sizeof(string_ret));
string_ret[sizeof(string_ret) - 1] = '\0';
*var_len = strlen(string_ret);
ret = (u_char *)string_ret;
}
break;
case ASTCHANFORWARDTO:
- if (!ast_strlen_zero(chan->call_forward)) {
- strncpy(string_ret, chan->call_forward, sizeof(string_ret));
+ if (!ast_strlen_zero(ast_channel_call_forward(chan))) {
+ strncpy(string_ret, ast_channel_call_forward(chan), sizeof(string_ret));
string_ret[sizeof(string_ret) - 1] = '\0';
*var_len = strlen(string_ret);
ret = (u_char *)string_ret;
}
break;
case ASTCHANUNIQUEID:
- strncpy(string_ret, chan->uniqueid, sizeof(string_ret));
+ strncpy(string_ret, ast_channel_uniqueid(chan), sizeof(string_ret));
string_ret[sizeof(string_ret) - 1] = '\0';
*var_len = strlen(string_ret);
ret = (u_char *)string_ret;
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 02:48:26 +0000