From owner-svn-soc-all@FreeBSD.ORG Wed Jun 11 17:00:43 2014 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D4F13AD4 for ; Wed, 11 Jun 2014 17:00:43 +0000 (UTC) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C0EA42CC9 for ; Wed, 11 Jun 2014 17:00:43 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5BH0h06023663 for ; Wed, 11 Jun 2014 17:00:43 GMT (envelope-from shonali@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s5BH0ggr023618 for svn-soc-all@FreeBSD.org; Wed, 11 Jun 2014 17:00:42 GMT (envelope-from shonali@FreeBSD.org) Date: Wed, 11 Jun 2014 17:00:42 GMT Message-Id: <201406111700.s5BH0ggr023618@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to shonali@FreeBSD.org using -f From: shonali@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r269407 - soc2014/shonali/head/contrib/bsnmp/snmpd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jun 2014 17:00:44 -0000 Author: shonali Date: Wed Jun 11 17:00:42 2014 New Revision: 269407 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=269407 Log: Modified BEGEMOT-SNMPD-MIB, tree.def, snmpd.config to add definitions for IPv6. Modified: soc2014/shonali/head/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt soc2014/shonali/head/contrib/bsnmp/snmpd/snmpd.config soc2014/shonali/head/contrib/bsnmp/snmpd/tree.def Modified: soc2014/shonali/head/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt ============================================================================== --- soc2014/shonali/head/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt Wed Jun 11 16:11:12 2014 (r269406) +++ soc2014/shonali/head/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt Wed Jun 11 17:00:42 2014 (r269407) @@ -40,6 +40,8 @@ FROM SNMPv2-TC MODULE-COMPLIANCE, OBJECT-GROUP FROM SNMPv2-CONF + InetAddress, InetAddressType, InetPortNumber + FROM INET-ADDRESS-MIB begemot FROM BEGEMOT-MIB; @@ -216,23 +218,32 @@ DESCRIPTION "An entry in the table with descriptions of UDP ports to listen on for SNMP messages." - INDEX { begemotSnmpdPortAddress, begemotSnmpdPortPort } + INDEX { begemotSnmpdPortAddress, begemotSnmpdPortAddressType, begemotSnmpdPortPort } ::= { begemotSnmpdPortTable 1 } BegemotSnmpdPortEntry ::= SEQUENCE { - begemotSnmpdPortAddress IpAddress, + begemotSnmpdPortAddress InetAddress, + begemotSnmpdPortAddressType InetAddressType, begemotSnmpdPortPort INTEGER, begemotSnmpdPortStatus INTEGER } begemotSnmpdPortAddress OBJECT-TYPE - SYNTAX IpAddress + SYNTAX InetAddress MAX-ACCESS not-accessible STATUS current DESCRIPTION "The IP address to bind to." ::= { begemotSnmpdPortEntry 1 } +begemotSnmpdPortAddressType OBJECT-TYPE + SYNTAX InetAddressType + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The address type of the given host." + ::= { begemotSnmpdPortEntry 4 } + begemotSnmpdPortPort OBJECT-TYPE SYNTAX INTEGER (1..65535) MAX-ACCESS not-accessible @@ -566,5 +577,6 @@ -- begemotSnmpdTransUdp OBJECT IDENTIFIER ::= { begemotSnmpdTransportMappings 2 } begemotSnmpdTransLsock OBJECT IDENTIFIER ::= { begemotSnmpdTransportMappings 3 } +begemotSnmpdTransIpv6Udp OBJECT IDENTIFIER ::= { begemotSnmpdTransportMappings 4 } END Modified: soc2014/shonali/head/contrib/bsnmp/snmpd/snmpd.config ============================================================================== --- soc2014/shonali/head/contrib/bsnmp/snmpd/snmpd.config Wed Jun 11 16:11:12 2014 (r269406) +++ soc2014/shonali/head/contrib/bsnmp/snmpd/snmpd.config Wed Jun 11 17:00:42 2014 (r269407) @@ -71,8 +71,8 @@ begemotSnmpdCommunityDisable = 1 # open standard SNMP ports -begemotSnmpdPortStatus.[$(host)].161 = 1 -begemotSnmpdPortStatus.127.0.0.1.161 = 1 +begemotSnmpdPortStatus.::.161.2 = 1 +begemotSnmpdPortStatus.::1.161.2 = 1 # open a unix domain socket begemotSnmpdLocalPortStatus."/var/run/snmpd.sock" = 1 Modified: soc2014/shonali/head/contrib/bsnmp/snmpd/tree.def ============================================================================== --- soc2014/shonali/head/contrib/bsnmp/snmpd/tree.def Wed Jun 11 16:11:12 2014 (r269406) +++ soc2014/shonali/head/contrib/bsnmp/snmpd/tree.def Wed Jun 11 17:00:42 2014 (r269407) @@ -121,8 +121,9 @@ # Port table # (4 begemotSnmpdPortTable - (1 begemotSnmpdPortEntry : IPADDRESS INTEGER op_snmp_port - (1 begemotSnmpdPortAddress IPADDRESS) + (1 begemotSnmpdPortEntry : InetAddress InetAddressType INTEGER op_snmp_port + (1 begemotSnmpdPortAddress InetAddress) + (4 begemotSnmpdPortAddressType InetAddressType) (2 begemotSnmpdPortPort UNSIGNED32) (3 begemotSnmpdPortStatus INTEGER GET SET) )) @@ -180,6 +181,7 @@ )) (2 begemotSnmpdTransUdp OID op_transport_dummy) (3 begemotSnmpdTransLsock OID op_transport_dummy) + (4 begemotSnmpdTransIpv6Udp OID op_transport_dummy) ) ) (2 begemotSnmpdDefs