socsvn commit: r272491 - soc2014/shonali/head/usr.sbin/bsnmpd/tools/libbsnmptools

[shonali at FreeBSD.org]

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]);
 }