From owner-svn-soc-all@FreeBSD.ORG Sat Aug 16 10:47:58 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 37634452 for ; Sat, 16 Aug 2014 10:47:58 +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 224C72B45 for ; Sat, 16 Aug 2014 10:47:58 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7GAlwX0089700 for ; Sat, 16 Aug 2014 10:47:58 GMT (envelope-from shonali@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s7GAlvJ9089685 for svn-soc-all@FreeBSD.org; Sat, 16 Aug 2014 10:47:57 GMT (envelope-from shonali@FreeBSD.org) Date: Sat, 16 Aug 2014 10:47:57 GMT Message-Id: <201408161047.s7GAlvJ9089685@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: r272491 - soc2014/shonali/head/usr.sbin/bsnmpd/tools/libbsnmptools 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-1 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: Sat, 16 Aug 2014 10:47:58 -0000 Author: shonali Date: Sat Aug 16 10:47:56 2014 New Revision: 272491 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=272491 Log: Fixes for bsnmptools Modified: soc2014/shonali/head/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c soc2014/shonali/head/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c soc2014/shonali/head/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c Modified: soc2014/shonali/head/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c ============================================================================== --- soc2014/shonali/head/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c Sat Aug 16 08:38:53 2014 (r272490) +++ soc2014/shonali/head/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c Sat Aug 16 10:47:56 2014 (r272491) @@ -289,6 +289,7 @@ { "UNSIGNED32", TOK_TYPE, SNMP_SYNTAX_GAUGE }, { "OCTETSTRING", TOK_TYPE, SNMP_SYNTAX_OCTETSTRING }, { "IPADDRESS", TOK_TYPE, SNMP_SYNTAX_IPADDRESS }, + { "INETADDRESS", TOK_TYPE, SNMP_SYNTAX_IP6ADDRESS }, { "OID", TOK_TYPE, SNMP_SYNTAX_OID }, { "TIMETICKS", TOK_TYPE, SNMP_SYNTAX_TIMETICKS }, { "COUNTER", TOK_TYPE, SNMP_SYNTAX_COUNTER }, Modified: soc2014/shonali/head/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c ============================================================================== --- soc2014/shonali/head/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c Sat Aug 16 08:38:53 2014 (r272490) +++ soc2014/shonali/head/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c Sat Aug 16 10:47:56 2014 (r272491) @@ -451,6 +451,8 @@ return (snmp_oid_insert(snmptoolctx, entry)); case SNMP_SYNTAX_IPADDRESS: return (snmp_ip_insert(snmptoolctx, entry)); + case SNMP_SYNTAX_IP6ADDRESS: + return (snmp_ip_insert(snmptoolctx, entry)); case SNMP_SYNTAX_COUNTER: return (snmp_cnt_insert(snmptoolctx, entry)); case SNMP_SYNTAX_GAUGE: @@ -779,6 +781,8 @@ return (snmp_lookup_leaf(&snmptoolctx->snmp_oidlist, s)); case SNMP_SYNTAX_IPADDRESS: return (snmp_lookup_leaf(&snmptoolctx->snmp_iplist, s)); + case SNMP_SYNTAX_IP6ADDRESS: + return (snmp_lookup_leaf(&snmptoolctx->snmp_iplist, s)); case SNMP_SYNTAX_COUNTER: return (snmp_lookup_leaf(&snmptoolctx->snmp_cntlist, s)); case SNMP_SYNTAX_GAUGE: @@ -994,6 +998,9 @@ case SNMP_SYNTAX_IPADDRESS: return (snmp_lookup_oidlist(&snmptoolctx->snmp_iplist, s, oid)); + case SNMP_SYNTAX_IP6ADDRESS: + return (snmp_lookup_oidlist(&snmptoolctx->snmp_iplist, + s, oid)); case SNMP_SYNTAX_COUNTER: return (snmp_lookup_oidlist(&snmptoolctx->snmp_cntlist, s, oid)); Modified: soc2014/shonali/head/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c ============================================================================== --- soc2014/shonali/head/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c Sat Aug 16 08:38:53 2014 (r272490) +++ soc2014/shonali/head/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c Sat Aug 16 10:47:56 2014 (r272491) @@ -113,10 +113,10 @@ { "OctetString", SNMP_SYNTAX_OCTETSTRING }, { "OID", SNMP_SYNTAX_OID }, { "IpAddress", SNMP_SYNTAX_IPADDRESS }, + { "InetAddress", SNMP_SYNTAX_IP6ADDRESS }, { "Counter32", SNMP_SYNTAX_COUNTER }, { "Gauge", SNMP_SYNTAX_GAUGE }, { "TimeTicks", SNMP_SYNTAX_TIMETICKS }, - { "IPv6Address", SNMP_SYNTAX_IP6ADDRESS }, { "Counter64", SNMP_SYNTAX_COUNTER64 }, { "Unknown", SNMP_SYNTAX_UNKNOWN }, }; @@ -1775,7 +1775,7 @@ if (GET_OUTPUT(snmptoolctx) == OUTPUT_VERBOSE) fprintf(stdout, "%s : ", syntax_strings[SNMP_SYNTAX_IP6ADDRESS].str); - fprintf(stdout, "%u.%u.%u.%u.%u.%u.%u.%u.%u.%u.%u.%u.%u.%u.%u.%u", + fprintf(stdout, "%u%u:%u%u:%u%u:%u%u:%u%u:%u%u:%u%u:%u%u", ip[0], ip[1], ip[2], ip[3], ip[4], ip[5], ip[6], ip[7], ip[8], ip[9], ip[10], ip[11], ip[12], ip[13], ip[14], ip[15]); }