summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_agent.c34
-rw-r--r--channels/chan_alsa.c4
-rw-r--r--channels/chan_bridge.c4
-rw-r--r--channels/chan_console.c4
-rw-r--r--channels/chan_dahdi.c24
-rw-r--r--channels/chan_gtalk.c10
-rw-r--r--channels/chan_h323.c4
-rw-r--r--channels/chan_iax2.c22
-rw-r--r--channels/chan_jingle.c8
-rw-r--r--channels/chan_local.c14
-rw-r--r--channels/chan_mgcp.c10
-rw-r--r--channels/chan_misdn.c8
-rw-r--r--channels/chan_multicast_rtp.c2
-rw-r--r--channels/chan_nbs.c4
-rw-r--r--channels/chan_oss.c4
-rw-r--r--channels/chan_phone.c4
-rw-r--r--channels/chan_sip.c48
-rw-r--r--channels/chan_skinny.c12
-rw-r--r--channels/chan_unistim.c6
-rw-r--r--channels/chan_usbradio.c4
-rw-r--r--channels/sig_analog.c10
-rw-r--r--channels/sig_pri.c7
22 files changed, 123 insertions, 124 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 75aceacc7..3a9689511 100644
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -522,7 +522,7 @@ static int __agent_start_monitoring(struct ast_channel *ast, struct agent_pvt *p
if (!p)
return -1;
if (!ast->monitor) {
- snprintf(filename, sizeof(filename), "agent-%s-%s",p->agent, ast->uniqueid);
+ snprintf(filename, sizeof(filename), "agent-%s-%s",p->agent, ast_channel_uniqueid(ast));
/* substitute . for - */
if ((pointer = strchr(filename, '.')))
*pointer = '-';
@@ -795,12 +795,12 @@ static int agent_call(struct ast_channel *ast, char *dest, int timeout)
return res;
}
ast_verb(3, "agent_call, call to agent '%s' call on '%s'\n", p->agent, ast_channel_name(p->chan));
- ast_debug(3, "Playing beep, lang '%s'\n", p->chan->language);
+ ast_debug(3, "Playing beep, lang '%s'\n", ast_channel_language(p->chan));
chan = p->chan;
ast_mutex_unlock(&p->lock);
- res = ast_streamfile(chan, beep, chan->language);
+ res = ast_streamfile(chan, beep, ast_channel_language(chan));
ast_debug(3, "Played beep, result '%d'\n", res);
if (!res) {
res = ast_waitstream(chan, "");
@@ -1065,7 +1065,7 @@ static struct ast_channel *agent_new(struct agent_pvt *p, int state, const char
ast_format_copy(&tmp->rawwriteformat, &p->chan->writeformat);
ast_format_copy(&tmp->readformat, &p->chan->readformat);
ast_format_copy(&tmp->rawreadformat, &p->chan->readformat);
- ast_string_field_set(tmp, language, p->chan->language);
+ ast_channel_language_set(tmp, ast_channel_language(p->chan));
ast_copy_string(tmp->context, p->chan->context, sizeof(tmp->context));
ast_copy_string(tmp->exten, p->chan->exten, sizeof(tmp->exten));
/* XXX Is this really all we copy form the originating channel?? */
@@ -1270,7 +1270,7 @@ static int check_availability(struct agent_pvt *newlyavailable, int needlock)
if (!p->abouttograb && p->pending && ((p->group && (newlyavailable->group & p->group)) || !strcmp(p->agent, newlyavailable->agent))) {
ast_debug(1, "Call '%s' looks like a winner for agent '%s'\n", ast_channel_name(p->owner), newlyavailable->agent);
/* We found a pending call, time to merge */
- chan = agent_new(newlyavailable, AST_STATE_DOWN, p->owner ? p->owner->linkedid : NULL);
+ chan = agent_new(newlyavailable, AST_STATE_DOWN, p->owner ? ast_channel_linkedid(p->owner) : NULL);
parent = p->owner;
p->abouttograb = 1;
ast_mutex_unlock(&p->lock);
@@ -1285,8 +1285,8 @@ static int check_availability(struct agent_pvt *newlyavailable, int needlock)
/* Don't do beep here */
res = 0;
} else {
- ast_debug(3, "Playing beep, lang '%s'\n", newlyavailable->chan->language);
- res = ast_streamfile(newlyavailable->chan, beep, newlyavailable->chan->language);
+ ast_debug(3, "Playing beep, lang '%s'\n", ast_channel_language(newlyavailable->chan));
+ res = ast_streamfile(newlyavailable->chan, beep, ast_channel_language(newlyavailable->chan));
ast_debug(3, "Played beep, result '%d'\n", res);
if (!res) {
res = ast_waitstream(newlyavailable->chan, "");
@@ -1340,8 +1340,8 @@ static int check_beep(struct agent_pvt *newlyavailable, int needlock)
AST_LIST_UNLOCK(&agents);
if (p) {
ast_mutex_unlock(&newlyavailable->lock);
- ast_debug(3, "Playing beep, lang '%s'\n", newlyavailable->chan->language);
- res = ast_streamfile(newlyavailable->chan, beep, newlyavailable->chan->language);
+ ast_debug(3, "Playing beep, lang '%s'\n", ast_channel_language(newlyavailable->chan));
+ res = ast_streamfile(newlyavailable->chan, beep, ast_channel_language(newlyavailable->chan));
ast_debug(1, "Played beep, result '%d'\n", res);
if (!res) {
res = ast_waitstream(newlyavailable->chan, "");
@@ -1386,7 +1386,7 @@ static struct ast_channel *agent_request(const char *type, struct ast_format_cap
/* Agent must be registered, but not have any active call, and not be in a waiting state */
if (!p->owner && p->chan) {
/* Fixed agent */
- chan = agent_new(p, AST_STATE_DOWN, requestor ? requestor->linkedid : NULL);
+ chan = agent_new(p, AST_STATE_DOWN, requestor ? ast_channel_linkedid(requestor) : NULL);
}
if (chan) {
ast_mutex_unlock(&p->lock);
@@ -1409,7 +1409,7 @@ static struct ast_channel *agent_request(const char *type, struct ast_format_cap
/* Agent must be registered, but not have any active call, and not be in a waiting state */
if (!p->owner && p->chan) {
/* Could still get a fixed agent */
- chan = agent_new(p, AST_STATE_DOWN, requestor ? requestor->linkedid : NULL);
+ chan = agent_new(p, AST_STATE_DOWN, requestor ? ast_channel_linkedid(requestor) : NULL);
}
if (chan) {
ast_mutex_unlock(&p->lock);
@@ -1428,7 +1428,7 @@ static struct ast_channel *agent_request(const char *type, struct ast_format_cap
ast_debug(1, "Creating place holder for '%s'\n", s);
p = add_agent(data, 1);
p->group = groupmatch;
- chan = agent_new(p, AST_STATE_DOWN, requestor ? requestor->linkedid : NULL);
+ chan = agent_new(p, AST_STATE_DOWN, requestor ? ast_channel_linkedid(requestor) : NULL);
if (!chan)
ast_log(LOG_WARNING, "Weird... Fix this to drop the unused pending agent\n");
} else {
@@ -2011,7 +2011,7 @@ static int login_exec(struct ast_channel *chan, const char *data)
ast_mutex_unlock(&p->lock);
AST_LIST_UNLOCK(&agents);
if( !res && play_announcement==1 )
- res = ast_streamfile(chan, filename, chan->language);
+ res = ast_streamfile(chan, filename, ast_channel_language(chan));
if (!res)
ast_waitstream(chan, "");
AST_LIST_LOCK(&agents);
@@ -2043,10 +2043,10 @@ static int login_exec(struct ast_channel *chan, const char *data)
"Agent: %s\r\n"
"Channel: %s\r\n"
"Uniqueid: %s\r\n",
- p->agent, ast_channel_name(chan), chan->uniqueid);
+ p->agent, ast_channel_name(chan), ast_channel_uniqueid(chan));
if (update_cdr && chan->cdr)
snprintf(chan->cdr->channel, sizeof(chan->cdr->channel), "Agent/%s", p->agent);
- ast_queue_log("NONE", chan->uniqueid, agent, "AGENTLOGIN", "%s", ast_channel_name(chan));
+ ast_queue_log("NONE", ast_channel_uniqueid(chan), agent, "AGENTLOGIN", "%s", ast_channel_name(chan));
ast_verb(2, "Agent '%s' logged in (format %s/%s)\n", p->agent,
ast_getformatname(&chan->readformat), ast_getformatname(&chan->writeformat));
/* Login this channel and wait for it to go away */
@@ -2135,8 +2135,8 @@ static int login_exec(struct ast_channel *chan, const char *data)
"Agent: %s\r\n"
"Logintime: %ld\r\n"
"Uniqueid: %s\r\n",
- p->agent, logintime, chan->uniqueid);
- ast_queue_log("NONE", chan->uniqueid, agent, "AGENTLOGOFF", "%s|%ld", ast_channel_name(chan), logintime);
+ p->agent, logintime, ast_channel_uniqueid(chan));
+ ast_queue_log("NONE", ast_channel_uniqueid(chan), agent, "AGENTLOGOFF", "%s|%ld", ast_channel_name(chan), logintime);
ast_verb(2, "Agent '%s' logged out\n", p->agent);
/* If there is no owner, go ahead and kill it now */
ast_devstate_changed(AST_DEVICE_UNAVAILABLE, "Agent/%s", p->agent);
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index 8f380909a..4f06ba481 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -582,7 +582,7 @@ static struct ast_channel *alsa_new(struct chan_alsa_pvt *p, int state, const ch
if (!ast_strlen_zero(p->exten))
ast_copy_string(tmp->exten, p->exten, sizeof(tmp->exten));
if (!ast_strlen_zero(language))
- ast_string_field_set(tmp, language, language);
+ ast_channel_language_set(tmp, language);
p->owner = tmp;
ast_module_ref(ast_module_info->self);
ast_jb_configure(tmp, &global_jbconf);
@@ -615,7 +615,7 @@ static struct ast_channel *alsa_request(const char *type, struct ast_format_cap
if (alsa.owner) {
ast_log(LOG_NOTICE, "Already have a call on the ALSA channel\n");
*cause = AST_CAUSE_BUSY;
- } else if (!(tmp = alsa_new(&alsa, AST_STATE_DOWN, requestor ? requestor->linkedid : NULL))) {
+ } else if (!(tmp = alsa_new(&alsa, AST_STATE_DOWN, requestor ? ast_channel_linkedid(requestor) : NULL))) {
ast_log(LOG_WARNING, "Unable to create new ALSA channel\n");
}
diff --git a/channels/chan_bridge.c b/channels/chan_bridge.c
index 3e12b3995..dd37af608 100644
--- a/channels/chan_bridge.c
+++ b/channels/chan_bridge.c
@@ -166,11 +166,11 @@ static struct ast_channel *bridge_request(const char *type, struct ast_format_ca
}
/* Try to grab two Asterisk channels to use as input and output channels */
- if (!(p->input = ast_channel_alloc(1, AST_STATE_UP, 0, 0, "", "", "", requestor ? requestor->linkedid : NULL, 0, "Bridge/%p-input", p))) {
+ if (!(p->input = ast_channel_alloc(1, AST_STATE_UP, 0, 0, "", "", "", requestor ? ast_channel_linkedid(requestor) : NULL, 0, "Bridge/%p-input", p))) {
ao2_ref(p, -1);
return NULL;
}
- if (!(p->output = ast_channel_alloc(1, AST_STATE_UP, 0, 0, "", "", "", requestor ? requestor->linkedid : NULL, 0, "Bridge/%p-output", p))) {
+ if (!(p->output = ast_channel_alloc(1, AST_STATE_UP, 0, 0, "", "", "", requestor ? ast_channel_linkedid(requestor) : NULL, 0, "Bridge/%p-output", p))) {
p->input = ast_channel_release(p->input);
ao2_ref(p, -1);
return NULL;
diff --git a/channels/chan_console.c b/channels/chan_console.c
index 7e2301073..68e34026f 100644
--- a/channels/chan_console.c
+++ b/channels/chan_console.c
@@ -428,7 +428,7 @@ static struct ast_channel *console_new(struct console_pvt *pvt, const char *ext,
pvt->owner = chan;
if (!ast_strlen_zero(pvt->language))
- ast_string_field_set(chan, language, pvt->language);
+ ast_channel_language_set(chan, pvt->language);
ast_jb_configure(chan, &global_jbconf);
@@ -467,7 +467,7 @@ static struct ast_channel *console_request(const char *type, struct ast_format_c
}
console_pvt_lock(pvt);
- chan = console_new(pvt, NULL, NULL, AST_STATE_DOWN, requestor ? requestor->linkedid : NULL);
+ chan = console_new(pvt, NULL, NULL, AST_STATE_DOWN, requestor ? ast_channel_linkedid(requestor) : NULL);
console_pvt_unlock(pvt);
if (!chan)
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index da167d64e..2380149ff 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -2173,7 +2173,7 @@ static void dahdi_ami_channel_event(struct dahdi_pvt *p, struct ast_channel *cha
"DAHDISpan: %d\r\n"
"DAHDIChannel: %s\r\n",
ast_channel_name(chan),
- chan->uniqueid,
+ ast_channel_uniqueid(chan),
p->span,
ch_name);
}
@@ -2569,7 +2569,7 @@ static struct ast_channel *my_new_analog_ast_channel(void *pvt, int state, int s
struct dahdi_pvt *p = pvt;
int dsub = analogsub_to_dahdisub(sub);
- return dahdi_new(p, state, startpbx, dsub, 0, requestor ? requestor->linkedid : "");
+ return dahdi_new(p, state, startpbx, dsub, 0, requestor ? ast_channel_linkedid(requestor) : "");
}
#if defined(HAVE_PRI) || defined(HAVE_SS7)
@@ -2624,7 +2624,7 @@ static struct ast_channel *my_new_pri_ast_channel(void *pvt, int state, enum sig
newlaw = DAHDI_LAW_MULAW;
break;
}
- return dahdi_new(p, state, 0, SUB_REAL, newlaw, requestor ? requestor->linkedid : "");
+ return dahdi_new(p, state, 0, SUB_REAL, newlaw, requestor ? ast_channel_linkedid(requestor) : "");
}
#endif /* defined(HAVE_PRI) */
@@ -3484,7 +3484,7 @@ static struct ast_channel *my_new_ss7_ast_channel(void *pvt, int state, enum sig
newlaw = DAHDI_LAW_MULAW;
break;
}
- return dahdi_new(p, state, 0, SUB_REAL, newlaw, requestor ? requestor->linkedid : "");
+ return dahdi_new(p, state, 0, SUB_REAL, newlaw, requestor ? ast_channel_linkedid(requestor) : "");
}
#endif /* defined(HAVE_SS7) */
@@ -9675,19 +9675,19 @@ static struct ast_channel *dahdi_new(struct dahdi_pvt *i, int state, int startpb
tmp->pickupgroup = i->pickupgroup;
}
if (!ast_strlen_zero(i->parkinglot))
- ast_string_field_set(tmp, parkinglot, i->parkinglot);
+ ast_channel_parkinglot_set(tmp, i->parkinglot);
if (!ast_strlen_zero(i->language))
- ast_string_field_set(tmp, language, i->language);
+ ast_channel_language_set(tmp, i->language);
if (!i->owner)
i->owner = tmp;
if (!ast_strlen_zero(i->accountcode))
- ast_string_field_set(tmp, accountcode, i->accountcode);
+ ast_channel_accountcode_set(tmp, i->accountcode);
if (i->amaflags)
tmp->amaflags = i->amaflags;
i->subs[idx].owner = tmp;
ast_copy_string(tmp->context, i->context, sizeof(tmp->context));
if (!analog_lib_handles(i->sig, i->radio, i->oprmode)) {
- ast_string_field_set(tmp, call_forward, i->call_forward);
+ ast_channel_call_forward_set(tmp, i->call_forward);
}
/* If we've been told "no ADSI" then enforce it */
if (!i->adsi)
@@ -10167,7 +10167,7 @@ static void *analog_ss_thread(void *data)
ast_log(LOG_WARNING, "Unable to start special tone on %d\n", p->channel);
else
sleep(1);
- res = ast_streamfile(chan, "ss-noservice", chan->language);
+ res = ast_streamfile(chan, "ss-noservice", ast_channel_language(chan));
if (res >= 0)
ast_waitstream(chan, "");
res = tone_zone_play_tone(p->subs[idx].dfd, DAHDI_TONE_CONGESTION);
@@ -13692,7 +13692,7 @@ static struct ast_channel *dahdi_request(const char *type, struct ast_format_cap
tmp = sig_ss7_request(p->sig_pvt, SIG_SS7_DEFLAW, requestor, transcapdigital);
#endif /* defined(HAVE_SS7) */
} else {
- tmp = dahdi_new(p, AST_STATE_RESERVED, 0, p->owner ? SUB_CALLWAIT : SUB_REAL, 0, requestor ? requestor->linkedid : "");
+ tmp = dahdi_new(p, AST_STATE_RESERVED, 0, p->owner ? SUB_CALLWAIT : SUB_REAL, 0, requestor ? ast_channel_linkedid(requestor) : "");
}
if (!tmp) {
p->outgoing = 0;
@@ -16029,8 +16029,8 @@ static int action_dahdishowchannels(struct mansession *s, const struct message *
"\r\n",
tmp->channel,
ast_channel_name(tmp->owner),
- tmp->owner->uniqueid,
- tmp->owner->accountcode,
+ ast_channel_uniqueid(tmp->owner),
+ ast_channel_accountcode(tmp->owner),
sig2str(tmp->sig),
tmp->sig,
tmp->context,
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index 21b80e254..d9464d1a6 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -1181,15 +1181,15 @@ static struct ast_channel *gtalk_new(struct gtalk *client, struct gtalk_pvt *i,
tmp->caller.id.name.presentation = client->callingpres;
tmp->caller.id.number.presentation = client->callingpres;
if (!ast_strlen_zero(client->accountcode))
- ast_string_field_set(tmp, accountcode, client->accountcode);
+ ast_channel_accountcode_set(tmp, client->accountcode);
if (client->amaflags)
tmp->amaflags = client->amaflags;
if (!ast_strlen_zero(client->language))
- ast_string_field_set(tmp, language, client->language);
+ ast_channel_language_set(tmp, client->language);
if (!ast_strlen_zero(client->musicclass))
- ast_string_field_set(tmp, musicclass, client->musicclass);
+ ast_channel_musicclass_set(tmp, client->musicclass);
if (!ast_strlen_zero(client->parkinglot))
- ast_string_field_set(tmp, parkinglot, client->parkinglot);
+ ast_channel_parkinglot_set(tmp, client->parkinglot);
i->owner = tmp;
ast_module_ref(ast_module_info->self);
ast_copy_string(tmp->context, client->context, sizeof(tmp->context));
@@ -1940,7 +1940,7 @@ static struct ast_channel *gtalk_request(const char *type, struct ast_format_cap
ASTOBJ_WRLOCK(client);
p = gtalk_alloc(client, strchr(sender, '@') ? sender : client->connection->jid->full, strchr(to, '@') ? to : client->user, NULL);
if (p) {
- chan = gtalk_new(client, p, AST_STATE_DOWN, to, requestor ? requestor->linkedid : NULL);
+ chan = gtalk_new(client, p, AST_STATE_DOWN, to, requestor ? ast_channel_linkedid(requestor) : NULL);
}
ASTOBJ_UNLOCK(client);
return chan;
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 80970a9ea..ce4ce5741 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -1098,7 +1098,7 @@ static struct ast_channel *__oh323_new(struct oh323_pvt *pvt, int state, const c
ast_copy_string(ch->exten, pvt->exten, sizeof(ch->exten));
ch->priority = 1;
if (!ast_strlen_zero(pvt->accountcode)) {
- ast_string_field_set(ch, accountcode, pvt->accountcode);
+ ast_channel_accountcode_set(ch, pvt->accountcode);
}
if (pvt->amaflags) {
ch->amaflags = pvt->amaflags;
@@ -1860,7 +1860,7 @@ static struct ast_channel *oh323_request(const char *type, struct ast_format_cap
ast_mutex_unlock(&caplock);
ast_mutex_lock(&pvt->lock);
- tmpc = __oh323_new(pvt, AST_STATE_DOWN, tmp1, requestor ? requestor->linkedid : NULL);
+ tmpc = __oh323_new(pvt, AST_STATE_DOWN, tmp1, requestor ? ast_channel_linkedid(requestor) : NULL);
ast_mutex_unlock(&pvt->lock);
if (!tmpc) {
oh323_destroy(pvt);
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index c799955a0..2255801c0 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -5177,8 +5177,8 @@ static int iax2_call(struct ast_channel *c, char *dest, int timeout)
iax_ie_append_str(&ied, IAX_IE_CALLING_ANI, c->connected.ani.number.str);
}
- if (!ast_strlen_zero(c->language))
- iax_ie_append_str(&ied, IAX_IE_LANGUAGE, c->language);
+ if (!ast_strlen_zero(ast_channel_language(c)))
+ iax_ie_append_str(&ied, IAX_IE_LANGUAGE, ast_channel_language(c));
if (!ast_strlen_zero(c->dialed.number.str)) {
iax_ie_append_str(&ied, IAX_IE_DNID, c->dialed.number.str);
}
@@ -5824,7 +5824,7 @@ static struct ast_channel *ast_iax2_new(int callno, int state, iax2_format capab
tmp->tech_pvt = CALLNO_TO_PTR(i->callno);
if (!ast_strlen_zero(i->parkinglot))
- ast_string_field_set(tmp, parkinglot, i->parkinglot);
+ ast_channel_parkinglot_set(tmp, i->parkinglot);
/* Don't use ast_set_callerid() here because it will
* generate a NewCallerID event before the NewChannel event */
if (!ast_strlen_zero(i->ani)) {
@@ -5844,9 +5844,9 @@ static struct ast_channel *ast_iax2_new(int callno, int state, iax2_format capab
tmp->caller.id.number.plan = i->calling_ton;
tmp->dialed.transit_network_select = i->calling_tns;
if (!ast_strlen_zero(i->language))
- ast_string_field_set(tmp, language, i->language);
+ ast_channel_language_set(tmp, i->language);
if (!ast_strlen_zero(i->accountcode))
- ast_string_field_set(tmp, accountcode, i->accountcode);
+ ast_channel_accountcode_set(tmp, i->accountcode);
if (i->amaflags)
tmp->amaflags = i->amaflags;
ast_copy_string(tmp->context, i->context, sizeof(tmp->context));
@@ -9390,8 +9390,8 @@ static int iax_park(struct ast_channel *chan1, struct ast_channel *chan2, const
struct ast_channel *chan1m, *chan2m;/* Chan2m: The transferer, chan1m: The transferee */
pthread_t th;
- chan1m = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, chan2->accountcode, chan1->exten, chan1->context, chan1->linkedid, chan1->amaflags, "Parking/%s", ast_channel_name(chan1));
- chan2m = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, chan2->accountcode, chan2->exten, chan2->context, chan2->linkedid, chan2->amaflags, "IAXPeer/%s", ast_channel_name(chan2));
+ chan1m = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, ast_channel_accountcode(chan2), chan1->exten, chan1->context, ast_channel_linkedid(chan1), chan1->amaflags, "Parking/%s", ast_channel_name(chan1));
+ chan2m = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, ast_channel_accountcode(chan2), chan2->exten, chan2->context, ast_channel_linkedid(chan2), chan2->amaflags, "IAXPeer/%s", ast_channel_name(chan2));
d = ast_calloc(1, sizeof(*d));
if (!chan1m || !chan2m || !d) {
if (chan1m) {
@@ -9441,7 +9441,7 @@ static int iax_park(struct ast_channel *chan1, struct ast_channel *chan2, const
/* Make formats okay */
chan2m->readformat = chan2->readformat;
chan2m->writeformat = chan2->writeformat;
- ast_string_field_set(chan2m, parkinglot, chan2->parkinglot);
+ ast_channel_parkinglot_set(chan2m, ast_channel_parkinglot(chan2));
/* Prepare for taking over the channel */
if (ast_channel_masquerade(chan2m, chan2)) {
@@ -10496,7 +10496,7 @@ static int socket_process(struct iax2_thread *thread)
"Channel: %s\r\n"
"Uniqueid: %s\r\n",
ast_channel_name(iaxs[fr->callno]->owner),
- iaxs[fr->callno]->owner->uniqueid);
+ ast_channel_uniqueid(iaxs[fr->callno]->owner));
}
ast_set_flag64(iaxs[fr->callno], IAX_QUELCH);
@@ -10533,7 +10533,7 @@ static int socket_process(struct iax2_thread *thread)
"Channel: %s\r\n"
"Uniqueid: %s\r\n",
ast_channel_name(iaxs[fr->callno]->owner),
- iaxs[fr->callno]->owner->uniqueid);
+ ast_channel_uniqueid(iaxs[fr->callno]->owner));
}
ast_clear_flag64(iaxs[fr->callno], IAX_QUELCH);
@@ -12219,7 +12219,7 @@ static struct ast_channel *iax2_request(const char *type, struct ast_format_cap
if (cai.found)
ast_string_field_set(iaxs[callno], host, pds.peer);
- c = ast_iax2_new(callno, AST_STATE_DOWN, cai.capability, requestor ? requestor->linkedid : NULL);
+ c = ast_iax2_new(callno, AST_STATE_DOWN, cai.capability, requestor ? ast_channel_linkedid(requestor) : NULL);
ast_mutex_unlock(&iaxsl[callno]);
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index aad52e3cc..af0bd6ad8 100644
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -893,13 +893,13 @@ static struct ast_channel *jingle_new(struct jingle *client, struct jingle_pvt *
tmp->caller.id.name.presentation = client->callingpres;
tmp->caller.id.number.presentation = client->callingpres;
if (!ast_strlen_zero(client->accountcode))
- ast_string_field_set(tmp, accountcode, client->accountcode);
+ ast_channel_accountcode_set(tmp, client->accountcode);
if (client->amaflags)
tmp->amaflags = client->amaflags;
if (!ast_strlen_zero(client->language))
- ast_string_field_set(tmp, language, client->language);
+ ast_channel_language_set(tmp, client->language);
if (!ast_strlen_zero(client->musicclass))
- ast_string_field_set(tmp, musicclass, client->musicclass);
+ ast_channel_musicclass_set(tmp, client->musicclass);
i->owner = tmp;
ast_copy_string(tmp->context, client->context, sizeof(tmp->context));
ast_copy_string(tmp->exten, i->exten, sizeof(tmp->exten));
@@ -1583,7 +1583,7 @@ static struct ast_channel *jingle_request(const char *type, struct ast_format_ca
ASTOBJ_WRLOCK(client);
p = jingle_alloc(client, to, NULL);
if (p)
- chan = jingle_new(client, p, AST_STATE_DOWN, to, requestor ? requestor->linkedid : NULL);
+ chan = jingle_new(client, p, AST_STATE_DOWN, to, requestor ? ast_channel_linkedid(requestor) : NULL);
ASTOBJ_UNLOCK(client);
return chan;
diff --git a/channels/chan_local.c b/channels/chan_local.c
index 69e6841e9..4d9ba9d51 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -860,9 +860,9 @@ static int local_call(struct ast_channel *ast, char *dest, int timeout)
ast_connected_line_copy_to_caller(&chan->caller, &owner->connected);
ast_connected_line_copy_from_caller(&chan->connected, &owner->caller);
- ast_string_field_set(chan, language, owner->language);
- ast_string_field_set(chan, accountcode, owner->accountcode);
- ast_string_field_set(chan, musicclass, owner->musicclass);
+ ast_channel_language_set(chan, ast_channel_language(owner));
+ ast_channel_accountcode_set(chan, ast_channel_accountcode(owner));
+ ast_channel_musicclass_set(chan, ast_channel_musicclass(owner));
ast_cdr_update(chan);
ast_channel_cc_params_init(chan, ast_channel_get_cc_config_params(owner));
@@ -917,7 +917,7 @@ static int local_call(struct ast_channel *ast, char *dest, int timeout)
"Context: %s\r\n"
"Exten: %s\r\n"
"LocalOptimization: %s\r\n",
- ast_channel_name(p->owner), ast_channel_name(p->chan), p->owner->uniqueid, p->chan->uniqueid,
+ ast_channel_name(p->owner), ast_channel_name(p->chan), ast_channel_uniqueid(p->owner), ast_channel_uniqueid(p->chan),
p->context, p->exten,
ast_test_flag(p, LOCAL_NO_OPTIMIZATION) ? "Yes" : "No");
@@ -1131,8 +1131,8 @@ static struct ast_channel *local_new(struct local_pvt *p, int state, const char
/* Allocate two new Asterisk channels */
/* safe accountcode */
- if (p->owner && p->owner->accountcode)
- t = p->owner->accountcode;
+ if (p->owner && ast_channel_accountcode(p->owner))
+ t = ast_channel_accountcode(p->owner);
else
t = "";
@@ -1192,7 +1192,7 @@ static struct ast_channel *local_request(const char *type, struct ast_format_cap
/* Allocate a new private structure and then Asterisk channel */
if ((p = local_alloc(data, cap))) {
- if (!(chan = local_new(p, AST_STATE_DOWN, requestor ? requestor->linkedid : NULL))) {
+ if (!(chan = local_new(p, AST_STATE_DOWN, requestor ? ast_channel_linkedid(requestor) : NULL))) {
ao2_unlink(locals, p);
}
if (chan && ast_channel_cc_params_init(chan, requestor ? ast_channel_get_cc_config_params((struct ast_channel *)requestor) : NULL)) {
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 8c3ddd0ce..cdb4bf79f 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -1524,16 +1524,16 @@ static struct ast_channel *mgcp_new(struct mgcp_subchannel *sub, int state, cons
ast_format_copy(&tmp->rawreadformat, &tmpfmt);
tmp->tech_pvt = sub;
if (!ast_strlen_zero(i->language))
- ast_string_field_set(tmp, language, i->language);
+ ast_channel_language_set(tmp, i->language);
if (!ast_strlen_zero(i->accountcode))
- ast_string_field_set(tmp, accountcode, i->accountcode);
+ ast_channel_accountcode_set(tmp, i->accountcode);
if (i->amaflags)
tmp->amaflags = i->amaflags;
sub->owner = tmp;
ast_module_ref(ast_module_info->self);
tmp->callgroup = i->callgroup;
tmp->pickupgroup = i->pickupgroup;
- ast_string_field_set(tmp, call_forward, i->call_forward);
+ ast_channel_call_forward_set(tmp, i->call_forward);
ast_copy_string(tmp->context, i->context, sizeof(tmp->context));
ast_copy_string(tmp->exten, i->exten, sizeof(tmp->exten));
@@ -3091,7 +3091,7 @@ static void *mgcp_ss(void *data)
} else if (p->callreturn && !strcmp(p->dtmf_buf, "*69")) {
res = 0;
if (!ast_strlen_zero(p->lastcallerid)) {
- res = ast_say_digit_str(chan, p->lastcallerid, "", chan->language);
+ res = ast_say_digit_str(chan, p->lastcallerid, "", ast_channel_language(chan));
}
if (!res)
/*res = tone_zone_play_tone(p->subs[index].zfd, DAHDI_TONE_DIALRECALL);*/
@@ -3960,7 +3960,7 @@ static struct ast_channel *mgcp_request(const char *type, struct ast_format_cap
ast_mutex_unlock(&sub->lock);
return NULL;
}
- tmpc = mgcp_new(sub->owner ? sub->next : sub, AST_STATE_DOWN, requestor ? requestor->linkedid : NULL);
+ tmpc = mgcp_new(sub->owner ? sub->next : sub, AST_STATE_DOWN, requestor ? ast_channel_linkedid(requestor) : NULL);
ast_mutex_unlock(&sub->lock);
if (!tmpc)
ast_log(LOG_WARNING, "Unable to make channel for '%s'\n", tmp);
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index a9614344a..579b3c2cf 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -5919,7 +5919,7 @@ static int read_config(struct chan_list *ch)
chan_misdn_log(1, port, "read_config: Getting Config\n");
misdn_cfg_get(port, MISDN_CFG_LANGUAGE, lang, sizeof(lang));
- ast_string_field_set(ast, language, lang);
+ ast_channel_language_set(ast, lang);
misdn_cfg_get(port, MISDN_CFG_MUSICCLASS, ch->mohinterpret, sizeof(ch->mohinterpret));
@@ -8005,7 +8005,7 @@ static struct ast_channel *misdn_request(const char *type, struct ast_format_cap
}
cl->bc = newbc;
- ast = misdn_new(cl, AST_STATE_RESERVED, args.ext, NULL, cap, requestor ? requestor->linkedid : NULL, port, channel);
+ ast = misdn_new(cl, AST_STATE_RESERVED, args.ext, NULL, cap, requestor ? ast_channel_linkedid(requestor) : NULL, port, channel);
if (!ast) {
chan_list_unref(cl, "Failed to create a new channel");
ast_log(LOG_ERROR, "Could not create Asterisk channel for Dial(%s)\n", dial_str);
@@ -9137,7 +9137,7 @@ static void misdn_facility_ie_handler(enum event_e event, struct misdn_bchannel
bc->redirecting.reason = mISDN_REDIRECTING_REASON_DEFLECTION;
misdn_copy_redirecting_to_ast(ch->ast, &bc->redirecting, bc->incoming_cid_tag);
- ast_string_field_set(ch->ast, call_forward, bc->redirecting.to.number);
+ ast_channel_call_forward_set(ch->ast, bc->redirecting.to.number);
/* Send back positive ACK */
#if 1
@@ -9296,7 +9296,7 @@ static void misdn_facility_ie_handler(enum event_e event, struct misdn_bchannel
bc->redirecting.reason = mISDN_REDIRECTING_REASON_DEFLECTION;
misdn_copy_redirecting_to_ast(ch->ast, &bc->redirecting, bc->incoming_cid_tag);
- ast_string_field_set(ch->ast, call_forward, bc->redirecting.to.number);
+ ast_channel_call_forward_set(ch->ast, bc->redirecting.to.number);
misdn_lib_send_event(bc, EVENT_DISCONNECT);
diff --git a/channels/chan_multicast_rtp.c b/channels/chan_multicast_rtp.c
index 929525ffb..f1cabcef4 100644
--- a/channels/chan_multicast_rtp.c
+++ b/channels/chan_multicast_rtp.c
@@ -149,7 +149,7 @@ static struct ast_channel *multicast_rtp_request(const char *type, struct ast_fo
goto failure;
}
- if (!(chan = ast_channel_alloc(1, AST_STATE_DOWN, "", "", "", "", "", requestor ? requestor->linkedid : "", 0, "MulticastRTP/%p", instance))) {
+ if (!(chan = ast_channel_alloc(1, AST_STATE_DOWN, "", "", "", "", "", requestor ? ast_channel_linkedid(requestor) : "", 0, "MulticastRTP/%p", instance))) {
ast_rtp_instance_destroy(instance);
goto failure;
}
diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c
index d9885c14e..95b41d4de 100644
--- a/channels/chan_nbs.c
+++ b/channels/chan_nbs.c
@@ -236,7 +236,7 @@ static struct ast_channel *nbs_new(struct nbs_pvt *i, int state, const char *lin
tmp->tech_pvt = i;
ast_copy_string(tmp->context, context, sizeof(tmp->context));
ast_copy_string(tmp->exten, "s", sizeof(tmp->exten));
- ast_string_field_set(tmp, language, "");
+ ast_channel_language_set(tmp, "");
i->owner = tmp;
i->u = ast_module_user_add(tmp);
if (state != AST_STATE_DOWN) {
@@ -263,7 +263,7 @@ static struct ast_channel *nbs_request(const char *type, struct ast_format_cap *
}
p = nbs_alloc(data);
if (p) {
- tmp = nbs_new(p, AST_STATE_DOWN, requestor ? requestor->linkedid : NULL);
+ tmp = nbs_new(p, AST_STATE_DOWN, requestor ? ast_channel_linkedid(requestor) : NULL);
if (!tmp)
nbs_destroy(p);
}
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index f74a3ae36..bf044a420 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -808,7 +808,7 @@ static struct ast_channel *oss_new(struct chan_oss_pvt *o, char *ext, char *ctx,
c->tech_pvt = o;
if (!ast_strlen_zero(o->language))
- ast_string_field_set(c, language, o->language);
+ ast_channel_language_set(c, o->language);
/* Don't use ast_set_callerid() here because it will
* generate a needless NewCallerID event */
if (!ast_strlen_zero(o->cid_num)) {
@@ -864,7 +864,7 @@ static struct ast_channel *oss_request(const char *type, struct ast_format_cap *
*cause = AST_CAUSE_BUSY;
return NULL;
}
- c = oss_new(o, NULL, NULL, AST_STATE_DOWN, requestor ? requestor->linkedid : NULL);
+ c = oss_new(o, NULL, NULL, AST_STATE_DOWN, requestor ? ast_channel_linkedid(requestor) : NULL);
if (c == NULL) {
ast_log(LOG_WARNING, "Unable to create new OSS channel\n");
return NULL;
diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index 1281f149a..e8409941f 100644
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -880,7 +880,7 @@ static struct ast_channel *phone_new(struct phone_pvt *i, int state, char *cntx,
else
strcpy(tmp->exten, "s");
if (!ast_strlen_zero(i->language))
- ast_string_field_set(tmp, language, i->language);
+ ast_channel_language_set(tmp, i->language);
/* Don't use ast_set_callerid() here because it will
* generate a NewCallerID event before the NewChannel event */
@@ -1249,7 +1249,7 @@ static struct ast_channel *phone_request(const char *type, struct ast_format_cap
if (strncmp(name, p->dev + 5, length) == 0 &&
!isalnum(name[length])) {
if (!p->owner) {
- tmp = phone_new(p, AST_STATE_DOWN, p->context, requestor ? requestor->linkedid : NULL);
+ tmp = phone_new(p, AST_STATE_DOWN, p->context, requestor ? ast_channel_linkedid(requestor) : NULL);
break;
} else
*cause = AST_CAUSE_BUSY;
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 5b2bfa8a1..a29ca9c55 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -7174,16 +7174,16 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit
tmp->caller.id.name.presentation = i->callingpres;
tmp->caller.id.number.presentation = i->callingpres;
if (!ast_strlen_zero(i->parkinglot)) {
- ast_string_field_set(tmp, parkinglot, i->parkinglot);
+ ast_channel_parkinglot_set(tmp, i->parkinglot);
}
if (!ast_strlen_zero(i->accountcode)) {
- ast_string_field_set(tmp, accountcode, i->accountcode);
+ ast_channel_accountcode_set(tmp, i->accountcode);
}
if (i->amaflags) {
tmp->amaflags = i->amaflags;
}
if (!ast_strlen_zero(i->language)) {
- ast_string_field_set(tmp, language, i->language);
+ ast_channel_language_set(tmp, i->language);
}
if (!ast_strlen_zero(i->zone)) {
if (!(tmp->zone = ast_get_indication_zone(i->zone))) {
@@ -7250,7 +7250,7 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit
if (sip_cfg.callevents) {
manager_event(EVENT_FLAG_SYSTEM, "ChannelUpdate",
"Channel: %s\r\nUniqueid: %s\r\nChanneltype: %s\r\nSIPcallid: %s\r\nSIPfullcontact: %s\r\n",
- ast_channel_name(tmp), tmp->uniqueid, "SIP", i->callid, i->fullcontact);
+ ast_channel_name(tmp), ast_channel_uniqueid(tmp), "SIP", i->callid, i->fullcontact);
}
return tmp;
@@ -8821,7 +8821,7 @@ static void change_hold_state(struct sip_pvt *dialog, struct sip_request *req, i
"Uniqueid: %s\r\n",
holdstate ? "On" : "Off",
ast_channel_name(dialog->owner),
- dialog->owner->uniqueid);
+ ast_channel_uniqueid(dialog->owner));
append_history(dialog, holdstate ? "Hold" : "Unhold", "%s", req->data->str);
if (!holdstate) { /* Put off remote hold */
ast_clear_flag(&dialog->flags[1], SIP_PAGE2_CALL_ONHOLD); /* Clear both flags */
@@ -20148,11 +20148,11 @@ static void parse_moved_contact(struct sip_pvt *p, struct sip_request *req, char
*host++ = '\0';
ast_debug(2, "Found promiscuous redirection to 'SIP/%s::::%s@%s'\n", contact_number, sip_get_transport(transport), host);
if (p->owner)
- ast_string_field_build(p->owner, call_forward, "SIP/%s::::%s@%s", contact_number, sip_get_transport(transport), host);
+ ast_channel_call_forward_build(p->owner, "SIP/%s::::%s@%s", contact_number, sip_get_transport(transport), host);
} else {
ast_debug(2, "Found promiscuous redirection to 'SIP/::::%s@%s'\n", sip_get_transport(transport), contact_number);
if (p->owner)
- ast_string_field_build(p->owner, call_forward, "SIP/::::%s@%s", sip_get_transport(transport), contact_number);
+ ast_channel_call_forward_build(p->owner, "SIP/::::%s@%s", sip_get_transport(transport), contact_number);
}
} else {
separator = strchr(contact, '@');
@@ -20179,7 +20179,7 @@ static void parse_moved_contact(struct sip_pvt *p, struct sip_request *req, char
ast_debug(2, "Received 302 Redirect to extension '%s' (domain %s)\n", contact_number, domain);
if (p->owner) {
pbx_builtin_setvar_helper(p->owner, "SIPDOMAIN", domain);
- ast_string_field_set(p->owner, call_forward, contact_number);
+ ast_channel_call_forward_set(p->owner, contact_number);
}
}
}
@@ -20663,7 +20663,7 @@ static void handle_response_invite(struct sip_pvt *p, int resp, const char *rest
if (sip_cfg.callevents) {
manager_event(EVENT_FLAG_SYSTEM, "ChannelUpdate",
"Channel: %s\r\nChanneltype: %s\r\nUniqueid: %s\r\nSIPcallid: %s\r\nSIPfullcontact: %s\r\nPeername: %s\r\n",
- ast_channel_name(p->owner), "SIP", p->owner->uniqueid, p->callid, p->fullcontact, p->peername);
+ ast_channel_name(p->owner), "SIP", ast_channel_uniqueid(p->owner), p->callid, p->fullcontact, p->peername);
}
} else { /* RE-invite */
if (p->t38.state == T38_DISABLED || p->t38.state == T38_REJECTED) {
@@ -21933,8 +21933,8 @@ static int sip_park(struct ast_channel *chan1, struct ast_channel *chan2, struct
struct ast_channel *transferee, *transferer;
pthread_t th;
- transferee = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, chan1->accountcode, chan1->exten, chan1->context, chan1->linkedid, chan1->amaflags, "Parking/%s", ast_channel_name(chan1));
- transferer = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, chan2->accountcode, chan2->exten, chan2->context, chan2->linkedid, chan2->amaflags, "SIPPeer/%s", ast_channel_name(chan2));
+ transferee = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, ast_channel_accountcode(chan1), chan1->exten, chan1->context, ast_channel_linkedid(chan1), chan1->amaflags, "Parking/%s", ast_channel_name(chan1));
+ transferer = ast_channel_alloc(0, AST_STATE_DOWN, 0, 0, ast_channel_accountcode(chan2), chan2->exten, chan2->context, ast_channel_linkedid(chan2), chan2->amaflags, "SIPPeer/%s", ast_channel_name(chan2));
d = ast_calloc(1, sizeof(*d));
if (!transferee || !transferer || !d) {
if (transferee) {
@@ -21984,7 +21984,7 @@ static int sip_park(struct ast_channel *chan1, struct ast_channel *chan2, struct
/* Make formats okay */
transferer->readformat = chan2->readformat;
transferer->writeformat = chan2->writeformat;
- ast_string_field_set(transferer, parkinglot, chan2->parkinglot);
+ ast_channel_parkinglot_set(transferer, ast_channel_parkinglot(chan2));
/* Prepare for taking over the channel */
if (ast_channel_masquerade(transferer, chan2)) {
@@ -22804,7 +22804,7 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int
ast_string_field_set(p, theirtag, NULL);
/* Treat this as if there were a call forward instead...
*/
- ast_string_field_set(p->owner, call_forward, peerorhost);
+ ast_channel_call_forward_set(p->owner, peerorhost);
ast_queue_control(p->owner, AST_CONTROL_BUSY);
res = INV_REQ_FAILED;
goto request_invite_cleanup;
@@ -23642,7 +23642,7 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual *
ast_set_flag(&transferer->flags[0], SIP_DEFER_BYE_ON_TRANSFER); /* Delay hangup */
- ast_copy_string(transferer_linkedid, transferer->owner->linkedid, sizeof(transferer_linkedid));
+ ast_copy_string(transferer_linkedid, ast_channel_linkedid(transferer->owner), sizeof(transferer_linkedid));
/* Perform the transfer */
chans[0] = transferer->owner;
@@ -23656,10 +23656,10 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual *
"TargetChannel: %s\r\n"
"TargetUniqueid: %s\r\n",
ast_channel_name(transferer->owner),
- transferer->owner->uniqueid,
+ ast_channel_uniqueid(transferer->owner),
transferer->callid,
ast_channel_name(target.chan1),
- target.chan1->uniqueid);
+ ast_channel_uniqueid(target.chan1));
ast_party_connected_line_init(&connected_to_transferee);
ast_party_connected_line_init(&connected_to_target);
/* No need to lock current->chan1 here since it was locked in sipsock_read */
@@ -23687,7 +23687,7 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual *
transmit_notify_with_sipfrag(transferer, seqno, "200 OK", TRUE);
append_history(transferer, "Xfer", "Refer succeeded");
transferer->refer->status = REFER_200OK;
- if (target.chan2 && !ast_strlen_zero(xfersound) && ast_streamfile(target.chan2, xfersound, target.chan2->language) >= 0) {
+ if (target.chan2 && !ast_strlen_zero(xfersound) && ast_streamfile(target.chan2, xfersound, ast_channel_language(target.chan2)) >= 0) {
ast_waitstream(target.chan2, "");
}
@@ -24062,10 +24062,10 @@ static int handle_request_refer(struct sip_pvt *p, struct sip_request *req, int
"TransferExten: %s\r\n"
"Transfer2Parking: Yes\r\n",
ast_channel_name(current.chan1),
- current.chan1->uniqueid,
+ ast_channel_uniqueid(current.chan1),
callid,
ast_channel_name(current.chan2),
- current.chan2->uniqueid,
+ ast_channel_uniqueid(current.chan2),
refer_to);
if (sipdebug) {
@@ -24169,10 +24169,10 @@ static int handle_request_refer(struct sip_pvt *p, struct sip_request *req, int
"TransferExten: %s\r\n"
"TransferContext: %s\r\n",
ast_channel_name(current.chan1),
- current.chan1->uniqueid,
+ ast_channel_uniqueid(current.chan1),
callid,
ast_channel_name(current.chan2),
- current.chan2->uniqueid,
+ ast_channel_uniqueid(current.chan2),
refer_to,
refer_to_context);
/* Success - we have a new channel */
@@ -26388,7 +26388,7 @@ static int check_rtp_timeout(struct sip_pvt *dialog, time_t t)
ast_log(LOG_NOTICE, "Disconnecting call '%s' for lack of RTP activity in %ld seconds\n",
ast_channel_name(dialog->owner), (long) (t - dialog->lastrtprx));
manager_event(EVENT_FLAG_CALL, "SessionTimeout", "Source: RTPTimeout\r\n"
- "Channel: %s\r\nUniqueid: %s\r\n", ast_channel_name(dialog->owner), dialog->owner->uniqueid);
+ "Channel: %s\r\nUniqueid: %s\r\n", ast_channel_name(dialog->owner), ast_channel_uniqueid(dialog->owner));
/* Issue a softhangup */
ast_softhangup_nolock(dialog->owner, AST_SOFTHANGUP_DEV);
ast_channel_unlock(dialog->owner);
@@ -26642,7 +26642,7 @@ static int proc_session_timer(const void *vp)
}
manager_event(EVENT_FLAG_CALL, "SessionTimeout", "Source: SIPSessionTimer\r\n"
- "Channel: %s\r\nUniqueid: %s\r\n", ast_channel_name(p->owner), p->owner->uniqueid);
+ "Channel: %s\r\nUniqueid: %s\r\n", ast_channel_name(p->owner), ast_channel_uniqueid(p->owner));
ast_softhangup_nolock(p->owner, AST_SOFTHANGUP_DEV);
ast_channel_unlock(p->owner);
sip_pvt_unlock(p);
@@ -27272,7 +27272,7 @@ static struct ast_channel *sip_request_call(const char *type, struct ast_format_
ast_format_cap_joint_copy(cap, p->caps, p->jointcaps);
sip_pvt_lock(p);
- tmpc = sip_new(p, AST_STATE_DOWN, host, requestor ? requestor->linkedid : NULL); /* Place the call */
+ tmpc = sip_new(p, AST_STATE_DOWN, host, requestor ? ast_channel_linkedid(requestor) : NULL); /* Place the call */
if (sip_cfg.callevents)
manager_event(EVENT_FLAG_SYSTEM, "ChannelUpdate",
"Channel: %s\r\nChanneltype: %s\r\nSIPcallid: %s\r\nSIPfullcontact: %s\r\nPeername: %s\r\n",
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 05ee648ba..ab967339f 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -4904,11 +4904,11 @@ static struct ast_channel *skinny_new(struct skinny_line *l, struct skinny_subli
ast_format_copy(&tmp->rawreadformat, &tmpfmt);
if (!ast_strlen_zero(l->language))
- ast_string_field_set(tmp, language, l->language);
+ ast_channel_language_set(tmp, l->language);
if (!ast_strlen_zero(l->accountcode))
- ast_string_field_set(tmp, accountcode, l->accountcode);
+ ast_channel_accountcode_set(tmp, l->accountcode);
if (!ast_strlen_zero(l->parkinglot))
- ast_string_field_set(tmp, parkinglot, l->parkinglot);
+ ast_channel_parkinglot_set(tmp, l->parkinglot);
if (l->amaflags)
tmp->amaflags = l->amaflags;
@@ -4918,10 +4918,10 @@ static struct ast_channel *skinny_new(struct skinny_line *l, struct skinny_subli
/* XXX Need to figure out how to handle CFwdNoAnswer */
if (l->cfwdtype & SKINNY_CFWD_ALL) {
- ast_string_field_set(tmp, call_forward, l->call_forward_all);
+ ast_channel_call_forward_set(tmp, l->call_forward_all);
} else if (l->cfwdtype & SKINNY_CFWD_BUSY) {
if (get_devicestate(l) != AST_DEVICE_NOT_INUSE) {
- ast_string_field_set(tmp, call_forward, l->call_forward_busy);
+ ast_channel_call_forward_set(tmp, l->call_forward_busy);
}
}
@@ -7107,7 +7107,7 @@ static struct ast_channel *skinny_request(const char *type, struct ast_format_ca
l = subline->line;
}
ast_verb(3, "skinny_request(%s)\n", tmp);
- tmpc = skinny_new(l, subline, AST_STATE_DOWN, requestor ? requestor->linkedid : NULL, SKINNY_INCOMING);
+ tmpc = skinny_new(l, subline, AST_STATE_DOWN, requestor ? ast_channel_linkedid(requestor) : NULL, SKINNY_INCOMING);
if (!tmpc) {
ast_log(LOG_WARNING, "Unable to make channel for '%s'\n", tmp);
} else if (subline) {
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index 45267724e..d303f078b 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -4593,7 +4593,7 @@ static struct ast_channel *unistim_new(struct unistim_subchannel *sub, int state
tmp->tech_pvt = sub;
tmp->tech = &unistim_tech;
if (!ast_strlen_zero(l->language))
- ast_string_field_set(tmp, language, l->language);
+ ast_channel_language_set(tmp, l->language);
sub->owner = tmp;
ast_mutex_lock(&usecnt_lock);
usecnt++;
@@ -4601,7 +4601,7 @@ static struct ast_channel *unistim_new(struct unistim_subchannel *sub, int state
ast_update_use_count();
tmp->callgroup = l->callgroup;
tmp->pickupgroup = l->pickupgroup;
- ast_string_field_set(tmp, call_forward, l->parent->call_forward);
+ ast_channel_call_forward_set(tmp, l->parent->call_forward);
if (!ast_strlen_zero(l->cid_num)) {
char *name, *loc, *instr;
instr = ast_strdup(l->cid_num);
@@ -4778,7 +4778,7 @@ static struct ast_channel *unistim_request(const char *type, struct ast_format_c
return NULL;
}
ast_format_cap_copy(sub->parent->cap, cap);
- tmpc = unistim_new(sub, AST_STATE_DOWN, requestor ? requestor->linkedid : NULL);
+ tmpc = unistim_new(sub, AST_STATE_DOWN, requestor ? ast_channel_linkedid(requestor) : NULL);
if (!tmpc)
ast_log(LOG_WARNING, "Unable to make channel for '%s'\n", tmp);
if (unistimdebug)
diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c
index 541a325f3..8afc3fd88 100644
--- a/channels/chan_usbradio.c
+++ b/channels/chan_usbradio.c
@@ -2189,7 +2189,7 @@ static struct ast_channel *usbradio_new(struct chan_usbradio_pvt *o, char *ext,
c->tech_pvt = o;
if (!ast_strlen_zero(o->language))
- ast_string_field_set(c, language, o->language);
+ ast_channel_language_set(c, o->language);
/* Don't use ast_set_callerid() here because it will
* generate a needless NewCallerID event */
if (!ast_strlen_zero(o->cid_num)) {
@@ -2241,7 +2241,7 @@ static struct ast_channel *usbradio_request(const char *type, struct ast_format_
*cause = AST_CAUSE_BUSY;
return NULL;
}
- c = usbradio_new(o, NULL, NULL, AST_STATE_DOWN, requestor ? requestor->linkedid : NULL);
+ c = usbradio_new(o, NULL, NULL, AST_STATE_DOWN, requestor ? ast_channel_linkedid(requestor) : NULL);
if (c == NULL) {
ast_log(LOG_WARNING, "Unable to create new usb channel\n");
return NULL;
diff --git a/channels/sig_analog.c b/channels/sig_analog.c
index 7a7b34555..a3457b7a7 100644
--- a/channels/sig_analog.c
+++ b/channels/sig_analog.c
@@ -439,7 +439,7 @@ static struct ast_channel * analog_new_ast_channel(struct analog_pvt *p, int sta
c = p->calls->new_ast_channel(p->chan_pvt, state, startpbx, sub, requestor);
if (c) {
- ast_string_field_set(c, call_forward, p->call_forward);
+ ast_channel_call_forward_set(c, p->call_forward);
}
p->subs[sub].owner = c;
if (!p->owner) {
@@ -705,7 +705,7 @@ static int analog_attempt_transfer(struct analog_pvt *p, int inthreeway)
(owner_real->_state == AST_STATE_RINGING
|| owner_3way->_state == AST_STATE_RINGING)
? AST_CEL_BLINDTRANSFER : AST_CEL_ATTENDEDTRANSFER,
- NULL, owner_3way->linkedid, NULL);
+ NULL, ast_channel_linkedid(owner_3way), NULL);
/*
* The three-way party we're about to transfer is on hold if he
@@ -731,7 +731,7 @@ static int analog_attempt_transfer(struct analog_pvt *p, int inthreeway)
(owner_real->_state == AST_STATE_RINGING
|| owner_3way->_state == AST_STATE_RINGING)
? AST_CEL_BLINDTRANSFER : AST_CEL_ATTENDEDTRANSFER,
- NULL, owner_3way->linkedid, NULL);
+ NULL, ast_channel_linkedid(owner_3way), NULL);
/*
* The three-way party we're about to transfer is on hold if he
@@ -2078,7 +2078,7 @@ static void *__analog_ss_thread(void *data)
} else {
sleep(1);
}
- res = ast_streamfile(chan, "ss-noservice", chan->language);
+ res = ast_streamfile(chan, "ss-noservice", ast_channel_language(chan));
if (res >= 0) {
ast_waitstream(chan, "");
}
@@ -2233,7 +2233,7 @@ static void *__analog_ss_thread(void *data)
} else if (p->callreturn && !strcmp(exten, "*69")) {
res = 0;
if (!ast_strlen_zero(p->lastcid_num)) {
- res = ast_say_digit_str(chan, p->lastcid_num, "", chan->language);
+ res = ast_say_digit_str(chan, p->lastcid_num, "", ast_channel_language(chan));
}
if (!res) {
res = analog_play_tone(p, idx, ANALOG_TONE_DIALRECALL);
diff --git a/channels/sig_pri.c b/channels/sig_pri.c
index 3c0f908ac..f9e658175 100644
--- a/channels/sig_pri.c
+++ b/channels/sig_pri.c
@@ -2217,7 +2217,7 @@ static void sig_pri_mcid_event(struct sig_pri_span *pri, const struct pri_subcmd
ast_queue_control(owner, AST_CONTROL_MCID);
ast_str_append(&msg, 0, "Channel: %s\r\n", ast_channel_name(owner));
- ast_str_append(&msg, 0, "UniqueID: %s\r\n", owner->uniqueid);
+ ast_str_append(&msg, 0, "UniqueID: %s\r\n", ast_channel_uniqueid(owner));
sig_pri_event_party_id(&msg, "CallerID", &owner->connected.id);
} else {
@@ -4228,8 +4228,7 @@ static void sig_pri_handle_subcmds(struct sig_pri_span *pri, int chanpos, int ev
ast_party_redirecting_free(&ast_redirecting);
/* Request the core to forward to the new number. */
- ast_string_field_set(owner, call_forward,
- subcmd->u.rerouting.deflection.to.number.str);
+ ast_channel_call_forward_set(owner, subcmd->u.rerouting.deflection.to.number.str);
/* Wake up the channel. */
ast_queue_frame(owner, &ast_null_frame);
@@ -5081,7 +5080,7 @@ static void sig_pri_ami_hold_event(struct ast_channel *chan, int is_held)
"Uniqueid: %s\r\n",
is_held ? "On" : "Off",
ast_channel_name(chan),
- chan->uniqueid);
+ ast_channel_uniqueid(chan));
}
#endif /* defined(HAVE_PRI_CALL_HOLD) */
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 13:02:29 +0000