diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-23 17:27:07 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-08-23 17:27:07 +0000 |
| commit | 027ab8b7a4e25691c8b6a2bf0336215958e8a333 (patch) | |
| tree | d25d3e791e0aee5f252539a51d0a73cf951ccae7 /res/snmp | |
| parent | 2bd1fa599b845a71571845b81ca6e0f58fe52f24 (diff) | |
Fix a typo in the Asterisk MIB and fix astNumChanBridged so it acts as a counter again
(closes issue #10118, patch by jeffg)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@80510 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/snmp')
| -rw-r--r-- | res/snmp/agent.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/res/snmp/agent.c b/res/snmp/agent.c index 6d497183b..b728c55a9 100644 --- a/res/snmp/agent.c +++ b/res/snmp/agent.c @@ -138,7 +138,8 @@ static oid asterisk_oid[] = { 1, 3, 6, 1, 4, 1, 22736, 1 }; #define ASTCHANTYPETRANSFER 6 #define ASTCHANTYPECHANNELS 7 -#define ASTCHANBRIDGECOUNT 5 +#define ASTCHANSCALARS 5 +#define ASTCHANBRIDGECOUNT 1 void *agent_thread(void *arg) { @@ -546,9 +547,10 @@ static u_char *ast_var_channel_types_table(struct variable *vp, oid *name, size_ static u_char *ast_var_channel_bridge(struct variable *vp, oid *name, size_t *length, int exact, size_t *var_len, WriteMethod **write_method) { - static unsigned long long_ret = 0; + static unsigned long long_ret; struct ast_channel *chan = NULL; + long_ret = 0; if (header_generic(vp, name, length, exact, var_len, write_method)) return NULL; @@ -778,7 +780,7 @@ static void init_asterisk_mib(void) {ASTCHANTYPEINDICATIONS, ASN_INTEGER, RONLY, ast_var_channel_types_table, 4, {ASTCHANNELS, ASTCHANTYPETABLE, 1, ASTCHANTYPEINDICATIONS}}, {ASTCHANTYPETRANSFER, ASN_INTEGER, RONLY, ast_var_channel_types_table, 4, {ASTCHANNELS, ASTCHANTYPETABLE, 1, ASTCHANTYPETRANSFER}}, {ASTCHANTYPECHANNELS, ASN_GAUGE, RONLY, ast_var_channel_types_table, 4, {ASTCHANNELS, ASTCHANTYPETABLE, 1, ASTCHANTYPECHANNELS}}, - {ASTCHANBRIDGECOUNT, ASN_GAUGE, RONLY, ast_var_channel_bridge, 2, {ASTCHANNELS, ASTCHANBRIDGECOUNT}}, + {ASTCHANBRIDGECOUNT, ASN_GAUGE, RONLY, ast_var_channel_bridge, 3, {ASTCHANNELS, ASTCHANSCALARS, ASTCHANBRIDGECOUNT}}, }; register_sysORTable(asterisk_oid, OID_LENGTH(asterisk_oid), |