summaryrefslogtreecommitdiff
path: root/res/snmp
diff options
context:
space:
mode:
authorTerry Wilson <twilson@digium.com>2012-02-29 16:52:47 +0000
committerTerry Wilson <twilson@digium.com>2012-02-29 16:52:47 +0000
commita9d607a35764d93790172cab1f630e14fb8e043c (patch)
treedadea55813cfc525898844c51eec824d468455cb /res/snmp
parent0b988da21c1ec856b7b8bad2434bf93498d17cfd (diff)
Opaquify ast_channel structs and lists
Review: https://reviewboard.asterisk.org/r/1773/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@357542 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/snmp')
-rw-r--r--res/snmp/agent.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/res/snmp/agent.c b/res/snmp/agent.c
index 3c0c48e1b..7e713f8b3 100644
--- a/res/snmp/agent.c
+++ b/res/snmp/agent.c
@@ -322,9 +322,9 @@ static u_char *ast_var_channels_table(struct variable *vp, oid *name, size_t *le
}
break;
case ASTCHANWHENHANGUP:
- if (!ast_tvzero(chan->whentohangup)) {
+ if (!ast_tvzero(*ast_channel_whentohangup(chan))) {
gettimeofday(&tval, NULL);
- long_ret = difftime(chan->whentohangup.tv_sec, tval.tv_sec) * 100 - tval.tv_usec / 10000;
+ long_ret = difftime(ast_channel_whentohangup(chan)->tv_sec, tval.tv_sec) * 100 - tval.tv_usec / 10000;
ret= (u_char *)&long_ret;
}
break;
@@ -419,59 +419,59 @@ static u_char *ast_var_channels_table(struct variable *vp, oid *name, size_t *le
ret = (u_char *)&long_ret;
break;
case ASTCHANCIDDNID:
- if (chan->dialed.number.str) {
- strncpy(string_ret, chan->dialed.number.str, sizeof(string_ret));
+ if (ast_channel_dialed(chan)->number.str) {
+ strncpy(string_ret, ast_channel_dialed(chan)->number.str, sizeof(string_ret));
string_ret[sizeof(string_ret) - 1] = '\0';
*var_len = strlen(string_ret);
ret = (u_char *)string_ret;
}
break;
case ASTCHANCIDNUM:
- if (chan->caller.id.number.valid && chan->caller.id.number.str) {
- strncpy(string_ret, chan->caller.id.number.str, sizeof(string_ret));
+ if (ast_channel_caller(chan)->id.number.valid && ast_channel_caller(chan)->id.number.str) {
+ strncpy(string_ret, ast_channel_caller(chan)->id.number.str, sizeof(string_ret));
string_ret[sizeof(string_ret) - 1] = '\0';
*var_len = strlen(string_ret);
ret = (u_char *)string_ret;
}
break;
case ASTCHANCIDNAME:
- if (chan->caller.id.name.valid && chan->caller.id.name.str) {
- strncpy(string_ret, chan->caller.id.name.str, sizeof(string_ret));
+ if (ast_channel_caller(chan)->id.name.valid && ast_channel_caller(chan)->id.name.str) {
+ strncpy(string_ret, ast_channel_caller(chan)->id.name.str, sizeof(string_ret));
string_ret[sizeof(string_ret) - 1] = '\0';
*var_len = strlen(string_ret);
ret = (u_char *)string_ret;
}
break;
case ASTCHANCIDANI:
- if (chan->caller.ani.number.valid && chan->caller.ani.number.str) {
- strncpy(string_ret, chan->caller.ani.number.str, sizeof(string_ret));
+ if (ast_channel_caller(chan)->ani.number.valid && ast_channel_caller(chan)->ani.number.str) {
+ strncpy(string_ret, ast_channel_caller(chan)->ani.number.str, sizeof(string_ret));
string_ret[sizeof(string_ret) - 1] = '\0';
*var_len = strlen(string_ret);
ret = (u_char *)string_ret;
}
break;
case ASTCHANCIDRDNIS:
- if (chan->redirecting.from.number.valid && chan->redirecting.from.number.str) {
- strncpy(string_ret, chan->redirecting.from.number.str, sizeof(string_ret));
+ if (ast_channel_redirecting(chan)->from.number.valid && ast_channel_redirecting(chan)->from.number.str) {
+ strncpy(string_ret, ast_channel_redirecting(chan)->from.number.str, sizeof(string_ret));
string_ret[sizeof(string_ret) - 1] = '\0';
*var_len = strlen(string_ret);
ret = (u_char *)string_ret;
}
break;
case ASTCHANCIDPRES:
- long_ret = ast_party_id_presentation(&chan->caller.id);
+ long_ret = ast_party_id_presentation(&ast_channel_caller(chan)->id);
ret = (u_char *)&long_ret;
break;
case ASTCHANCIDANI2:
- long_ret = chan->caller.ani2;
+ long_ret = ast_channel_caller(chan)->ani2;
ret = (u_char *)&long_ret;
break;
case ASTCHANCIDTON:
- long_ret = chan->caller.id.number.plan;
+ long_ret = ast_channel_caller(chan)->id.number.plan;
ret = (u_char *)&long_ret;
break;
case ASTCHANCIDTNS:
- long_ret = chan->dialed.transit_network_select;
+ long_ret = ast_channel_dialed(chan)->transit_network_select;
ret = (u_char *)&long_ret;
break;
case ASTCHANAMAFLAGS: