Netdisco

Update of /cvsroot/netdisco/netdisco
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27019

Modified Files:
	INSTALL README UPGRADE netdisco netdisco.pm 
Log Message:
0.94 prep

Index: README
===================================================================
RCS file: /cvsroot/netdisco/netdisco/README,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** README	13 Oct 2004 16:12:50 -0000	1.14
--- README	6 Dec 2004 23:45:47 -0000	1.15
***************
*** 9,31 ****
  DESCRIPTION
  
!     Netdisco is an Open Source web-based network management tool. Designed
!     for moderate to large networks, configuration information and connection
!     data for network devices are retrieved by SNMP. With Netdisco you can
!     locate the switch port of an end-user system by IP or MAC address. Data
!     is stored using a SQL database for scalability and speed.
  
!     Cisco Discovery Protocol (CDP) optionally provides automatic discovery
!     of the network topology. The network is inventoried by both device model
!     and operating system (like IOS). Netdisco uses router ARP tables and L2
!     switch MAC forwarding tables to locate nodes on physical ports and track
!     them by their IP addresses. For each node, a time stamped history of the
!     ports it has visited and the IP addresses it has used is maintained.
!     Netdisco gets all its data, including CDP topology information, with
!     SNMP polls and DNS queries. It does not use CLI access and has no need
!     for privilege passwords. Security features include a wire-side Wireless
!     Access Point (AP) locator.
  
!     Netdisco was designed and built at UCSC and is now hosted by Source
!     Forge.
  
      See <http://www.netdisco.org>
--- 9,39 ----
  DESCRIPTION
  
!     Netdisco is an Open Source web-based network management tool.
  
!     Designed for moderate to large networks, configuration information and
!     connection data for network devices are retrieved and set by SNMP. With
!     Netdisco you can locate the switch port of an end-user system by IP or
!     MAC address. Data is stored using a SQL database for scalability and
!     speed.
  
!     Cisco Discovery Protocol (CDP), Foundry Discovery Protocol (FDP), and
!     SynOptics Network Management Protocol (SONMP) optionally provide
!     automatic discovery of the network topology.
! 
!     The network is inventoried by both device model and operating system
!     (like IOS). Netdisco uses router ARP tables and L2 switch MAC forwarding
!     tables to locate nodes on physical ports and track them by their IP
!     addresses.
! 
!     For each node, a time stamped history of the ports it has visited and
!     the IP addresses it has used is maintained. Netdisco gets all its data,
!     including topology information, with SNMP polls and DNS queries. It does
!     not use CLI access and has no need for privilege passwords. Security
!     features include a wire-side Wireless Access Point (AP) locator.
! 
!     Netdisco was created at the University of California, Santa Cruz (UCSC),
!     Networking and Technology Services (NTS) department. UCSC continues to
!     support the development of Netdisco by providing development servers and
!     financial support. The Netdisco project is hosted by Source Forge.
  
      See <http://www.netdisco.org>
***************
*** 81,85 ****
      speed shown
      * Statistics for number of actual nodes connected to network
-     * Integration with Pinnacle Database
  
    Inventory of Network Devices
--- 89,92 ----
***************
*** 133,136 ****
--- 140,148 ----
          is what makes devices show up on switch ports.
  
+         Netdisco will attempt to detect uplink ports in case you are missing
+         topology data during macsuck. Check the logs of the macsuck /
+         macwalk for notifications of detected uplink ports, and add that
+         data to your netdisco-topology.txt.
+ 
          Fun Answer - From Douglas M. McKeown :
  
***************
*** 168,175 ****
          resolve an IP address to a switch port.
  
!     CDP
!         Having topology information is crucial for Netdisco to function. So
!         if you network is not Cisco centric or does not have CDP turned on,
!         you must put the information in the netdisco-topology.txt file.
  
          See "Toplogy Information" in this file.
--- 180,194 ----
          resolve an IP address to a switch port.
  
!         If you have a small network that only has layer-2 devices on it, and
!         you use a Linux or BSD box as your router, you will need to install
!         net-snmp on the machine, and then have netdisco discover that
!         machine. Otherwise you will not be able to resolve a MAC address to
!         an IP address.
! 
!     CDP / FDP / SONMP
!         Having topology information is crucial for Netdisco to function. So.
!         if you network does not support one of the above Layer2 discover
!         protocols, you must put the information in the netdisco-topology.txt
!         file.
  
          See "Toplogy Information" in this file.
***************
*** 185,188 ****
--- 204,210 ----
          of your network."
  
+         Note that FDP (Foundry) and SSOMP (Nortel/Bay) are both supported,
+         and anywhere you see CDP you can assume we mean FDP and SSOMP too.
+ 
  INSTALL
  
***************
*** 317,320 ****
--- 339,351 ----
          Graph. Creates graph -- both GIF and ImageMap.
  
+         NOTE: You can safely ignore all warnings about "size too small for
+         label".
+ 
+         Make sure you have a relatively new version of GraphViz. You need a
+         newer version of GraphViz if you get an error similar to:
+ 
+           Creating CMAP : /usr/local/netdisco/html/netmap.map
+             warning, language cmap not recognized, use one of: ps hpgl pcl mif...
+ 
      -h || --help
          Prints out command line usage.
***************
*** 337,341 ****
  
          1. MAC Addresses that are Switch Port Addresses
!         2. MAC Addresses that are listed on non-existant ports
          3. MAC Addresses that exist on ports with topology information
          (uplink ports)
--- 368,372 ----
  
          1. MAC Addresses that are Switch Port Addresses
!         2. MAC Addresses that are listed on non-existent ports
          3. MAC Addresses that exist on ports with topology information
          (uplink ports)
***************
*** 370,373 ****
--- 401,407 ----
          a different file from the command line.
  
+         It is not necessary to do this after every change. This is only a
+         convenience switch.
+ 
      -u || --user [user] [password] [port_control?] [admin?]
          Add or Change a User. Supply all four arguments (user pw
***************
*** 457,464 ****
          It is not necessary to import the topology information after
          changing netdisco-topology.txt. You should however restart the admin
!         daemon. The topology text file is reparsed each time you run
          netdisco.
  
!         As a convience you can use the topology file to quickly seed
          Netdisco with devices. To import all the topology information at
          once make sure the topology filename is set in "netdisco.conf" and
--- 491,498 ----
          It is not necessary to import the topology information after
          changing netdisco-topology.txt. You should however restart the admin
!         daemon. The topology text file is re-parsed each time you run
          netdisco.
  
!         As a convenience you can use the topology file to quickly seed
          Netdisco with devices. To import all the topology information at
          once make sure the topology filename is set in "netdisco.conf" and
***************
*** 562,584 ****
          data, it seems to be dragging down after a while.
  
!         In order to fix this we do a "VACUUM FULL ANALYZE VERBOSE" from
!         "pg_run". This command locks each table before it does the VACUUM,
!         and therefor can be more through. It's a good idea to take netdisco
!         down temporarily while you do this. I do this about once a month, or
!         when I notice it dragging down. Use "Netdisco Statistics" as a good
!         metric of things slowing down. This may get fixed with changes in
!         VACUUM in Postgres 7.4 and above.
  
!         Procedure for doing a vacuum full :
  
          1. Shutdown the admin daemon
!                 su - netdisco -c "/usr/local/netdisco/netdisco -p stop"
  
          2. Clear the cron tab for user netdisco
!                 su - -c "crontab -u netdisco -r"
  
          3. Comment out the netdisco config file Includes in httpd.conf
          4. Restart Apache
!                 su - -c "/usr/local/apache/bin/apachectl graceful"
  
          5. Check to see if any netdisco jobs are running and wait for them
--- 596,623 ----
          data, it seems to be dragging down after a while.
  
!         This turns out to be an INDEX bloat problem on Postgres versions
!         less than 7.4. Recently doing this on a Postgres 7.3 install changed
!         the amount of space that i Netdisco's database was using from 16G to
!         400M !!!
  
!         In order to fix this we do a "VACUUM FULL ANALYZE VERBOSE" and
!         "REINDEX" from "pg_run". This command locks each table before it
!         does the VACUUM, and therefor can be more through. It's a good idea
!         to take netdisco down temporarily while you do this. I do this about
!         once a month, or when I notice it dragging down. Use "Netdisco
!         Statistics" as a good metric of things slowing down. This may get
!         fixed with changes in VACUUM in Postgres 7.4 and above.
! 
!         Procedure for doing a vacuum full (as root):
  
          1. Shutdown the admin daemon
!                 /usr/local/netdisco/bin/netdisco_daemon stop
  
          2. Clear the cron tab for user netdisco
!                 crontab -u netdisco -r
  
          3. Comment out the netdisco config file Includes in httpd.conf
          4. Restart Apache
!                 /usr/local/apache/bin/apachectl graceful
  
          5. Check to see if any netdisco jobs are running and wait for them
***************
*** 586,606 ****
                  ps
                  killall netdisco
!     
!         6. Run VACUUM FULL ANALYZE VERBOSE in psql
                  /usr/local/netdisco/sql/pg_run
!                 VACUUM FULL ANALYZE VERBOSE;
  
          7. Restart Postgres (just for fun)
!                 su - -c "/usr/local/etc/rc.d/010.pgsql restart" 
  
          8. Uncomment lines in httpd.conf
          9. Restart Apache
!                 su - -c "/usr/local/apache/bin/apachectl graceful"
  
          10. Reload crontab for user netdisco
!                 su - -c "crontab -u netdisco /usr/local/netdisco/netdisco.crontab"
  
          11. Restart Admin Daemon
!                 su - netdisco -c "/usr/local/netdisco/netdisco -p start"
  
    Topology Information
--- 625,679 ----
                  ps
                  killall netdisco
! 
!         6. Run REINDEX and VACUUM FULL
!             Before:
! 
!                 df -h
                  /usr/local/netdisco/sql/pg_run
!                     # before comparison :
!                     select relname, relpages from pg_class order by relpages desc;
! 
!                     REINDEX TABLE node;
!                     REINDEX TABLE node_ip;
!                     REINDEX TABLE device;
!                     REINDEX TABLE device_port;
!                     REINDEX TABLE device_port_log;
!                     VACUUM FULL ANALYZE VERBOSE;
! 
!                     # after comparison :
!                     select relname, relpages from pg_class order by relpages desc;
!                     \q
! 
!             After:
! 
!                 df -h
  
          7. Restart Postgres (just for fun)
!                 /usr/local/etc/rc.d/010.pgsql restart 
! 
!             OR
! 
!                 /etc/rc.d/init.d/pgsql restart
! 
!             OR
! 
!                 /etc/rc.d/pgsql restart
  
          8. Uncomment lines in httpd.conf
          9. Restart Apache
!                 /usr/local/apache/bin/apachectl graceful
  
          10. Reload crontab for user netdisco
!                 crontab -u netdisco /usr/local/netdisco/netdisco.crontab
  
          11. Restart Admin Daemon
!                 /usr/local/netdisco/bin/netdisco_daemon start
! 
!     Clearing the Admin Queue
!         If your admin queue is just getting too long and you want to clear
!         it you can do it by just dropping the table and readding it.
! 
!             cd sql
!             ./pg_run admin.sql
  
    Topology Information
***************
*** 610,615 ****
      connected nodes. Ports that are uplink ports that are not marked so in
      Netdisco will appear to steal MAC address entries from their rightful
!     ports. So it is critical to use the topology file and CDP to maintain a
!     topology.
  
     Manual Topology Information
--- 683,697 ----
      connected nodes. Ports that are uplink ports that are not marked so in
      Netdisco will appear to steal MAC address entries from their rightful
!     ports. So it is critical to use the topology file and CDP/FDP/SONMP to
!     maintain a topology.
! 
!    Autodetection of uplink ports
! 
!     During macsuck if Netdisco finds the MAC address of a known device or
!     switch port, then that port is marked as an uplink. Nodes will not
!     collect at these switch ports, and a warning message will be printed.
!     Check the logs of your macsuck and macwalk jobs in order to find and
!     correct autodetected uplink ports. Add these ports to your
!     netdisco-topology.txt file.
  
     Manual Topology Information
***************
*** 650,653 ****
--- 732,739 ----
          end of this link. The device can be a DNS name or an IP Address.
  
+         NOTE: The port names must match exactly how Netdisco sees it. Go to
+         the device and check it out. You might think of it as "port 1" but
+         Netdisco might think of it as "RMONPort26onunit1".
+ 
      alias:
          Not implemented for output. The backup file will have these lines
***************
*** 697,702 ****
      2. Isolated Network Segment
          If you have a segment of your network that is not connected
!         directly, or conneted through a non physical link like a VPN, then
!         you might fudge an entry to connect that segement of the nework with
          the main one.
  
--- 783,788 ----
      2. Isolated Network Segment
          If you have a segment of your network that is not connected
!         directly, or connected through a non physical link like a VPN, then
!         you might fudge an entry to connect that segment of the network with
          the main one.
  
***************
*** 709,719 ****
  
      Netdisco is controlled via cron jobs. Jobs are run as user "netdisco".
!     Mulitple jobs can be run at once.
  
      The default jobs are :
  
!     * MacSuck - Every 4 hours MacSuck all the devices in the database.
!     * ArpNip - Every 4 hours ArpNip all the devices in the database. (Offset
!     from Macsuck by 2 hours)
      * Refresh Devices - Once a day refresh device information.
      * Backup - Once a day backup information.
--- 795,805 ----
  
      Netdisco is controlled via cron jobs. Jobs are run as user "netdisco".
!     Multiple jobs can be run at once.
  
      The default jobs are :
  
!     * MacSuck - Every 2 hours MacSuck all the devices in the database.
!     * ArpNip - Every 2 hours ArpNip all the devices in the database. (Offset
!     from Macsuck by 1 hours)
      * Refresh Devices - Once a day refresh device information.
      * Backup - Once a day backup information.
***************
*** 781,785 ****
              arpnip_no = 192.168.0.0/24,192.168.0.1,192.168.1.0/24
  
!         You can NOT use an abbrievated CIDR subnet like "192/8".
  
      compress
--- 867,871 ----
              arpnip_no = 192.168.0.0/24,192.168.0.1,192.168.1.0/24
  
!         You can NOT use an abbreviated CIDR subnet like "192/8".
  
      compress
***************
*** 796,800 ****
      discover_no
          LIST:IPs and Subnets. Comma Separated list of devices and subnets
!         that will not get hit with an SNMP disovery event.
  
          See arpnip_no for more details.
--- 882,886 ----
      discover_no
          LIST:IPs and Subnets. Comma Separated list of devices and subnets
!         that will not get hit with an SNMP discovery event.
  
          See arpnip_no for more details.
***************
*** 811,814 ****
--- 897,905 ----
          STRING. The extension to add to log files.
  
+     macsuck_bleed
+         BOOLEAN. Set to true will let nodes accumulate on uplink ports
+         without topology information. This is a debug option to help you
+         figure out your topology and generally should not be set.
+ 
      macsuck_no
          LIST:IPs and Subnets. Comma Separated list of devices and subnets
***************
*** 872,877 ****
      reverse_sysname
          BOOLEAN. Turn this on to have Netdisco do a reverse lookup of the
!         sysName.0 field to use as the managment IP address for a device. See
!         bug 810939 and device_root() for more info. Default "false"
  
      topofile
--- 963,968 ----
      reverse_sysname
          BOOLEAN. Turn this on to have Netdisco do a reverse lookup of the
!         sysName.0 field to use as the management IP address for a device.
!         See bug 810939 and device_root() for more info. Default "false"
  
      topofile
***************
*** 927,930 ****
--- 1018,1022 ----
      db_Pg_env
          HASH. Environment variables to be set before running database calls.
+         Separate multiple entries with commas.
  
          Mainly used for Oracle.
***************
*** 932,937 ****
--- 1024,1050 ----
          Default : not set.
  
+         Example :
+ 
+          db_Oracle_env  = ORACLE_HOME => /usr/local/oracle7, ORACLE_STUFF=>1
+ 
     SNMP Settings
  
+     bulkwalk_no
+         BOOLEAN. Set to true to use GETNEXT instead of BULKWALK for every
+         device. This slows things down, but might be necessary for problem
+         devices.
+ 
+         The final solution should be to add " sub bulkwalk_no { 1; } " to
+         the device class that is misbehaving in SNMP::Info. This will turn
+         off bulkwalk for a class of devices, not all.
+ 
+         Default is on. SNMP::Info 0.10 or higher required.
+ 
+     bulkwalk_repeaters
+         INT. Sets MaxRepeaters on BULKWALK operations. See "perldoc SNMP"
+         for more info.
+ 
+         Default is 20. SNMP::Info 0.10 or higher required.
+ 
      community
          LIST:STRING. A comma separated list of community strings to try on
***************
*** 1255,1260 ****
      (llnl.gov), Charles Goldsmith (CompUSA), Douglas M. McKeown
      (saintmarys.edu), Revital Shvarzman (York U, Ontario), Walter Gould
!     (Auburn University), Lindsay Druet and Colin Palmer (U of Waikato,
!     Hamilton NZ)
  
      As well as these people for their donations :
--- 1368,1374 ----
      (llnl.gov), Charles Goldsmith (CompUSA), Douglas M. McKeown
      (saintmarys.edu), Revital Shvarzman (York U, Ontario), Walter Gould
!     (Auburn U), Lindsay Druet and Colin Palmer (U of Waikato, Hamilton NZ),
!     Dusty Hall (Auburn U), Jon Monroe (center pointe), Eric Miller
!     (jeneric).
  
      As well as these people for their donations :
***************
*** 1262,1268 ****
       Richard Silver (East Alabama Medical Center)
       Linda Rosewood (UCSC)
!      "6pax4max!"    (???)
       Dusty Hall     (Auburn University)
       Walter Gould   (Auburn University)
  
      And probably lots of other people I forgot to put in here. Not to
--- 1376,1383 ----
       Richard Silver (East Alabama Medical Center)
       Linda Rosewood (UCSC)
!      "6pax4max!","31337" (???)
       Dusty Hall     (Auburn University)
       Walter Gould   (Auburn University)
+      Frank Chatham  (Auburn University)
  
      And probably lots of other people I forgot to put in here. Not to

Index: UPGRADE
===================================================================
RCS file: /cvsroot/netdisco/netdisco/UPGRADE,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** UPGRADE	19 Jun 2004 23:06:07 -0000	1.7
--- UPGRADE	6 Dec 2004 23:45:47 -0000	1.8
***************
*** 16,45 ****
  
      FIRST! Go read below where it says "Backup Database" and "Backup
!     Configuration Files" and DO IT!
  
!     There are two methods of upgrading. Please backup the database (see
!     below) before continuing.
  
!     1. Apply Patch
!         Each version starting with version 0.93 will have a ".patch" that
!         you can apply to get the newest version. If you have a lot of site
!         customizations, this might be the best way for you. Be prepared to
!         fix any conflicting merges that may happen. If you can't handle a
!         little code-diving, this may not be the method for you.
  
!         You will also need to get the newest SNMP::Info and possibly run a
!         ".sql" file to make changes to the database structure.
  
!     2. Fresh Upgrade
!         The best way is to back everything up, move the configuration files
!         out of the way and then follow INSTALL for all but the database
!         steps.
  
!         Then change the configuration files back to match.
  
!         You DO NOT wipe the database contents for an upgrade. But just in
!         case, you will have of course made a backup by now.
  
! VERSION SPECIFIC NOTES
  
      v0.92 -> 0.93
--- 16,99 ----
  
      FIRST! Go read below where it says "Backup Database" and "Backup
!     Configuration Files" and DO IT!.
  
!     The best way is to back everything up, move the configuration files out
!     of the way and then follow INSTALL for all but the database steps.
  
!     Then change the configuration files back to match. If you reuse your old
!     configuration file, check it against the new one to see what config file
!     directives have been added / removed / changed.
  
!     You DO NOT wipe the database contents for an upgrade. But just in case,
!     you will have of course made a backup by now.
  
! VERSION SPECIFIC NOTES
  
!     v0.93 -> 0.94
  
!         Autodetection of Uplink Ports
!             Macsuck will now autodetect some uplink ports. If it sees the
!             MAC addres of a known switch port or router, it will not collect
!             mac addresses on that port.
  
!             Start checking the logs from your macwalk device (you can do it
!             from the web page now) and look for the uplink warnings. Fix
!             your topology file to match.
! 
!         SNMP::Info
!             You will need SNMP::Info v0.9 in order to support the new
!             netdisco-mibs package.
! 
!         Database Upgrades
!             Now would be a great time to upgrade to Postgres 7.4 if you
!             haven't already. There are some great speed benefits, and there
!             is no INDEX bloat problem. Upgrading from 7.2 or 7.3 does
!             require a data base dump/restore. See Postgres documentation.
! 
!             You will have to run the following command to add new tables and
!             modify existing ones.
! 
!              cd /usr/local/netdisco/sql
!              ./pg_run upgrade-0.93-to-0.94.sql
! 
!             Note that it is safe to run the upgrade.sql scripts more than
!             once (in case you are running a CVS or RC version).
! 
!         GraphViz
! 
!             Program
!                 Make sure you have a relatively new version. If you get an
!                 error similar to
! 
!                   Creating CMAP : /usr/local/netdisco/html/netmap.map
!                     warning, language cmap not recognized, use one of: ps hpgl pcl mif...
! 
!                 You need a newer version of GraphViz
! 
!             GraphViz.pm 2.01
!                 The newest Perl interface to GraphViz (non-dependent on the
!                 GraphViz release) has some better client map interfaces for
!                 the Network Graph.
! 
!                 Please make sure this newest version is installed.
! 
!                  perl -MCPAN -e shell
!                     install GraphViz
! 
!                 Double check the version.
! 
!                  perl -MGraphViz -e 'print $GraphViz::VERSION'
! 
!         Perl Modules
!             A lot of the Perl modules that Netdisco depends on have released
!             newer (better) versions. Go to the INSTALL and follow Part 8.1
!             "Perl Modules and Mason". If you use CPAN, it will upgrade all
!             the dependency modules for you too.
! 
!         Bay Switches
!             If you have bay switches, note that the naming scheme for the
!             ports has changed from 1 to 1.1 as they were folded into the new
!             Nortel classes. The above upgrade script will do the renaming
!             for you, so you won't lose data.
  
      v0.92 -> 0.93
***************
*** 61,82 ****
  
          New MIB Files
!             I added the Q-BRIDGE-MIB for Vlan features that are new in 0.93,
!             and one of the MIB dependencies comes from v1.tar.gz from Cisco
!             and is probably not installed.
! 
!                 ftp://ftp.cisco.com/pub/mibs/v1/v1.tar.gz
!                 cd /usr/local/share/snmp/mibs
!                 tar xvfz /path/to/v1.tar.gz TOKEN-RING-RMON-MIB.my
! 
!             Meanwhile I'm looking into the legailty of distrubiting a set of
!             "fixed" MIBs that include all the ones required by SNMP::Info
!             for all the vendors.
! 
!             You may take this time to update v2.tar.gz as well, just don't
!             forget to repatch CISCO-TC-MIB as per INSTALL.
! 
!             See
!             <http://sourceforge.net/mailarchive/message.php?msg_id=7113182>
!             for more details on what MIBs ship broken from Cisco.
  
      v0.91 -> 0.92
--- 115,120 ----
  
          New MIB Files
!             If you insist on using this old version of netdisco, at least
!             download the "netdisco-mibs" package and use that.
  
      v0.91 -> 0.92
***************
*** 144,147 ****
--- 182,196 ----
              cp /usr/local/netdisco/*.txt  /path/to/some_where_safe
  
+     Vacuum full and reindex database
+         For PostgreSQL you may be suffering from severe space and
+         performance problems because of various issues. Especially for
+         versions before 7.4. Please consider upgrading to 7.4 and ALSO run
+         the Procedure, "Things are Getting Really Slow" in README.
+ 
+         This will REINDEX and VACUUM FULL your database.
+ 
+         On a recent Postgres 7.3 install this changed the database size from
+         16GB to 400 MB! Sound worth it?
+ 
      Install on top of existing Netdisco
          Put the new files in your netdisco/ directory

Index: netdisco
===================================================================
RCS file: /cvsroot/netdisco/netdisco/netdisco,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** netdisco	19 Nov 2004 01:55:01 -0000	1.79
--- netdisco	6 Dec 2004 23:45:47 -0000	1.80
***************
*** 41,45 ****
              $New_Only $VERSION $DaemonMode/;
  
! $VERSION = '0.94-cvs';
  %Discovered = ();
  %Discovered_Alias = ();
--- 41,45 ----
              $New_Only $VERSION $DaemonMode/;
  
! $VERSION = '0.94';
  %Discovered = ();
  %Discovered_Alias = ();

Index: INSTALL
===================================================================
RCS file: /cvsroot/netdisco/netdisco/INSTALL,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** INSTALL	19 Jun 2004 22:56:07 -0000	1.11
--- INSTALL	6 Dec 2004 23:45:47 -0000	1.12
***************
*** 5,9 ****
  VERSION
  
!     Netdisco 0.93
  
      PLEASE check the latest version of this document at
--- 5,9 ----
  VERSION
  
!     Netdisco 0.94
  
[...1275 lines suppressed...]
!         Add the following line to your /etc/rc.d/rc.local file :
! 
!             /usr/local/netdisco/bin/netdisco_daemon start
  
  SUCCESS
***************
*** 954,960 ****
      place to ask any questions.
  
!   Donations
! 
!     Netdisco is developed as a hobby and is not a commercial venture.
  
      If you find Netdisco useful please consider donating to its developer.
--- 1027,1031 ----
      place to ask any questions.
  
!   Credits and Donations
  
      If you find Netdisco useful please consider donating to its developer.

Index: netdisco.pm
===================================================================
RCS file: /cvsroot/netdisco/netdisco/netdisco.pm,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** netdisco.pm	3 Dec 2004 05:35:17 -0000	1.51
--- netdisco.pm	6 Dec 2004 23:45:47 -0000	1.52
***************
*** 125,129 ****
  
  =cut
! $VERSION = '0.94-cvs';
  
  =back
--- 125,129 ----
  
  =cut
! $VERSION = '0.94';
  
  =back

Update of /cvsroot/netdisco/netdisco/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27019/doc

Modified Files:
	README.pod UPGRADE.pod 
Log Message:
0.94 prep

Index: UPGRADE.pod
===================================================================
RCS file: /cvsroot/netdisco/netdisco/doc/UPGRADE.pod,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** UPGRADE.pod	23 Nov 2004 20:19:52 -0000	1.14
--- UPGRADE.pod	6 Dec 2004 23:46:00 -0000	1.15
***************
*** 63,71 ****
  running a CVS or RC version). 
  
! =item Perl Modules
  
  =over
  
! =item GraphViz 2.01
  
  The newest Perl interface to GraphViz (non-dependent on the GraphViz 
--- 63,80 ----
  running a CVS or RC version). 
  
! =item GraphViz
  
  =over
  
! =item Program
! 
! Make sure you have a relatively new version.  If you get an error similar to
! 
!   Creating CMAP : /usr/local/netdisco/html/netmap.map
!     warning, language cmap not recognized, use one of: ps hpgl pcl mif...
! 
! You need a newer version of GraphViz
! 
! =item GraphViz.pm 2.01
  
  The newest Perl interface to GraphViz (non-dependent on the GraphViz 
***************
*** 81,85 ****
   perl -MGraphViz -e 'print $GraphViz::VERSION'
  
! =item Others
  
  A lot of the Perl modules that Netdisco depends on have released newer (better) versions.
--- 90,96 ----
   perl -MGraphViz -e 'print $GraphViz::VERSION'
  
! =back
! 
! =item Perl Modules
  
  A lot of the Perl modules that Netdisco depends on have released newer (better) versions.
***************
*** 87,92 ****
  upgrade all the dependency modules for you too.
  
- =back
- 
  =item Bay Switches
  
--- 98,101 ----

Index: README.pod
===================================================================
RCS file: /cvsroot/netdisco/netdisco/doc/README.pod,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** README.pod	19 Nov 2004 02:05:26 -0000	1.45
--- README.pod	6 Dec 2004 23:45:48 -0000	1.46
***************
*** 405,408 ****
--- 405,414 ----
  NOTE: You can safely ignore all warnings about C<size too small for label>.
  
+ Make sure you have a relatively new version of GraphViz.  You need a newer
+ version of GraphViz if you get an error similar to:
+ 
+   Creating CMAP : /usr/local/netdisco/html/netmap.map
+     warning, language cmap not recognized, use one of: ps hpgl pcl mif...
+ 
  =item -h || --help

Update of /cvsroot/netdisco/netdisco
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26755

Modified Files:
	ChangeLog 
Log Message:
added date

Index: ChangeLog
===================================================================
RCS file: /cvsroot/netdisco/netdisco/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** ChangeLog	6 Dec 2004 16:42:47 -0000	1.34
--- ChangeLog	6 Dec 2004 23:44:23 -0000	1.35
***************
*** 3,7 ****
  # $Id$
  
! 0.94beta ()
  
  New Device Support in SNMP::Info 0.9:
--- 3,7 ----
  # $Id$
  
! 0.94beta (12/06/04)
  
  New Device Support in SNMP::Info 0.9:

Update of /cvsroot/netdisco/netdisco
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24659

Modified Files:
	ChangeLog 
Log Message:


Index: ChangeLog
===================================================================
RCS file: /cvsroot/netdisco/netdisco/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** ChangeLog	19 Nov 2004 01:56:51 -0000	1.33
--- ChangeLog	6 Dec 2004 16:42:47 -0000	1.34
***************
*** 70,73 ****
--- 70,75 ----
      * create_device() checks error() method on new device after creation.
      * macsuck() - does not do l2/l3 check on ports with neighbor info anymore
+     * device.html - Aliases w/out DNS entries not being shown (bbaetz)
+     * port_sort() - Failing on various cases (bbaetz)
  
  0.93beta (6/19/04)

Update of /cvsroot/netdisco/netdisco/html
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24445

Modified Files:
	device.html 
Log Message:
device alias bug as reported by bbaetz

Index: device.html
===================================================================
RCS file: /cvsroot/netdisco/netdisco/html/device.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** device.html	15 Nov 2004 21:53:56 -0000	1.27
--- device.html	6 Dec 2004 16:41:30 -0000	1.28
***************
*** 47,51 ****
                     'Last ArpNip' => 'last_arpnip',
                     'Mac Address' => 'mac',
!                    'OSI Layers' => 'layers',
                     'VTP Domain' => 'vtp_domain',
                     #'Ports' => 'ports',
--- 47,51 ----
                     'Last ArpNip' => 'last_arpnip',
                     'Mac Address' => 'mac',
!                    #'OSI Layers' => 'layers',
                     'VTP Domain' => 'vtp_domain',
                     #'Ports' => 'ports',
***************
*** 101,104 ****
--- 101,109 ----
      my $aliases = sql_rows('device_ip',['alias','dns','port'],
                             {'ip'=>$devip});
+     # Sort Aliases by Port
+     my $port_aliases = {};
+     foreach my $a (@$aliases) {
+         push @{$port_aliases->{$a->{port}}},$a; 
+     }
  
      $device->{aliases} = $aliases;
***************
*** 152,168 ****
          }
  
-         # Get IP addresses on ports
-         my $aliases = sql_column('device_ip',['alias','dns'],
-             {'ip'=> $switch, 'port'=>$port});
- 
          # Add aliases to display of port name
!         if (defined $aliases and scalar keys %$aliases) {
!             foreach my $alias (sort sort_ip keys %$aliases){
!                 my $dns = $aliases->{$alias};
!                 $dns = defined $dns ? $dns : '[No DNS]';
                  $dns =~ s/\Q$domain\E//;
!                 
!                 $portreq->{portdisp} .= "<BR> $alias ($dns)";
!             }
          }
  
--- 157,167 ----
          }
  
          # Add aliases to display of port name
!         my $aliases = $port_aliases->{$port} || [];
!         foreach my $alias ( sort {sort_ip($a->{alias},$b->{alias})} @$aliases ) {
!                 my $alias_ip = $alias->{alias};
!                 my $dns = $alias->{dns} || '[No DNS]';
                  $dns =~ s/\Q$domain\E//;
!                 $portreq->{portdisp} .= "<BR> $alias_ip ($dns)";
          }

Update of /cvsroot/netdisco/netdisco/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8188

Modified Files:
	netdisco_daemon 
Log Message:
start fix

Index: netdisco_daemon
===================================================================
RCS file: /cvsroot/netdisco/netdisco/bin/netdisco_daemon,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** netdisco_daemon	16 Nov 2004 19:09:50 -0000	1.2
--- netdisco_daemon	5 Dec 2004 18:40:31 -0000	1.3
***************
*** 18,27 ****
  case $1 in
      start)
!         echo -n "Stopping netdisco admin daemon:"
!         su -l $USER -c "$NETDISCO/netdisco -p stop"
      ;;
      stop)
          echo -n "Stopping netdisco admin daemon:"
!         su -l $USER -c "$NETDISCO/netdisco -p start"
      ;;
      restart)
--- 18,27 ----
  case $1 in
      start)
!         echo -n "Starting netdisco admin daemon:"
!         su -l $USER -c "$NETDISCO/netdisco -p start"
      ;;
      stop)
          echo -n "Stopping netdisco admin daemon:"
!         su -l $USER -c "$NETDISCO/netdisco -p stop"
      ;;
      restart)

Update of /cvsroot/netdisco/netdisco
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13487

Modified Files:
	netdisco.crontab 
Log Message:
changed macsuck to every 2 hrs and arpnip every hour

Index: netdisco.crontab
===================================================================
RCS file: /cvsroot/netdisco/netdisco/netdisco.crontab,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** netdisco.crontab	29 Oct 2004 03:48:50 -0000	1.6
--- netdisco.crontab	5 Dec 2004 02:14:26 -0000	1.7
***************
*** 10,14 ****
  
  # Walk network for new devices once a week (Wed @ 14:00)
! 0 14 * * 3      /usr/local/netdisco/netdisco -b -r !!center_network_device_here!!
  
  # -- Daily --
--- 10,14 ----
  
  # Walk network for new devices once a week (Wed @ 14:00)
! 0 14 * * 3      /usr/local/netdisco/netdisco -b -r center_network_device
  
  # -- Daily --
***************
*** 28,36 ****
  # -- Hourly --
  
! # Arp Nip every 4 hours
! 0 0,4,8,12,16,20 * * *  /usr/local/netdisco/netdisco -b -a 
  
! # Mac Suck every 4 hours (takes up to two hours)
! 0 2,6,10,14,18,22 * * * /usr/local/netdisco/netdisco -b -m 
  
  # Grab NetBios Info from Nodes three times a day
--- 28,36 ----
  # -- Hourly --
  
! # Arp Nip every hour on the half hour
! 30 * * * *  /usr/local/netdisco/netdisco -b -a 
  
! # Mac Suck every 2 hours
! 0 */2 * * * /usr/local/netdisco/netdisco -b -m 
  
  # Grab NetBios Info from Nodes three times a day

Update of /cvsroot/netdisco/netdisco
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16068

Modified Files:
	netdisco.pm 
Log Message:
bbaetz sort_port improvements, fix bugs and add support for ethernet1/0/34 3750 style naming

Index: netdisco.pm
===================================================================
RCS file: /cvsroot/netdisco/netdisco/netdisco.pm,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** netdisco.pm	19 Nov 2004 01:32:10 -0000	1.50
--- netdisco.pm	3 Dec 2004 05:35:17 -0000	1.51
***************
*** 696,701 ****
      my $dotted_numeric = qr{^(\d+)\.(\d+)$};
      my $letter_number  = qr{^([a-zA-Z]+)(\d+)$};
!     my $wordcharword   = qr{^([^:\/.]+)[:\/\.]+([^:\/.]+)$};
!     my $ciscofast      = qr{^(\D)+(\d+)[:\/\.]+([\d\.]+)(-.*)?$};
  
      my @a = (); my @b = ();
--- 696,711 ----
      my $dotted_numeric = qr{^(\d+)\.(\d+)$};
      my $letter_number  = qr{^([a-zA-Z]+)(\d+)$};
!     my $wordcharword   = qr{^([^:\/.]+)[\ :\/\.]+([^:\/.]+)$};
!     my $ciscofast      = qr{^
!                             # Word Number (Gigabit0)
!                             (\D+)(\d+)
!                             # Groups of symbol float (/5.5/5.5/5.5)
!                             (?:                     # group, don't capture to $1 
!                               # /5.5
!                               [:\/\.]+([\d\.]+)     # capture float
!                             )+
!                               # Optional dash (-Bearer Channel)
!                             (-.*)?
!                             $}x;
  
      my @a = (); my @b = ();
***************
*** 707,714 ****
      } elsif ($aval =~ $numbers) {
          @a = ($1);
      } elsif ($aval =~ $wordcharword) {
          @a = ($1,$2);
-     } elsif ($aval =~ $ciscofast){
-         @a = ($1,$2,$3,$4);
      } else { 
          @a = ($aval);
--- 717,724 ----
      } elsif ($aval =~ $numbers) {
          @a = ($1);
+     } elsif ($aval =~ $ciscofast) {
+         @a = ($1,$2,$3,$4,$5,$6);
      } elsif ($aval =~ $wordcharword) {
          @a = ($1,$2);
      } else { 
          @a = ($aval);
***************
*** 721,728 ****
      } elsif ($bval =~ $numbers) {
          @b = ($1);
      } elsif ($bval =~ $wordcharword) {
          @b = ($1,$2);
-     } elsif ($bval =~ $ciscofast){
-         @b = ($1,$2,$3,$4);
      } else { 
          @b = ($bval);
--- 731,738 ----
      } elsif ($bval =~ $numbers) {
          @b = ($1);
+     } elsif ($bval =~ $ciscofast) {
+         @b = ($1,$2,$3,$4,$5,$6);
      } elsif ($bval =~ $wordcharword) {
          @b = ($1,$2);
      } else { 
          @b = ($bval);
***************
*** 732,753 ****
      my $val = 0;
      while (scalar(@a) or scalar(@b)){
          my $a1 = shift @a;
          my $b1 = shift @b;
  
!         # A has more components - wins
          unless (defined $b1){
!             #warn("$a1 no b1\n");
!             $val = -1;
          }
  
!         # A has less components, loses
          unless (defined $a1) {
!             #warn("$b1 no b1\n");
!             $val = 1;
          }
  
-         # carried around from the last find.
-         last if $val != 0;
- 
          if ($a1 =~ $numeric and $b1 =~ $numeric){
              $val = $a1 <=> $b1;
--- 742,763 ----
      my $val = 0;
      while (scalar(@a) or scalar(@b)){
+         # carried around from the last find.
+         last if $val != 0;
+ 
          my $a1 = shift @a;
          my $b1 = shift @b;
  
!         # A has more components - loses
          unless (defined $b1){
!             $val = 1;
!             last;
          }
  
!         # A has less components - wins
          unless (defined $a1) {
!             $val = -1;
!             last;
          }
  
          if ($a1 =~ $numeric and $b1 =~ $numeric){
              $val = $a1 <=> $b1;
***************
*** 755,759 ****
              $val = $a1 cmp $b1;
          }
-         #warn ("$a1 $val $b1\n");
      }
      
--- 765,768 ----

Update of /cvsroot/netdisco/mibs/rfc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1180

Added Files:
	lldp.mib lldp_dot1.mib lldp_dot3.mib 
Log Message:
draft 13 versions

--- NEW FILE: lldp_dot3.mib ---
LLDP-EXT-DOT3-MIB DEFINITIONS ::= BEGIN

IMPORTS
    MODULE-IDENTITY, OBJECT-TYPE, Integer32
        FROM SNMPv2-SMI
    TEXTUAL-CONVENTION, TruthValue
        FROM SNMPv2-TC
    MODULE-COMPLIANCE, OBJECT-GROUP
        FROM SNMPv2-CONF
    lldpExtensions, lldpLocPortNum, 
    lldpRemTimeMark, lldpRemLocalPortNum, lldpRemIndex,
    lldpPortConfigEntry
        FROM LLDP-MIB;

lldpXdot3MIB MODULE-IDENTITY
    LAST-UPDATED "200411220000Z" -- November 22, 2004
    ORGANIZATION "IEEE 802.1 Working Group"
    CONTACT-INFO 
            "  WG-URL: http://grouper.ieee.org/groups/802/1/index.html
             WG-EMail: stds-802-1@...

              Contact: Paul Congdon
               Postal: Hewlett-Packard Company
                       8000 Foothills Blvd. 
                       Roseville, CA 95747
                       USA
                  Tel: +1-916-785-5753
               E-mail: paul_congdon@..."
    DESCRIPTION
            "The LLDP Management Information Base extension module for
            IEEE 802.3 organizationally defined discovery information.

            In order to assure the uniqueness of the LLDP-MIB,
            lldpXdot3MIB is branched from lldpExtensions using OUI value
            as the node.  An OUI/'company_id' is a 24 bit globally unique
            assigned number referenced by various standards.

            Copyright (C) IEEE (2004).  This version of this MIB module
            is published as Annex G.6.1 of IEEE Std 802.1AB-2004;
            see the standard itself for full legal notices."
    REVISION        "200411220000Z" -- November 22, 2004
    DESCRIPTION
            "Published as part of IEEE Std 802.1AB-2004 initial version."
-- OUI for IEEE 802.3 is 4623 (00-12-0F)
   ::= { lldpExtensions 4623 } 

------------------------------------------------------------------------------
------------------------------------------------------------------------------
--
-- Organizationally Defined Information Extension - IEEE 802.3
--
------------------------------------------------------------------------------
------------------------------------------------------------------------------

lldpXdot3Objects    OBJECT IDENTIFIER ::= { lldpXdot3MIB 1 }

-- LLDP IEEE 802.3 extension MIB groups
lldpXdot3Config     OBJECT IDENTIFIER ::= { lldpXdot3Objects 1 }
lldpXdot3LocalData  OBJECT IDENTIFIER ::= { lldpXdot3Objects 2 }
lldpXdot3RemoteData OBJECT IDENTIFIER ::= { lldpXdot3Objects 3 }

-- textual conventions

LldpPowerPortClass ::= TEXTUAL-CONVENTION
    STATUS      current
    DESCRIPTION
            "This TC describes the Power over Ethernet (PoE) port class."
    SYNTAX  INTEGER {
            pClassPSE(1),
            pClassPD(2)
    }

LldpLinkAggStatusMap ::= TEXTUAL-CONVENTION
    STATUS      current
    DESCRIPTION
            "This TC describes the link aggregation status.

            The bit 'aggCapable(0)' indicates the link is capable of being
            aggregated. 

            The bit 'aggEnabled(1)' indicates the link is currently in
            aggregation."
    SYNTAX  BITS {
            aggCapable(0),
            aggEnabled(1)
    }

------------------------------------------------------------------------------
-- IEEE 802.3 - Configuration
------------------------------------------------------------------------------

lldpXdot3PortConfigTable OBJECT-TYPE
    SYNTAX      SEQUENCE OF LldpXdot3PortConfigEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "A table that controls selection of LLDP TLVs to be transmitted 
            on individual ports."
    ::= { lldpXdot3Config 1 }

lldpXdot3PortConfigEntry  OBJECT-TYPE
    SYNTAX      LldpXdot3PortConfigEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "LLDP configuration information that controls the
            transmission of IEEE 802.3 organizationally defined TLVs on
            LLDP transmission capable ports.

            This configuration object augments the lldpPortConfigEntry of
            the LLDP-MIB, therefore it is only present along with the port
            configuration defined by the associated lldpPortConfigEntry
            entry.

            Each active lldpXdot3PortConfigEntry must be from non-volatile
            storage (along with the corresponding lldpPortConfigEntry)
            after a re-initialization of the management system."
    AUGMENTS { lldpPortConfigEntry }
    ::= { lldpXdot3PortConfigTable 1 }

LldpXdot3PortConfigEntry ::= SEQUENCE {
      lldpXdot3PortConfigTLVsTxEnable  BITS
}

lldpXdot3PortConfigTLVsTxEnable  OBJECT-TYPE
    SYNTAX      BITS {
            macPhyConfigStatus(0),
            powerViaMDI(1),
            linkAggregation(2),
            maxFrameSize(3)
    }
    MAX-ACCESS  read-write
    STATUS      current
    DESCRIPTION
            "The lldpXdot3PortConfigTLVsTxEnable, defined as a bitmap,
            includes the IEEE 802.3 organizationally defined set of LLDP
            TLVs whose transmission is allowed on the local LLDP agent by
            the network management.  Each bit in the bitmap corresponds
            to an IEEE 802.3 subtype associated with a specific IEEE
            802.3 optional TLV.  The bit 0 is not used since there is
            no corresponding subtype.

            The bit 'macPhyConfigStatus(0)' indicates that LLDP agent
            should transmit 'MAC/PHY configuration/status TLV'.

            The bit 'powerViaMDI(1)' indicates that LLDP agent should
            transmit 'Power via MDI TLV'.

            The bit 'linkAggregation(2)' indicates that LLDP agent should
            transmit 'Link Aggregation TLV'.

            The bit 'maxFrameSize(3)' indicates that LLDP agent should
            transmit 'Maximum-frame-size TLV'.

            The default value for lldpXdot3PortConfigTLVsTxEnable object
            is an empty set, which means no enumerated values are set.

            The value of this object must be restored from non-volatile
            storage after a re-initialization of the management system."
    REFERENCE 
            "IEEE 802.1AB-2004 10.2.1.1"
    DEFVAL  { { } }
    ::= { lldpXdot3PortConfigEntry  1 }


------------------------------------------------------------------------------
-- IEEE 802.3 - Local Device Information 
------------------------------------------------------------------------------
---
--- lldpXdot3LocPortTable: Ethernet Port AutoNeg/Speed/Duplex
---                        Information Table
---
---
lldpXdot3LocPortTable OBJECT-TYPE
    SYNTAX      SEQUENCE OF LldpXdot3LocPortEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "This table contains one row per port of Ethernet port
            information (as a part of the LLDP 802.3 organizational
            extension) on the local system known to this agent."
    ::= { lldpXdot3LocalData 1 }

lldpXdot3LocPortEntry OBJECT-TYPE
    SYNTAX      LldpXdot3LocPortEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "Information about a particular port component."
    INDEX   { lldpLocPortNum }
    ::= { lldpXdot3LocPortTable 1 }

LldpXdot3LocPortEntry ::= SEQUENCE {
              lldpXdot3LocPortAutoNegSupported     TruthValue,
              lldpXdot3LocPortAutoNegEnabled       TruthValue,
              lldpXdot3LocPortAutoNegAdvertisedCap OCTET STRING,
              lldpXdot3LocPortOperMauType          Integer32
} 

lldpXdot3LocPortAutoNegSupported OBJECT-TYPE
    SYNTAX      TruthValue
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The truth value used to indicate whether the given port
            (associated with the local system) supports Auto-negotiation."
    REFERENCE 
            "IEEE 802.1AB-2004 G.2.1"
    ::= { lldpXdot3LocPortEntry 1 }

lldpXdot3LocPortAutoNegEnabled  OBJECT-TYPE
    SYNTAX      TruthValue
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The truth value used to indicate whether port
            Auto-negotiation is enabled on the given port associated
            with the local system."
    REFERENCE 
            "IEEE 802.1AB-2004 G.2.1"
    ::= { lldpXdot3LocPortEntry 2 }

lldpXdot3LocPortAutoNegAdvertisedCap OBJECT-TYPE
    SYNTAX      OCTET STRING(SIZE(2))
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "This object contains the value (bitmap) of the
            ifMauAutoNegCapAdvertisedBits object (defined in IETF RFC
            3636) which is associated with the given port on the
            local system."
    REFERENCE 
            "IEEE 802.1AB-2004 G.2.2"
    ::= { lldpXdot3LocPortEntry 3 }

lldpXdot3LocPortOperMauType  OBJECT-TYPE
    SYNTAX 	    Integer32(0..2147483647)
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "An integer value that indicates the operational MAU type
            of the given port on the local system.

            This object contains the integer value derived from the
            list position of the corresponding dot3MauType as listed 
            in IETF RFC 3636 (or subsequent revisions) and is equal
            to the last number in the respective dot3MauType OID.
           
            For example, if the ifMauType object is dot3MauType1000BaseTHD
            which corresponds to {dot3MauType 29}, the numerical value of
            this field will be 29. For MAU types not listed in RFC 3636
            (or subsequent revisions), the value of this field shall be
            set to zero."
    REFERENCE 
            "IEEE 802.1AB-2004 G.2.3"
    ::= { lldpXdot3LocPortEntry 4 }

---
---
--- lldpXdot3LocPowerTable: Power Ethernet Information Table
---
---
lldpXdot3LocPowerTable OBJECT-TYPE
    SYNTAX      SEQUENCE OF LldpXdot3LocPowerEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "This table contains one row per port of power ethernet 
            information (as a part of the LLDP 802.3 organizational
            extension) on the local system known to this agent."
    ::= { lldpXdot3LocalData 2 }

lldpXdot3LocPowerEntry OBJECT-TYPE
    SYNTAX      LldpXdot3LocPowerEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "Information about a particular port component."
    INDEX   { lldpLocPortNum }
    ::= { lldpXdot3LocPowerTable 1 }

LldpXdot3LocPowerEntry ::= SEQUENCE {
              lldpXdot3LocPowerPortClass           LldpPowerPortClass,
              lldpXdot3LocPowerMDISupported        TruthValue,
              lldpXdot3LocPowerMDIEnabled          TruthValue,
              lldpXdot3LocPowerPairControlable     TruthValue,
              lldpXdot3LocPowerPairs               Integer32,
              lldpXdot3LocPowerClass               Integer32
} 

lldpXdot3LocPowerPortClass  OBJECT-TYPE
    SYNTAX      LldpPowerPortClass
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The value that identifies the port Class of the given port
            associated with the local system."
    REFERENCE 
            "IEEE 802.1AB-2004 G.3.1"
    ::= { lldpXdot3LocPowerEntry 1 }

lldpXdot3LocPowerMDISupported  OBJECT-TYPE
    SYNTAX      TruthValue
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The truth value used to indicate whether the MDI power is
            supported on the given port associated with the local system."
    REFERENCE 
            "IEEE 802.1AB-2004 G.3.1"
    ::= { lldpXdot3LocPowerEntry 2 }

lldpXdot3LocPowerMDIEnabled  OBJECT-TYPE
    SYNTAX      TruthValue
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The truth value used to identify whether MDI power is
            enabled on the given port associated with the local system."
    REFERENCE 
            "IEEE 802.1AB-2004 G.3.1"
    ::= { lldpXdot3LocPowerEntry 3 }

lldpXdot3LocPowerPairControlable  OBJECT-TYPE
    SYNTAX      TruthValue
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The truth value is derived from the value of
            pethPsePortPowerPairsControlAbility object (defined in IETF
            RFC 3621) and is used to indicate whether the pair selection
            can be controlled on the given port associated with the
            local system."
    REFERENCE 
            "IEEE 802.1AB-2004 G.3.1"
    ::= { lldpXdot3LocPowerEntry 4 }

lldpXdot3LocPowerPairs  OBJECT-TYPE
    SYNTAX      Integer32(1|2)
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "This object contains the value of the pethPsePortPowerPairs
            object (defined in IETF RFC 3621) which is associated with
            the given port on the local system."
    REFERENCE 
            "IEEE 802.1AB-2004 G.3.2"
    ::= { lldpXdot3LocPowerEntry 5 }

lldpXdot3LocPowerClass  OBJECT-TYPE
    SYNTAX      Integer32(1|2|3|4|5)
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "This object contains the value of the
            pethPsePortPowerClassifications object (defined in IETF
            RFC 3621) which is associated with the given port on the
            local system."
    REFERENCE 
            "IEEE 802.1AB-2004 G.3.3"
    ::= { lldpXdot3LocPowerEntry 6 }

---
---
--- lldpXdot3LocLinkAggTable: Link Aggregation Information Table
---
---
lldpXdot3LocLinkAggTable OBJECT-TYPE
    SYNTAX      SEQUENCE OF LldpXdot3LocLinkAggEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "This table contains one row per port of link aggregation 
            information (as a part of the LLDP 802.3 organizational
            extension) on the local system known to this agent."
    ::= { lldpXdot3LocalData 3 }

lldpXdot3LocLinkAggEntry OBJECT-TYPE
    SYNTAX      LldpXdot3LocLinkAggEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "Link Aggregation information about a particular port
            component."
    INDEX   { lldpLocPortNum }
    ::= { lldpXdot3LocLinkAggTable 1 }

LldpXdot3LocLinkAggEntry ::= SEQUENCE {
              lldpXdot3LocLinkAggStatus       LldpLinkAggStatusMap,
              lldpXdot3LocLinkAggPortId       Integer32
} 

lldpXdot3LocLinkAggStatus OBJECT-TYPE
    SYNTAX      LldpLinkAggStatusMap
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The bitmap value contains the link aggregation capabilities
            and the current aggregation status of the link."
    REFERENCE 
            "IEEE 802.1AB-2004 G.4.1"
    ::= { lldpXdot3LocLinkAggEntry 1 }

lldpXdot3LocLinkAggPortId OBJECT-TYPE
    SYNTAX 	    Integer32(0|1..2147483647)
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "This object contains the IEEE 802.3 aggregated port
            identifier, aAggPortID (IEEE 802.3-2002, 30.7.2.1.1),
            derived from the ifNumber of the ifIndex for the port
            component in link aggregation.

            If the port is not in link aggregation state and/or it
            does not support link aggregation, this value should be set
            to zero."
    REFERENCE 
            "IEEE 802.1AB-2004 G.4.2"
    ::= { lldpXdot3LocLinkAggEntry 2 }

---
---
--- lldpXdot3LocMaxFrameSizeTable: Maximum Frame Size information 
---
---
lldpXdot3LocMaxFrameSizeTable  OBJECT-TYPE
    SYNTAX      SEQUENCE OF LldpXdot3LocMaxFrameSizeEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "This table contains one row per port of maximum frame 
            size information (as a part of the LLDP 802.3 organizational
            extension) on the local system known to this agent."
    ::= { lldpXdot3LocalData 4 }

lldpXdot3LocMaxFrameSizeEntry OBJECT-TYPE
    SYNTAX      LldpXdot3LocMaxFrameSizeEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "Maximum Frame Size information about a particular port
            component."
    INDEX   { lldpLocPortNum }
    ::= { lldpXdot3LocMaxFrameSizeTable 1 }

LldpXdot3LocMaxFrameSizeEntry ::= SEQUENCE {
              lldpXdot3LocMaxFrameSize   Integer32
} 

lldpXdot3LocMaxFrameSize OBJECT-TYPE
    SYNTAX      Integer32(0..65535)
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "An integer value indicating the maximum supported frame 
             size in octets on the given port of the local system."
    REFERENCE 
            "IEEE 802.1AB-2004 G.5.1"
    ::= { lldpXdot3LocMaxFrameSizeEntry 1 }


------------------------------------------------------------------------------
-- IEEE 802.3 - Remote Devices Information
------------------------------------------------------------------------------
---
---
--- lldpXdot3RemPortTable: Ethernet Information Table
---
---
lldpXdot3RemPortTable OBJECT-TYPE
    SYNTAX      SEQUENCE OF LldpXdot3RemPortEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "This table contains Ethernet port information (as a part
            of the LLDP 802.3 organizational extension) of the remote
            system."
    ::= { lldpXdot3RemoteData 1 }

lldpXdot3RemPortEntry OBJECT-TYPE
    SYNTAX      LldpXdot3RemPortEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "Information about a particular physical network connection."
    INDEX   { lldpRemTimeMark,
              lldpRemLocalPortNum,
              lldpRemIndex }
    ::= { lldpXdot3RemPortTable 1 }

LldpXdot3RemPortEntry ::= SEQUENCE {
              lldpXdot3RemPortAutoNegSupported     TruthValue,
              lldpXdot3RemPortAutoNegEnabled       TruthValue,
              lldpXdot3RemPortAutoNegAdvertisedCap OCTET STRING,
              lldpXdot3RemPortOperMauType          Integer32
} 

lldpXdot3RemPortAutoNegSupported OBJECT-TYPE
    SYNTAX      TruthValue
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The truth value used to indicate whether the given port
            (associated with remote system) supports Auto-negotiation."
    REFERENCE 
            "IEEE 802.1AB-2004 G.2.1"
    ::= { lldpXdot3RemPortEntry 1 }

lldpXdot3RemPortAutoNegEnabled  OBJECT-TYPE
    SYNTAX      TruthValue
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The truth value used to indicate whether port
            Auto-negotiation is enabled on the given port associated
            with the remote system."
    REFERENCE 
            "IEEE 802.1AB-2004 G.2.1"
    ::= { lldpXdot3RemPortEntry 2 }

lldpXdot3RemPortAutoNegAdvertisedCap  OBJECT-TYPE
    SYNTAX      OCTET STRING(SIZE(2))
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "This object contains the value (bitmap) of the
            ifMauAutoNegCapAdvertisedBits object (defined in IETF RFC
            3636) which is associated with the given port on the
            remote system."
    REFERENCE 
            "IEEE 802.1AB-2004 G.2.2"
    ::= { lldpXdot3RemPortEntry 3 }

lldpXdot3RemPortOperMauType OBJECT-TYPE
    SYNTAX 	    Integer32(0..2147483647)
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "An integer value that indicates the operational MAU type
            of the sending device.

            This object contains the integer value derived from the
            list position of the corresponding dot3MauType as listed in
            in IETF RFC 3636 (or subsequent revisions) and is equal
            to the last number in the respective dot3MauType OID.
           
            For example, if the ifMauType object is dot3MauType1000BaseTHD
            which corresponds to {dot3MauType 29}, the numerical value of
            this field will be 29. For MAU types not listed in RFC 3636
            (or subsequent revisions), the value of this field shall be
            set to zero."
    REFERENCE 
            "IEEE 802.1AB-2004 G.2.3"
    ::= { lldpXdot3RemPortEntry 4 }

---
---
--- lldpXdot3RemPowerTable: Power Ethernet Information Table
---
---
lldpXdot3RemPowerTable OBJECT-TYPE
    SYNTAX      SEQUENCE OF LldpXdot3RemPowerEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "This table contains Ethernet power information (as a part
            of the LLDP 802.3 organizational extension) of the remote
            system."
    ::= { lldpXdot3RemoteData 2 }

lldpXdot3RemPowerEntry OBJECT-TYPE
    SYNTAX      LldpXdot3RemPowerEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "Information about a particular physical network connection."
    INDEX   { lldpRemTimeMark,
              lldpRemLocalPortNum,
              lldpRemIndex }
    ::= { lldpXdot3RemPowerTable 1 }

LldpXdot3RemPowerEntry ::= SEQUENCE {
              lldpXdot3RemPowerPortClass           LldpPowerPortClass,
              lldpXdot3RemPowerMDISupported        TruthValue,
              lldpXdot3RemPowerMDIEnabled          TruthValue,
              lldpXdot3RemPowerPairControlable     TruthValue,
              lldpXdot3RemPowerPairs               Integer32,
              lldpXdot3RemPowerClass               Integer32
} 

lldpXdot3RemPowerPortClass  OBJECT-TYPE
    SYNTAX      LldpPowerPortClass
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The value that identifies the port Class of the given port
            associated with the remote system."
    REFERENCE 
            "IEEE 802.1AB-2004 G.3.1"
    ::= { lldpXdot3RemPowerEntry 1 }

lldpXdot3RemPowerMDISupported  OBJECT-TYPE
    SYNTAX      TruthValue
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The truth value used to indicate whether the MDI power
            is supported on the given port associated with the remote
            system."
    REFERENCE 
            "IEEE 802.1AB-2004 G.3.1"
    ::= { lldpXdot3RemPowerEntry 2 }

lldpXdot3RemPowerMDIEnabled  OBJECT-TYPE
    SYNTAX      TruthValue
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The truth value used to identify whether MDI power is
            enabled on the given port associated with the remote system."
    REFERENCE 
            "IEEE 802.1AB-2004 G.3.1"
    ::= { lldpXdot3RemPowerEntry 3 }

lldpXdot3RemPowerPairControlable  OBJECT-TYPE
    SYNTAX      TruthValue
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The truth value is derived from the value of
            pethPsePortPowerPairsControlAbility object (defined in IETF
            RFC 3621) and is used to indicate whether the pair selection
            can be controlled on the given port associated with the
            remote system."
    REFERENCE 
            "IEEE 802.1AB-2004 G.3.1"
    ::= { lldpXdot3RemPowerEntry 4 }

lldpXdot3RemPowerPairs  OBJECT-TYPE
    SYNTAX      Integer32(1|2)
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "This object contains the value of the pethPsePortPowerPairs
            object (defined in IETF RFC 3621) which is associated with
            the given port on the remote system."
    REFERENCE 
            "IEEE 802.1AB-2004 G.3.2"
    ::= { lldpXdot3RemPowerEntry 5 }

lldpXdot3RemPowerClass  OBJECT-TYPE
    SYNTAX      Integer32(1|2|3|4|5)
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "This object contains the value of the
            pethPsePortPowerClassifications object (defined in IETF
            RFC 3621) which is associated with the given port on the
            remote system."
    REFERENCE 
            "IEEE 802.1AB-2004 G.3.3"
    ::= { lldpXdot3RemPowerEntry 6 }

---
---
--- lldpXdot3RemLinkAggTable: Link Aggregation Information Table
---
---
lldpXdot3RemLinkAggTable OBJECT-TYPE
    SYNTAX      SEQUENCE OF LldpXdot3RemLinkAggEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "This table contains port link aggregation information
            (as a part of the LLDP 802.3 organizational extension)
            of the remote system."
    ::= { lldpXdot3RemoteData 3 }

lldpXdot3RemLinkAggEntry OBJECT-TYPE
    SYNTAX      LldpXdot3RemLinkAggEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "Link Aggregation information about remote system's port
            component."
    INDEX   { lldpRemTimeMark,
              lldpRemLocalPortNum,
              lldpRemIndex }
    ::= { lldpXdot3RemLinkAggTable 1 }

LldpXdot3RemLinkAggEntry ::= SEQUENCE {
              lldpXdot3RemLinkAggStatus       LldpLinkAggStatusMap,
              lldpXdot3RemLinkAggPortId       Integer32
} 

lldpXdot3RemLinkAggStatus OBJECT-TYPE
    SYNTAX      LldpLinkAggStatusMap
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The bitmap value contains the link aggregation capabilities
            and the current aggregation status of the link."
    REFERENCE 
            "IEEE 802.1AB-2004 G.4.1"
    ::= { lldpXdot3RemLinkAggEntry 1 }

lldpXdot3RemLinkAggPortId OBJECT-TYPE
    SYNTAX 	    Integer32(0|1..2147483647)
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "This object contains the IEEE 802.3 aggregated port
            identifier, aAggPortID (IEEE 802.3-2002, 30.7.2.1.1),
            derived from the ifNumber of the ifIndex for the port
            component associated with the remote system.

            If the remote port is not in link aggregation state and/or
            it does not support link aggregation, this value should be
            zero."
    REFERENCE 
            "IEEE 802.1AB-2004 G.4.2"
    ::= { lldpXdot3RemLinkAggEntry 2 }


---
---
--- lldpXdot3RemMaxFrameSizeTable: Maximum Frame Size information 
---
---
lldpXdot3RemMaxFrameSizeTable  OBJECT-TYPE
    SYNTAX      SEQUENCE OF LldpXdot3RemMaxFrameSizeEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "This table contains one row per port of maximum frame 
            size information (as a part of the LLDP 802.3 organizational
            extension) of the remote system."
    ::= { lldpXdot3RemoteData 4 }

lldpXdot3RemMaxFrameSizeEntry OBJECT-TYPE
    SYNTAX      LldpXdot3RemMaxFrameSizeEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "Maximum Frame Size information about a particular port
            component."
    INDEX   { lldpRemTimeMark,
              lldpRemLocalPortNum,
              lldpRemIndex }
    ::= { lldpXdot3RemMaxFrameSizeTable 1 }

LldpXdot3RemMaxFrameSizeEntry ::= SEQUENCE {
              lldpXdot3RemMaxFrameSize   Integer32
} 

lldpXdot3RemMaxFrameSize OBJECT-TYPE
    SYNTAX      Integer32(0..65535)
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "An integer value indicating the maximum supported frame 
             size in octets on the port component associated with the 
             remote system."
    REFERENCE 
            "IEEE 802.1AB-2004 G.5.1"
    ::= { lldpXdot3RemMaxFrameSizeEntry 1 }


------------------------------------------------------------------------------
-- Conformance Information
------------------------------------------------------------------------------
lldpXdot3Conformance OBJECT IDENTIFIER ::= { lldpXdot3MIB 2 }
lldpXdot3Compliances OBJECT IDENTIFIER ::= { lldpXdot3Conformance 1 }
lldpXdot3Groups      OBJECT IDENTIFIER ::= { lldpXdot3Conformance 2 }

-- compliance statements

lldpXdot3Compliance MODULE-COMPLIANCE
    STATUS  current
    DESCRIPTION
            "The compliance statement for SNMP entities which implement
            the LLDP 802.3 organizational extension MIB."
    MODULE  -- this module
        MANDATORY-GROUPS { lldpXdot3ConfigGroup, 
                           lldpXdot3LocSysGroup,
                           lldpXdot3RemSysGroup
        }
    ::= { lldpXdot3Compliances 1 }

-- MIB groupings

lldpXdot3ConfigGroup    OBJECT-GROUP
    OBJECTS {
        lldpXdot3PortConfigTLVsTxEnable
    }
    STATUS  current
    DESCRIPTION
            "The collection of objects which are used to configure the
            LLDP 802.3 organizational extension implementation behavior.

            This group is mandatory for agents which implement the 
            LLDP 802.3 organizational extension."
    ::= { lldpXdot3Groups 1 }

lldpXdot3LocSysGroup  OBJECT-GROUP
    OBJECTS {
        lldpXdot3LocPortAutoNegSupported,
        lldpXdot3LocPortAutoNegEnabled,
        lldpXdot3LocPortAutoNegAdvertisedCap,
        lldpXdot3LocPortOperMauType,
        lldpXdot3LocPowerPortClass,
        lldpXdot3LocPowerMDISupported,
        lldpXdot3LocPowerMDIEnabled,
        lldpXdot3LocPowerPairControlable,
        lldpXdot3LocPowerPairs,
        lldpXdot3LocPowerClass,
        lldpXdot3LocLinkAggStatus,
        lldpXdot3LocLinkAggPortId,
        lldpXdot3LocMaxFrameSize
    }
    STATUS  current
    DESCRIPTION
            "The collection of objects which are used to represent LLDP
            802.3 organizational extension Local Device Information.
            
            This group is mandatory for agents which implement the 
            LLDP 802.3 organizational extension in the TX mode."
    ::= { lldpXdot3Groups 2 }

lldpXdot3RemSysGroup  OBJECT-GROUP
    OBJECTS {
        lldpXdot3RemPortAutoNegSupported,
        lldpXdot3RemPortAutoNegEnabled,
        lldpXdot3RemPortAutoNegAdvertisedCap,
        lldpXdot3RemPortOperMauType,
        lldpXdot3RemPowerPortClass,
        lldpXdot3RemPowerMDISupported,
        lldpXdot3RemPowerMDIEnabled,
        lldpXdot3RemPowerPairControlable,
        lldpXdot3RemPowerPairs,
        lldpXdot3RemPowerClass,
        lldpXdot3RemLinkAggStatus,
        lldpXdot3RemLinkAggPortId,
        lldpXdot3RemMaxFrameSize
    }
    STATUS  current
    DESCRIPTION
            "The collection of objects which are used to represent LLDP
            802.3 organizational extension Local Device Information.
            
            This group is mandatory for agents which implement the 
            LLDP 802.3 organizational extension in the RX mode."
    ::= { lldpXdot3Groups 3 }

END

--- NEW FILE: lldp.mib ---
LLDP-MIB DEFINITIONS ::= BEGIN

IMPORTS
    MODULE-IDENTITY, OBJECT-TYPE, Integer32, Counter32, NOTIFICATION-TYPE
        FROM SNMPv2-SMI
    TEXTUAL-CONVENTION, TimeStamp, TruthValue
        FROM SNMPv2-TC
    SnmpAdminString
        FROM SNMP-FRAMEWORK-MIB
    MODULE-COMPLIANCE, OBJECT-GROUP, NOTIFICATION-GROUP
        FROM SNMPv2-CONF
    TimeFilter, ZeroBasedCounter32
        FROM RMON2-MIB
    AddressFamilyNumbers
        FROM IANA-ADDRESS-FAMILY-NUMBERS-MIB;

lldpMIB MODULE-IDENTITY
    LAST-UPDATED "200411220000Z" -- November 22, 2004
    ORGANIZATION "IEEE 802.1 Working Group"
[...1993 lines suppressed...]
            that the remote system may advertise.
            
            This group is mandatory for agents which implement the LLDP
            and have the capability of receiving LLDP frames."
    ::= { lldpGroups 7 }

lldpNotificationsGroup  NOTIFICATION-GROUP
    NOTIFICATIONS {
        lldpRemTablesChange 
    }
    STATUS  current
    DESCRIPTION
            "The collection of notifications used to indicate LLDP MIB
            data consistency and general status information.

            This group is mandatory for agents which implement the LLDP
            and have the capability of receiving LLDP frames."
    ::= { lldpGroups 8 }

END

--- NEW FILE: lldp_dot1.mib ---
LLDP-EXT-DOT1-MIB DEFINITIONS ::= BEGIN

IMPORTS
    MODULE-IDENTITY, OBJECT-TYPE, Integer32
        FROM SNMPv2-SMI
    TruthValue
        FROM SNMPv2-TC
    SnmpAdminString
        FROM SNMP-FRAMEWORK-MIB
    MODULE-COMPLIANCE, OBJECT-GROUP
        FROM SNMPv2-CONF
    lldpExtensions, lldpLocPortNum, 
    lldpRemTimeMark, lldpRemLocalPortNum, lldpRemIndex, 
    lldpPortConfigEntry
        FROM LLDP-MIB
   VlanId
        FROM Q-BRIDGE-MIB;

lldpXdot1MIB MODULE-IDENTITY
    LAST-UPDATED "200411220000Z" -- November 22, 2004
    ORGANIZATION "IEEE 802.1 Working Group"
    CONTACT-INFO 
            "  WG-URL: http://grouper.ieee.org/groups/802/1/index.html
             WG-EMail: stds-802-1@...

              Contact: Paul Congdon
               Postal: Hewlett-Packard Company
                       8000 Foothills Blvd. 
                       Roseville, CA 95747
                       USA
                  Tel: +1-916-785-5753
               E-mail: paul_congdon@..."
    DESCRIPTION
            "The LLDP Management Information Base extension module for
            IEEE 802.1 organizationally defined discovery information.

            In order to assure the uniqueness of the LLDP-MIB,
            lldpXdot1MIB is branched from lldpExtensions using OUI value
            as the node.  An OUI/'company_id' is a 24 bit globally unique
            assigned number referenced by various standards.

            Copyright (C) IEEE (2004).  This version of this MIB module
            is published as Annex F.7.1 of IEEE Std 802.1AB-2004;
            see the standard itself for full legal notices."
    REVISION        "200411220000Z" -- November 22, 2004
    DESCRIPTION
            "Published as part of IEEE Std 802.1AB-2004 initial version."
-- OUI for IEEE 802.1 is 32962 (00-80-C2) 
   ::= { lldpExtensions 32962 }

------------------------------------------------------------------------------
------------------------------------------------------------------------------
--
-- Organizationally Defined Information Extension - IEEE 802.1
--
------------------------------------------------------------------------------
------------------------------------------------------------------------------

lldpXdot1Objects    OBJECT IDENTIFIER ::= { lldpXdot1MIB 1 }

-- LLDP IEEE 802.1 extension MIB groups
lldpXdot1Config     OBJECT IDENTIFIER ::= { lldpXdot1Objects 1 }
lldpXdot1LocalData  OBJECT IDENTIFIER ::= { lldpXdot1Objects 2 }
lldpXdot1RemoteData OBJECT IDENTIFIER ::= { lldpXdot1Objects 3 }

------------------------------------------------------------------------------
-- IEEE 802.1 - Configuration
------------------------------------------------------------------------------
--
-- lldpXdot1ConfigPortVlanTable : configure the transmission of the 
--                                Port VLAN-ID TLVs on set of ports.
--

lldpXdot1ConfigPortVlanTable OBJECT-TYPE
    SYNTAX      SEQUENCE OF LldpXdot1ConfigPortVlanEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "A table that controls selection of LLDP Port VLAN-ID TLVs
            to be transmitted on individual ports."
    ::= { lldpXdot1Config 1 }

lldpXdot1ConfigPortVlanEntry  OBJECT-TYPE
    SYNTAX      LldpXdot1ConfigPortVlanEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "LLDP configuration information that controls the
            transmission of IEEE 802.1 organizationally defined Port
            VLAN-ID TLV on LLDP transmission capable ports.

            This configuration object augments the lldpPortConfigEntry of
            the LLDP-MIB, therefore it is only present along with the port
            configuration defined by the associated lldpPortConfigEntry
            entry.

            Each active lldpConfigEntry must be restored from non-volatile
            storage (along with the corresponding lldpPortConfigEntry)
            after a re-initialization of the management system."
    AUGMENTS { lldpPortConfigEntry }
    ::= { lldpXdot1ConfigPortVlanTable 1 }

LldpXdot1ConfigPortVlanEntry ::= SEQUENCE {
      lldpXdot1ConfigPortVlanTxEnable  TruthValue
}

lldpXdot1ConfigPortVlanTxEnable OBJECT-TYPE
    SYNTAX      TruthValue
    MAX-ACCESS  read-write
    STATUS      current
    DESCRIPTION
            "The lldpXdot1ConfigPortVlanTxEnable, which is defined as
            a truth value and configured by the network management,
            determines whether the IEEE 802.1 organizationally defined
            port VLAN TLV transmission is allowed on a given LLDP
            transmission capable port.

            The value of this object must be restored from non-volatile
            storage after a re-initialization of the management system."
    REFERENCE 
            "IEEE 802.1AB-2004 10.2.1.1"
    DEFVAL  { false }
    ::= { lldpXdot1ConfigPortVlanEntry 1 }

--
-- lldpXdot1ConfigVlanNameTable : configure the transmission of the 
--                                VLAN name instances on set of ports.
--

lldpXdot1ConfigVlanNameTable OBJECT-TYPE
    SYNTAX      SEQUENCE OF LldpXdot1ConfigVlanNameEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "The table that controls selection of LLDP VLAN name TLV
            instances to be transmitted on individual ports."
    ::= { lldpXdot1Config 2 }

lldpXdot1ConfigVlanNameEntry  OBJECT-TYPE
    SYNTAX      LldpXdot1ConfigVlanNameEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "LLDP configuration information that specifies the set of
            ports (represented as a PortList) on which the Local System
            VLAN name instance will be transmitted.

            This configuration object augments the lldpLocVlanEntry,
            therefore it is only present along with the VLAN Name instance
            contained in the associated lldpLocVlanNameEntry entry.

            Each active lldpXdot1ConfigVlanNameEntry must be restored
            from non-volatile storage (along with the corresponding
            lldpXdot1LocVlanNameEntry) after a re-initialization of the
            management system."
    AUGMENTS { lldpXdot1LocVlanNameEntry }
    ::= { lldpXdot1ConfigVlanNameTable 1 }

LldpXdot1ConfigVlanNameEntry ::= SEQUENCE {
      lldpXdot1ConfigVlanNameTxEnable  TruthValue 
}

lldpXdot1ConfigVlanNameTxEnable  OBJECT-TYPE
    SYNTAX        TruthValue
    MAX-ACCESS    read-write
    STATUS        current
    DESCRIPTION
            "The boolean value that indicates whether the corresponding
            Local System VLAN name instance will be transmitted on the
            port defined by the given lldpXdot1LocVlanNameEntry.

            The value of this object must be restored from non-volatile
            storage after a re-initialization of the management system."
    REFERENCE 
            "IEEE 802.1AB-2004 10.2.1.1"
    DEFVAL  { false }
    ::= { lldpXdot1ConfigVlanNameEntry 1 }

--
-- lldpXdot1ConfigProtoVlanTable : configure the transmission of the 
--                                 protocol VLAN instances on set
--                                 of ports.
--

lldpXdot1ConfigProtoVlanTable OBJECT-TYPE
    SYNTAX      SEQUENCE OF LldpXdot1ConfigProtoVlanEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "The table that controls selection of LLDP Port and Protocol
            VLAN ID TLV instances to be transmitted on individual ports."
    ::= { lldpXdot1Config 3 }

lldpXdot1ConfigProtoVlanEntry  OBJECT-TYPE
    SYNTAX      LldpXdot1ConfigProtoVlanEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "LLDP configuration information that specifies the set of
            ports (represented as a PortList) on which the Local System
            Protocol VLAN instance will be transmitted.

            This configuration object augments the lldpXdot1LocVlanEntry,
            therefore it is only present along with the Port and
            Protocol VLAN ID instance contained in the associated
            lldpXdot1LocVlanEntry entry.

            Each active lldpXdot1ConfigProtoVlanEntry must be restored
            from non-volatile storage (along with the corresponding
            lldpXdot1LocProtoVlanEntry) after a re-initialization of
            the management system."

    AUGMENTS { lldpXdot1LocProtoVlanEntry }
    ::= { lldpXdot1ConfigProtoVlanTable 1 }

LldpXdot1ConfigProtoVlanEntry ::= SEQUENCE {
      lldpXdot1ConfigProtoVlanTxEnable   TruthValue
}

lldpXdot1ConfigProtoVlanTxEnable OBJECT-TYPE
    SYNTAX        TruthValue
    MAX-ACCESS    read-write
    STATUS        current
    DESCRIPTION
            "The boolean value that indicates whether the corresponding
            Local System Port and Protocol VLAN instance will
            be transmitted on the port defined by the given
            lldpXdot1LocProtoVlanEntry.

            The value of this object must be restored from non-volatile
            storage after a re-initialization of the management system."
    REFERENCE 
            "IEEE 802.1AB-2004 10.2.1.1"
    DEFVAL  { false }
    ::= { lldpXdot1ConfigProtoVlanEntry 1 }

--
-- lldpXdot1ConfigProtocolTable : configure the transmission of the 
--                                protocol instances on set
--                                of ports.
--

lldpXdot1ConfigProtocolTable OBJECT-TYPE
    SYNTAX      SEQUENCE OF LldpXdot1ConfigProtocolEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "The table that controls selection of LLDP Protocol 
            TLV instances to be transmitted on individual ports."
    ::= { lldpXdot1Config 4 }

lldpXdot1ConfigProtocolEntry  OBJECT-TYPE
    SYNTAX      LldpXdot1ConfigProtocolEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "LLDP configuration information that specifies the set of
            ports (represented as a PortList) on which the Local System
            Protocol instance will be transmitted.

            This configuration object augments the lldpXdot1LocProtoEntry,
            therefore it is only present along with the Protocol instance
            contained in the associated lldpXdot1LocProtoEntry entry.

            Each active lldpXdot1ConfigProtocolEntry must be restored
            from non-volatile storage (along with the corresponding
            lldpXdot1LocProtocolEntry) after a re-initialization of the
            management system."
    AUGMENTS { lldpXdot1LocProtocolEntry }
    ::= { lldpXdot1ConfigProtocolTable 1 }

LldpXdot1ConfigProtocolEntry ::= SEQUENCE {
      lldpXdot1ConfigProtocolTxEnable   TruthValue
}

lldpXdot1ConfigProtocolTxEnable  OBJECT-TYPE
    SYNTAX        TruthValue
    MAX-ACCESS    read-write
    STATUS        current
    DESCRIPTION
            "The boolean value that indicates whether the corresponding
            Local System Protocol Identity instance will be transmitted
            on the port defined by the given lldpXdot1LocProtocolEntry.

            The value of this object must be restored from non-volatile
            storage after a re-initialization of the management system."
    REFERENCE 
            "IEEE 802.1AB-2004 10.2.1.1"
    DEFVAL  { false }
    ::= { lldpXdot1ConfigProtocolEntry 1 }

------------------------------------------------------------------------------
-- IEEE 802.1 - Local System Information
------------------------------------------------------------------------------
lldpXdot1LocTable  OBJECT-TYPE
    SYNTAX      SEQUENCE OF LldpXdot1LocEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "This table contains one row per port for IEEE 802.1
            organizationally defined LLDP extension on the local system
            known to this agent."
    ::= { lldpXdot1LocalData 1 }

lldpXdot1LocEntry  OBJECT-TYPE
    SYNTAX      LldpXdot1LocEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "Information about IEEE 802.1 organizationally defined
            LLDP extension."
    INDEX   { lldpLocPortNum }
    ::= { lldpXdot1LocTable 1 }

LldpXdot1LocEntry ::= SEQUENCE {
              lldpXdot1LocPortVlanId         Integer32
} 

lldpXdot1LocPortVlanId OBJECT-TYPE
    SYNTAX      Integer32(0|1..4094)
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The integer value used to identify the port's VLAN identifier
            associated with the local system.   A value of zero shall
            be used if the system either does not know the PVID or does
            not support port-based VLAN operation."
    REFERENCE 
            "IEEE 802.1AB-2004 F.2.1"
    ::= { lldpXdot1LocEntry 1 }

--
-- lldpXdot1LocProtoVlanTable: Port and Protocol VLAN information 
--

lldpXdot1LocProtoVlanTable  OBJECT-TYPE
    SYNTAX      SEQUENCE OF LldpXdot1LocProtoVlanEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "This table contains one or more rows per Port and Protocol
            VLAN information about the local system."
    ::= { lldpXdot1LocalData 2 }

lldpXdot1LocProtoVlanEntry OBJECT-TYPE
    SYNTAX      LldpXdot1LocProtoVlanEntry 
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "Port and protocol VLAN ID Information about a particular
            port component.  There may be multiple port and protocol VLANs,
            identified by a particular lldpXdot1LocProtoVlanId, configured
            on the given port."
    INDEX   { lldpLocPortNum,
              lldpXdot1LocProtoVlanId }
    ::= { lldpXdot1LocProtoVlanTable 1 }

LldpXdot1LocProtoVlanEntry ::= SEQUENCE {
      lldpXdot1LocProtoVlanId        Integer32,
      lldpXdot1LocProtoVlanSupported TruthValue,
      lldpXdot1LocProtoVlanEnabled   TruthValue
}

lldpXdot1LocProtoVlanId  OBJECT-TYPE
    SYNTAX      Integer32(0|1..4094)
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "The integer value used to identify the port and protocol
            VLANs associated with the given port associated with the
            local system.  A value of zero shall be used if the system
            either does not know the protocol VLAN ID (PPVID) or does
            not support port and protocol VLAN operation."
    REFERENCE 
            "IEEE 802.1AB-2004 F.3.2"
    ::= { lldpXdot1LocProtoVlanEntry 1 }

lldpXdot1LocProtoVlanSupported  OBJECT-TYPE
    SYNTAX      TruthValue
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The truth value used to indicate whether the given port
            (associated with the local system) supports port and protocol
            VLANs."
    REFERENCE 
            "IEEE 802.1AB-2004 F.3.1"
    ::= { lldpXdot1LocProtoVlanEntry 2 }

lldpXdot1LocProtoVlanEnabled  OBJECT-TYPE
    SYNTAX      TruthValue
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The truth value used to indicate whether the port and
            protocol VLANs are enabled on the given port associated with
            the local system."
    REFERENCE 
            "IEEE 802.1AB-2004 F.3.1"
    ::= { lldpXdot1LocProtoVlanEntry 3 }

--
-- lldpXdot1LocVlanNameTable : VLAN name information about the local system
--

lldpXdot1LocVlanNameTable  OBJECT-TYPE
    SYNTAX      SEQUENCE OF LldpXdot1LocVlanNameEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "This table contains one or more rows per IEEE 802.1Q VLAN
            name information on the local system known to this agent."
    ::= { lldpXdot1LocalData 3 }

lldpXdot1LocVlanNameEntry OBJECT-TYPE
    SYNTAX      LldpXdot1LocVlanNameEntry 
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "VLAN name Information about a particular port component.
            There may be multiple VLANs, identified by a particular
            lldpXdot1LocVlanId, configured on the given port."
    INDEX   { lldpLocPortNum,
              lldpXdot1LocVlanId }
    ::= { lldpXdot1LocVlanNameTable 1 }

LldpXdot1LocVlanNameEntry ::= SEQUENCE {
      lldpXdot1LocVlanId     VlanId,
      lldpXdot1LocVlanName   SnmpAdminString
}

lldpXdot1LocVlanId  OBJECT-TYPE
    SYNTAX      VlanId
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "The integer value used to identify the IEEE 802.1Q 
            VLAN IDs with which the given port is compatible."
    REFERENCE 
            "IEEE 802.1AB-2004 F.4.2"
    ::= { lldpXdot1LocVlanNameEntry 1 }

lldpXdot1LocVlanName  OBJECT-TYPE
    SYNTAX      SnmpAdminString (SIZE(1..32))
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The string value used to identify VLAN name identified by the
            Vlan Id associated with the given port on the local system.

            This object should contain the value of the dot1QVLANStaticName
            object (defined in IETF RFC 2674) identified with the given
            lldpXdot1LocVlanId."
    REFERENCE 
            "IEEE 802.1AB-2004 F.4.4"
    ::= { lldpXdot1LocVlanNameEntry 2 }

--
-- lldpXdot1LocProtocolTable : Protocol Identity information 
--

lldpXdot1LocProtocolTable  OBJECT-TYPE
    SYNTAX      SEQUENCE OF LldpXdot1LocProtocolEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "This table contains one or more rows per protocol identity
            information on the local system known to this agent."
    REFERENCE 
            "IEEE 802.1AB-2004 F.5"
    ::= { lldpXdot1LocalData 4 }

lldpXdot1LocProtocolEntry  OBJECT-TYPE
    SYNTAX      LldpXdot1LocProtocolEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "Information about particular protocols that are accessible
            through the given port component.

            There may be multiple protocols, identified by particular
            lldpXdot1ProtocolIndex, and lldpLocPortNum."
    REFERENCE 
            "IEEE 802.1AB-2004 F.5"
    INDEX   { lldpLocPortNum,
              lldpXdot1LocProtocolIndex }
    ::= { lldpXdot1LocProtocolTable 1 }

LldpXdot1LocProtocolEntry ::= SEQUENCE {
      lldpXdot1LocProtocolIndex Integer32,
      lldpXdot1LocProtocolId    OCTET STRING
}

lldpXdot1LocProtocolIndex  OBJECT-TYPE
    SYNTAX      Integer32(1..2147483647)
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "This object represents an arbitrary local integer value used
            by this agent to identify a particular protocol identity."
    ::= { lldpXdot1LocProtocolEntry 1 }

lldpXdot1LocProtocolId  OBJECT-TYPE
    SYNTAX      OCTET STRING (SIZE (1..255))
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The octet string value used to identify the protocols
            associated with the given port of the local system."
    REFERENCE 
            "IEEE 802.1AB-2004 F.5.1"
    ::= { lldpXdot1LocProtocolEntry 2 }


------------------------------------------------------------------------------
-- IEEE 802.1 - Remote System Information
------------------------------------------------------------------------------
lldpXdot1RemTable OBJECT-TYPE
    SYNTAX      SEQUENCE OF LldpXdot1RemEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "This table contains one or more rows per physical network
            connection known to this agent.  The agent may wish to
            ensure that only one lldpXdot1RemEntry is present for
            each local port, or it may choose to maintain multiple
            lldpXdot1RemEntries for the same local port."
    ::= { lldpXdot1RemoteData 1 }

lldpXdot1RemEntry OBJECT-TYPE
    SYNTAX      LldpXdot1RemEntry 
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "Information about a particular port component."
    INDEX   { lldpRemTimeMark,
              lldpRemLocalPortNum,
              lldpRemIndex }
    ::= { lldpXdot1RemTable 1 }

LldpXdot1RemEntry ::= SEQUENCE {
              lldpXdot1RemPortVlanId         Integer32
}

lldpXdot1RemPortVlanId OBJECT-TYPE
    SYNTAX      Integer32(0|1..4094)
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The integer value used to identify the port's VLAN identifier
            associated with the remote system.  if the remote system
            either does not know the PVID or does not support port-based
            VLAN operation, the value of lldpXdot1RemPortVlanId should
            be zero."
    REFERENCE 
            "IEEE 802.1AB-2004 F.2.1"
    ::= { lldpXdot1RemEntry 1 }

lldpXdot1RemProtoVlanTable  OBJECT-TYPE
    SYNTAX      SEQUENCE OF LldpXdot1RemProtoVlanEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "This table contains one or more rows per Port and Protocol
            VLAN information about the remote system, received on the
            given port."
    ::= { lldpXdot1RemoteData 2 }

lldpXdot1RemProtoVlanEntry OBJECT-TYPE
    SYNTAX      LldpXdot1RemProtoVlanEntry 
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "Port and protocol VLAN name Information about a particular
            port component.  There may be multiple protocol VLANs,
            identified by a particular lldpXdot1RemProtoVlanId, configured
            on the remote system."
    INDEX   { lldpRemTimeMark,
              lldpRemLocalPortNum,
              lldpRemIndex,
              lldpXdot1RemProtoVlanId }
    ::= { lldpXdot1RemProtoVlanTable 1 }

LldpXdot1RemProtoVlanEntry ::= SEQUENCE {
      lldpXdot1RemProtoVlanId        Integer32,
      lldpXdot1RemProtoVlanSupported TruthValue,
      lldpXdot1RemProtoVlanEnabled   TruthValue
}

lldpXdot1RemProtoVlanId  OBJECT-TYPE
    SYNTAX      Integer32(0|1..4094)
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "The integer value used to identify the port and protocol
            VLANs associated with the given port associated with the
            remote system.

            If port and protocol VLANs are not supported on the given
            port associated with the remote system, or if the port is
            not enabled with any port and protocol VLAN, the value of
            lldpXdot1RemProtoVlanId should be zero."
    REFERENCE 
            "IEEE 802.1AB-2004 F.3.2"
    ::= { lldpXdot1RemProtoVlanEntry 1 }

lldpXdot1RemProtoVlanSupported  OBJECT-TYPE
    SYNTAX      TruthValue
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The truth value used to indicate whether the given port
            (associated with the remote system) is capable of supporting
            port and protocol VLANs."
    REFERENCE 
            "IEEE 802.1AB-2004 F.3.1"
    ::= { lldpXdot1RemProtoVlanEntry 2 }

lldpXdot1RemProtoVlanEnabled  OBJECT-TYPE
    SYNTAX      TruthValue
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The truth value used to indicate whether the port and
            protocol VLANs are enabled on the given port associated with
            the remote system."
    REFERENCE 
            "IEEE 802.1AB-2004 F.3.1"
    ::= { lldpXdot1RemProtoVlanEntry 3 }


-- 
-- lldpXdot1RemVlanNameTable : VLAN name information of the remote 
--                             systems
--

lldpXdot1RemVlanNameTable  OBJECT-TYPE
    SYNTAX      SEQUENCE OF LldpXdot1RemVlanNameEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "This table contains one or more rows per IEEE 802.1Q VLAN
            name information about the remote system, received on the
            given port."
    REFERENCE 
            "IEEE 802.1AB-2004 F.4"
    ::= { lldpXdot1RemoteData 3 }

lldpXdot1RemVlanNameEntry OBJECT-TYPE
    SYNTAX      LldpXdot1RemVlanNameEntry 
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "VLAN name Information about a particular port component.
            There may be multiple VLANs, identified by a particular
            lldpXdot1RemVlanId, received on the given port."
    INDEX   { lldpRemTimeMark,
              lldpRemLocalPortNum,
              lldpRemIndex,
              lldpXdot1RemVlanId }
    ::= { lldpXdot1RemVlanNameTable 1 }

LldpXdot1RemVlanNameEntry ::= SEQUENCE {
      lldpXdot1RemVlanId     VlanId,
      lldpXdot1RemVlanName   SnmpAdminString
}

lldpXdot1RemVlanId  OBJECT-TYPE
    SYNTAX      VlanId
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "The integer value used to identify the IEEE 802.1Q 
            VLAN IDs with which the given port of the remote system
            is compatible."
    REFERENCE 
            "IEEE 802.1AB-2004 F.4.2"
    ::= { lldpXdot1RemVlanNameEntry 1 }

lldpXdot1RemVlanName  OBJECT-TYPE
    SYNTAX      SnmpAdminString (SIZE(1..32))
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The string value used to identify VLAN name identified by the 
            VLAN Id associated with the remote system."
    REFERENCE 
            "IEEE 802.1AB-2004 F.4.4"
    ::= { lldpXdot1RemVlanNameEntry 2 }

--
-- lldpXdot1RemProtocolTable : Protocol information of the remote systems
--

lldpXdot1RemProtocolTable  OBJECT-TYPE
    SYNTAX      SEQUENCE OF LldpXdot1RemProtocolEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "This table contains one or more rows per protocol information
            about the remote system, received on the given port."
    ::= { lldpXdot1RemoteData 4 }

lldpXdot1RemProtocolEntry  OBJECT-TYPE
    SYNTAX      LldpXdot1RemProtocolEntry
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "Protocol information about a particular port component.
            There may be multiple protocols, identified by a particular
            lldpXdot1ProtocolIndex, received on the given port."
    INDEX   { lldpRemTimeMark,
              lldpRemLocalPortNum,
              lldpRemIndex,
              lldpXdot1RemProtocolIndex }
    ::= { lldpXdot1RemProtocolTable 1 }

LldpXdot1RemProtocolEntry ::= SEQUENCE {
      lldpXdot1RemProtocolIndex Integer32,
      lldpXdot1RemProtocolId    OCTET STRING
}

lldpXdot1RemProtocolIndex  OBJECT-TYPE
    SYNTAX      Integer32(1..2147483647)
    MAX-ACCESS  not-accessible
    STATUS      current
    DESCRIPTION
            "This object represents an arbitrary local integer value used
            by this agent to identify a particular protocol identity."
    ::= { lldpXdot1RemProtocolEntry 1 }

lldpXdot1RemProtocolId  OBJECT-TYPE
    SYNTAX      OCTET STRING (SIZE (1..255))
    MAX-ACCESS  read-only
    STATUS      current
    DESCRIPTION
            "The octet string value used to identify the protocols
            associated with the given port of remote system."
    REFERENCE 
            "IEEE 802.1AB-2004 F.5.3"
    ::= { lldpXdot1RemProtocolEntry 2 }


------------------------------------------------------------------------------
-- Conformance Information
------------------------------------------------------------------------------

lldpXdot1Conformance OBJECT IDENTIFIER ::= { lldpXdot1MIB 2 }
lldpXdot1Compliances OBJECT IDENTIFIER ::= { lldpXdot1Conformance 1 }
lldpXdot1Groups      OBJECT IDENTIFIER ::= { lldpXdot1Conformance 2 }

-- compliance statements

lldpXdot1Compliance MODULE-COMPLIANCE
    STATUS  current
    DESCRIPTION
            "The compliance statement for SNMP entities which implement
            the IEEE 802.1 organizationally defined LLDP extension MIB."
    MODULE  -- this module
        MANDATORY-GROUPS { lldpXdot1ConfigGroup, 
                           lldpXdot1LocSysGroup,
                           lldpXdot1RemSysGroup
        }
    ::= { lldpXdot1Compliances 1 }

-- MIB groupings

lldpXdot1ConfigGroup    OBJECT-GROUP
    OBJECTS {
        lldpXdot1ConfigPortVlanTxEnable,
        lldpXdot1ConfigVlanNameTxEnable,
        lldpXdot1ConfigProtoVlanTxEnable,
        lldpXdot1ConfigProtocolTxEnable
    }
    STATUS  current
    DESCRIPTION
            "The collection of objects which are used to configure the
            IEEE 802.1 organizationally defined LLDP extension
            implementation behavior.

            This group is mandatory for agents which implement the 
            IEEE 802.1 organizationally defined LLDP extension."
    ::= { lldpXdot1Groups 1 }

lldpXdot1LocSysGroup  OBJECT-GROUP
    OBJECTS {
        lldpXdot1LocPortVlanId,
        lldpXdot1LocProtoVlanSupported,
        lldpXdot1LocProtoVlanEnabled,
        lldpXdot1LocVlanName,
        lldpXdot1LocProtocolId 
    }
    STATUS  current
    DESCRIPTION
            "The collection of objects which are used to represent 
            IEEE 802.1 organizationally defined LLDP extension associated
            with the Local Device Information.
            
            This group is mandatory for agents which implement the 
            IEEE 802.1 organizationally defined LLDP extension in the
            TX mode."
    ::= { lldpXdot1Groups 2 }

lldpXdot1RemSysGroup  OBJECT-GROUP
    OBJECTS {
        lldpXdot1RemPortVlanId,
        lldpXdot1RemProtoVlanSupported,
        lldpXdot1RemProtoVlanEnabled,
        lldpXdot1RemVlanName,
        lldpXdot1RemProtocolId 
    }
    STATUS  current
    DESCRIPTION
            "The collection of objects which are used to represent LLDP
            802.1 organizational extension Local Device Information.
            
            This group is mandatory for agents which implement the 
            LLDP 802.1 organizational extension in the RX mode."
    ::= { lldpXdot1Groups 3 }

END