Fix a typo in the Asterisk MIB and fix astNumChanBridged so it acts as a counter...

(closes issue #10118, patch by jeffg)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80510 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/doc/asterisk-mib.txt b/doc/asterisk-mib.txt
index 0b0e7b8..f30f4a7 100644 (file)
--- a/doc/asterisk-mib.txt
+++ b/doc/asterisk-mib.txt
@@ -736,7 +736,7 @@ astChanTypeChannels OBJECT-TYPE
                "Number of active channels using the current technology."
        ::= { astChanTypeEntry 7 }
 
-astChanScalars OBJECT-IDENTIFIER ::= { asteriskChannels 5 }
+astChanScalars OBJECT IDENTIFIER ::= { asteriskChannels 5 }
 
 astNumChanBridge OBJECT-TYPE
        SYNTAX          Gauge32
@@ -744,6 +744,6 @@ astNumChanBridge OBJECT-TYPE
        STATUS          current
        DESCRIPTION
                "Number of channels currently in a bridged state."
-       ::= { asteriskChanScalars 1 }
+       ::= { astChanScalars 1 }
 
 END

diff --git a/res/snmp/agent.c b/res/snmp/agent.c
index 6d49718..b728c55 100644 (file)
--- 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),