From d7038fd64d3b98ce3a0f216f3159154d75acc7dd Mon Sep 17 00:00:00 2001 From: jeffg Date: Fri, 20 Jun 2008 21:48:15 +0000 Subject: Merged revisions 124392-124393 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r124392 | jeffg | 2008-06-20 17:36:01 -0400 (Fri, 20 Jun 2008) | 9 lines Merged revisions 124372 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r124372 | jeffg | 2008-06-20 17:14:40 -0400 (Fri, 20 Jun 2008) | 1 line Fix issues in digium-mib.txt and asterisk-mib.txt to placate smilint - bug 12905 ........ ................ r124393 | jeffg | 2008-06-20 17:43:18 -0400 (Fri, 20 Jun 2008) | 12 lines (Missed committing . on previous commit.....) Merged revisions 124372 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r124372 | jeffg | 2008-06-20 17:14:40 -0400 (Fri, 20 Jun 2008) | 1 line Fix issues in digium-mib.txt and asterisk-mib.txt to placate smilint - bug 12905 ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@124394 f38db490-d61c-443f-a65b-d21fe96a405b --- doc/asterisk-mib.txt | 91 +++++++++++++++++++++++++++++----------------------- doc/digium-mib.txt | 13 ++++++-- 2 files changed, 60 insertions(+), 44 deletions(-) (limited to 'doc') diff --git a/doc/asterisk-mib.txt b/doc/asterisk-mib.txt index 9f62cf673..e7d6c1719 100644 --- a/doc/asterisk-mib.txt +++ b/doc/asterisk-mib.txt @@ -1,7 +1,8 @@ ASTERISK-MIB DEFINITIONS ::= BEGIN IMPORTS - OBJECT-TYPE, MODULE-IDENTITY, Integer32, Counter32, TimeTicks + OBJECT-TYPE, MODULE-IDENTITY, Integer32, Counter32, TimeTicks, + Unsigned32, Gauge32 FROM SNMPv2-SMI TEXTUAL-CONVENTION, DisplayString, TruthValue @@ -11,7 +12,7 @@ IMPORTS FROM DIGIUM-MIB; asterisk MODULE-IDENTITY - LAST-UPDATED "200708211450Z" + LAST-UPDATED "200806202025Z" ORGANIZATION "Digium, Inc." CONTACT-INFO "Mark A. Spencer @@ -29,12 +30,20 @@ asterisk MODULE-IDENTITY Norway Tel: +47 5598 7200 Email: tholo@voop.no" - DESCRIPTION - "Add total and current call counter statistics." - REVISION "200708211450Z" DESCRIPTION "Asterisk is an Open Source PBX. This MIB defined objects for managing Asterisk instances." + REVISION "200806202025Z" + DESCRIPTION + "smilint police -- + Add missing imports; fix initial capitalization + of enumeration elements; add missing range + restrictions for Integer32 indices, correct + spelling of astChanCidANI in its definition. + Addresses bug 12905. - jeffg@opennms.org" + REVISION "200708211450Z" + DESCRIPTION + "Add total and current call counter statistics." REVISION "200603061840Z" DESCRIPTION "Change audio codec identification from 3kAudio to @@ -178,7 +187,7 @@ AstIndicationsEntry ::= SEQUENCE { } astIndIndex OBJECT-TYPE - SYNTAX Integer32 + SYNTAX Integer32 (1 .. 2147483647) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -284,7 +293,7 @@ AstChanEntry ::= SEQUENCE { } astChanIndex OBJECT-TYPE - SYNTAX Integer32 + SYNTAX Integer32 (1 .. 2147483647) MAX-ACCESS read-only STATUS current DESCRIPTION @@ -522,7 +531,7 @@ astChanCidName OBJECT-TYPE "Caller Name." ::= { astChanEntry 28 } -astCanCidANI OBJECT-TYPE +astChanCidANI OBJECT-TYPE SYNTAX DisplayString MAX-ACCESS read-only STATUS current @@ -572,10 +581,10 @@ astChanCidTNS OBJECT-TYPE astChanAMAFlags OBJECT-TYPE SYNTAX INTEGER { - Default(0), - Omit(1), - Billing(2), - Documentation(3) + default(0), + omit(1), + billing(2), + documentation(3) } MAX-ACCESS read-only STATUS current @@ -585,10 +594,10 @@ astChanAMAFlags OBJECT-TYPE astChanADSI OBJECT-TYPE SYNTAX INTEGER { - Unknown(0), - Available(1), - Unavailable(2), - OffHookOnly(3) + unknown(0), + available(1), + unavailable(2), + offHookOnly(3) } MAX-ACCESS read-only STATUS current @@ -606,14 +615,14 @@ astChanToneZone OBJECT-TYPE astChanHangupCause OBJECT-TYPE SYNTAX INTEGER { - NotDefined(0), - Unregistered(3), - Normal(16), - Busy(17), - NoAnswer(19), - Congestion(34), - Failure(38), - NoSuchDriver(66) + notDefined(0), + unregistered(3), + normal(16), + busy(17), + noAnswer(19), + congestion(34), + failure(38), + noSuchDriver(66) } MAX-ACCESS read-only STATUS current @@ -631,16 +640,16 @@ astChanVariables OBJECT-TYPE astChanFlags OBJECT-TYPE SYNTAX BITS { - WantsJitter(0), - DeferDTMF(1), - WriteInterrupt(2), - Blocking(3), - Zombie(4), - Exception(5), - MusicOnHold(6), - Spying(7), - NativeBridge(8), - AutoIncrementingLoop(9) + wantsJitter(0), + deferDTMF(1), + writeInterrupt(2), + blocking(3), + zombie(4), + exception(5), + musicOnHold(6), + spying(7), + nativeBridge(8), + autoIncrementingLoop(9) } MAX-ACCESS read-only STATUS current @@ -650,12 +659,12 @@ astChanFlags OBJECT-TYPE astChanTransferCap OBJECT-TYPE SYNTAX INTEGER { - Speech(0), - Digital(8), - RestrictedDigital(9), - Audio3k(16), - DigitalWithTones(17), - Video(24) + speech(0), + digital(8), + restrictedDigital(9), + audio3k(16), + digitalWithTones(17), + video(24) } MAX-ACCESS read-only STATUS current @@ -700,7 +709,7 @@ AstChanTypeEntry ::= SEQUENCE { } astChanTypeIndex OBJECT-TYPE - SYNTAX Integer32 + SYNTAX Integer32 (1 .. 2147483647) MAX-ACCESS read-only STATUS current DESCRIPTION diff --git a/doc/digium-mib.txt b/doc/digium-mib.txt index 018a080dd..d29cd1b48 100644 --- a/doc/digium-mib.txt +++ b/doc/digium-mib.txt @@ -1,17 +1,24 @@ DIGIUM-MIB DEFINITIONS ::= BEGIN IMPORTS - enterprises + enterprises, MODULE-IDENTITY FROM SNMPv2-SMI; digium MODULE-IDENTITY - LAST-UPDATED "200602041900Z" + LAST-UPDATED "200806202000Z" ORGANIZATION "Digium, Inc." CONTACT-INFO "Mark Spencer Email: markster@digium.com" DESCRIPTION - "" + "The Digium private-enterprise MIB" + REVISION "200806202000Z" + DESCRIPTION + "Corrected imports and missing revision for last update. + Addresses bug 12905. - jeffg@opennms.org" + REVISION "200602041900Z" + DESCRIPTION + "Initial revision." ::= { enterprises 22736 } END -- cgit v1.2.3