socsvn commit: r272591 - soc2014/shonali/head/contrib/bsnmp/snmpd

[shonali at FreeBSD.org]

Author: shonali
Date: Mon Aug 18 04:50:02 2014
New Revision: 272591
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=272591

Log:
  Used constants SNMP_IPv4_ADDR_SIZ & SNMP_IPv6_ADDR_SIZ
  

Modified:
  soc2014/shonali/head/contrib/bsnmp/snmpd/config.c

Modified: soc2014/shonali/head/contrib/bsnmp/snmpd/config.c
==============================================================================
--- soc2014/shonali/head/contrib/bsnmp/snmpd/config.c	Mon Aug 18 04:33:49 2014	(r272590)
+++ soc2014/shonali/head/contrib/bsnmp/snmpd/config.c	Mon Aug 18 04:50:02 2014	(r272591)
@@ -152,7 +152,7 @@
 static char	strval[_POSIX2_LINE_MAX];
 static size_t	strvallen;
 static int	token;
-static int      addr_type;
+static int      addrtype;
 
 /* error return */
 static jmp_buf	errjmp[4];
@@ -797,14 +797,14 @@
         switch (res->ai_family) {
 
         	case AF_INET :   
-                	addr_type = AF_INET;
+                	addrtype = AF_INET;
                 	sain = (struct sockaddr_in *)(void *)res->ai_addr;
                 	sain->sin_addr.s_addr = ntohl(sain->sin_addr.s_addr); 
 	                inet_ntop(AF_INET, &(sain->sin_addr), *ip, INET_ADDRSTRLEN); 
                         break;
 
                 case AF_INET6 :
-                        addr_type = AF_INET6;
+                        addrtype = AF_INET6;
                 	sain6 = (struct sockaddr_in6 *)(void *)res->ai_addr;
                         inet_ntop(AF_INET6, &(sain6->sin6_addr), *ip, INET6_ADDRSTRLEN);
         }
@@ -862,7 +862,7 @@
 		} else if (token == TOK_HOST) {
 			gethost(strval, ip);
 
-                        if (addr_type == AF_INET){
+                        if (addrtype == AF_INET){
                                 if (oid->len + SNMP_IPv4_ADDR_SIZ > ASN_MAXOIDLEN)
                                 	report("index too long");
 				for (i = 0; i < SNMP_IPv4_ADDR_SIZ; i++)
@@ -870,7 +870,7 @@
 				gettoken();
                         }
 
-                        else if (addr_type == AF_INET6){
+                        else if (addrtype == AF_INET6){
                                 if (oid->len + SNMP_IPv6_ADDR_SIZ > ASN_MAXOIDLEN)
                                 	report("index too long");
                                 for (i = 0; i < SNMP_IPv6_ADDR_SIZ; i++)
@@ -1005,7 +1005,7 @@
 			if (numval >= 256)
 				report("ip address part too large");
 			value->v.ipaddress[i++] = numval;
-			if (i == 4)
+			if (i == SNMP_IPv4_ADDR_SIZ)
 				break;
 			if (gettoken() != '.')
 				report("expecting '.' in ip address");
@@ -1015,7 +1015,7 @@
 	} else if (token == TOK_HOST) {
 		/* host name */
 		gethost(strval, ip);
-		for (i = 0; i < 4; i++)
+		for (i = 0; i < SNMP_IPv4_ADDR_SIZ; i++)
 			value->v.ipaddress[i] = ip[i];
 		gettoken();
 
@@ -1034,7 +1034,7 @@
 		i = 0;
 		for (;;) {
 			value->v.ipaddress6[i++] = numval;
-			if (i == 16)
+			if (i == SNMP_IPv6_ADDR_SIZ)
 				break;
 			if (gettoken() != ':')
 				report("expecting ':' in ip address");
@@ -1048,7 +1048,7 @@
 	} else if (token == TOK_HOST) {
 		/* host name */
 		gethost(strval, ip);
-		for (i = 0; i < 16; i++)
+		for (i = 0; i < SNMP_IPv6_ADDR_SIZ; i++)
 			value->v.ipaddress6[i] = ip[i];
 		gettoken();