From owner-svn-soc-all@FreeBSD.ORG Tue Jun 24 12:04:09 2014 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7F3CDD35 for ; Tue, 24 Jun 2014 12:04:09 +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 603552141 for ; Tue, 24 Jun 2014 12:04:09 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5OC49uJ014263 for ; Tue, 24 Jun 2014 12:04:09 GMT (envelope-from shonali@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s5OC488d014094 for svn-soc-all@FreeBSD.org; Tue, 24 Jun 2014 12:04:08 GMT (envelope-from shonali@FreeBSD.org) Date: Tue, 24 Jun 2014 12:04:08 GMT Message-Id: <201406241204.s5OC488d014094@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: r269962 - 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: Tue, 24 Jun 2014 12:04:09 -0000 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);