kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
(closes issue #10118, patch by jeffg)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80510 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-08-23 17:27:07 +00:00
parent b16f018d96
commit c50975fd06
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/asterisk-mib.txt
View File

@@ -736,7 +736,7 @@ astChanTypeChannels OBJECT-TYPE
"Number of active channels using the current technology." "Number of active channels using the current technology."
::= { astChanTypeEntry 7 } ::= { astChanTypeEntry 7 }
astChanScalars OBJECT-IDENTIFIER ::= { asteriskChannels 5 } astChanScalars OBJECT IDENTIFIER ::= { asteriskChannels 5 }
astNumChanBridge OBJECT-TYPE astNumChanBridge OBJECT-TYPE
SYNTAX Gauge32 SYNTAX Gauge32
@@ -744,6 +744,6 @@ astNumChanBridge OBJECT-TYPE
STATUS current STATUS current
DESCRIPTION DESCRIPTION
"Number of channels currently in a bridged state." "Number of channels currently in a bridged state."
::= { asteriskChanScalars 1 } ::= { astChanScalars 1 }
END END

8
res/snmp/agent.c
View File

@@ -138,7 +138,8 @@ static oid asterisk_oid[] = { 1, 3, 6, 1, 4, 1, 22736, 1 };
#define ASTCHANTYPETRANSFER 6 #define ASTCHANTYPETRANSFER 6
#define ASTCHANTYPECHANNELS 7 #define ASTCHANTYPECHANNELS 7
#define ASTCHANBRIDGECOUNT 5 #define ASTCHANSCALARS 5
#define ASTCHANBRIDGECOUNT 1
void *agent_thread(void *arg) 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, static u_char *ast_var_channel_bridge(struct variable *vp, oid *name, size_t *length,
int exact, size_t *var_len, WriteMethod **write_method) 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; struct ast_channel *chan = NULL;
long_ret = 0;
if (header_generic(vp, name, length, exact, var_len, write_method)) if (header_generic(vp, name, length, exact, var_len, write_method))
return NULL; 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}}, {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}}, {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}}, {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), register_sysORTable(asterisk_oid, OID_LENGTH(asterisk_oid),