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

[shonali at FreeBSD.org]

Author: shonali
Date: Tue Jun 24 12:04:08 2014
New Revision: 269962
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=269962

Log:
  Removing redundant ntohl call from gethost.
  

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	Tue Jun 24 08:21:43 2014	(r269961)
+++ soc2014/shonali/head/contrib/bsnmp/snmpd/config.c	Tue Jun 24 12:04:08 2014	(r269962)
@@ -808,15 +808,15 @@
                 addr_type = AF_INET6;
 		struct sockaddr_in6 *sain ; 
                 sain = (struct sockaddr_in6 *)(void *)res->ai_addr;
-                u_int32_t tmp[4];
+                unsigned char tmp[16];
                 
                 /* ipv6 implementation of network to host byte order function */
 
                 if (BYTE_ORDER == LITTLE_ENDIAN) {
-                tmp[3] = ntohl((sain->sin6_addr.s6_addr[0] << 24) | (sain->sin6_addr.s6_addr[1] << 16) | (sain->sin6_addr.s6_addr[2] << 8) | sain->sin6_addr.s6_addr[3]);
-                tmp[2] = ntohl((sain->sin6_addr.s6_addr[4] << 24) | (sain->sin6_addr.s6_addr[5] << 16) | (sain->sin6_addr.s6_addr[6] << 8) | sain->sin6_addr.s6_addr[7]);
-                tmp[1] = ntohl((sain->sin6_addr.s6_addr[8] << 24) | (sain->sin6_addr.s6_addr[9] << 16) | (sain->sin6_addr.s6_addr[10] << 8) | sain->sin6_addr.s6_addr[11]);
-                tmp[0] = ntohl((sain->sin6_addr.s6_addr[12] << 24) | (sain->sin6_addr.s6_addr[13] << 16) | (sain->sin6_addr.s6_addr[14] << 8) | sain->sin6_addr.s6_addr[15]);
+                tmp[3] = (sain->sin6_addr.s6_addr[0] << 24) | (sain->sin6_addr.s6_addr[1] << 16) | (sain->sin6_addr.s6_addr[2] << 8) | sain->sin6_addr.s6_addr[3];
+                tmp[2] = (sain->sin6_addr.s6_addr[4] << 24) | (sain->sin6_addr.s6_addr[5] << 16) | (sain->sin6_addr.s6_addr[6] << 8) | sain->sin6_addr.s6_addr[7];
+                tmp[1] = (sain->sin6_addr.s6_addr[8] << 24) | (sain->sin6_addr.s6_addr[9] << 16) | (sain->sin6_addr.s6_addr[10] << 8) | sain->sin6_addr.s6_addr[11];
+                tmp[0] = (sain->sin6_addr.s6_addr[12] << 24) | (sain->sin6_addr.s6_addr[13] << 16) | (sain->sin6_addr.s6_addr[14] << 8) | sain->sin6_addr.s6_addr[15];
                 }
 
                 else {
@@ -825,15 +825,6 @@
                 tmp[2] = (sain->sin6_addr.s6_addr[8] << 24) | (sain->sin6_addr.s6_addr[9] << 16) | (sain->sin6_addr.s6_addr[10] << 8) | sain->sin6_addr.s6_addr[11];
                 tmp[3] = (sain->sin6_addr.s6_addr[12] << 24) | (sain->sin6_addr.s6_addr[13] << 16) | (sain->sin6_addr.s6_addr[14] << 8) | sain->sin6_addr.s6_addr[15];
                 }
-                
-                /* 
-		unsigned char addr[16] ; 
-		strcpy(addr, tmp[0]);
-		strcat(addr, tmp[1]);
-	        strcat(addr, tmp[2]);
-		strcat(addr, tmp[3]);
-                sain->sin6_addr.s6_addr = (unsigned char *)tmp;
-                */
  
                 strcpy(sain->sin6_addr.s6_addr, (unsigned char *)tmp) ; 
                 inet_ntop(AF_INET6, &(sain->sin6_addr), *ip, INET6_ADDRSTRLEN);