diff options
| author | Terry Wilson <twilson@digium.com> | 2012-01-24 20:12:09 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2012-01-24 20:12:09 +0000 |
| commit | 99cae5b7508f30a308afbbacf92ad306a30f68df (patch) | |
| tree | bdca00ce837e60a5f9a16fed06d02f6e77235035 /res/snmp | |
| parent | 2144ba5df2813609024964c4c2d9060b30d5cd43 (diff) | |
Opaquify channel stringfields
Continue channel opaque-ification by wrapping all of the stringfields.
Eventually, we will restrict what can actually set these variables, but
the purpose for now is to hide the implementation and keep people from
adding code that directly accesses the channel structure. Semantic
changes will follow afterward.
Review: https://reviewboard.asterisk.org/r/1661/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@352348 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/snmp')
| -rw-r--r-- | res/snmp/agent.c | 18 |
1 files changed, 9 insertions, 9 deletions
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; |