From owner-svn-soc-all@FreeBSD.ORG Sun Aug 3 08:09:27 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 0114B574 for ; Sun, 3 Aug 2014 08:09:27 +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 D63682A40 for ; Sun, 3 Aug 2014 08:09:26 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7389QVT079763 for ; Sun, 3 Aug 2014 08:09:26 GMT (envelope-from shonali@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s7389QNZ079757 for svn-soc-all@FreeBSD.org; Sun, 3 Aug 2014 08:09:26 GMT (envelope-from shonali@FreeBSD.org) Date: Sun, 3 Aug 2014 08:09:26 GMT Message-Id: <201408030809.s7389QNZ079757@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: r271778 - 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: Sun, 03 Aug 2014 08:09:27 -0000 Author: shonali Date: Sun Aug 3 08:09:26 2014 New Revision: 271778 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271778 Log: Removed unnecessary calls and resolved compile errors in config.c 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 Sun Aug 3 07:59:19 2014 (r271777) +++ soc2014/shonali/head/contrib/bsnmp/snmpd/config.c Sun Aug 3 08:09:26 2014 (r271778) @@ -799,58 +799,38 @@ struct sockaddr_in *sain ; sain = (struct sockaddr_in *)(void *)res->ai_addr; sain->sin_addr.s_addr = ntohl(sain->sin_addr.s_addr); - ip[0] = sain->sin_addr.s_addr >> 24; ip[1] = sain->sin_addr.s_addr >> 16; - ip[2] = sain->sin_addr.s_addr >> 8; - ip[3] = sain->sin_addr.s_addr >> 0; - - case AF_INET6 : - addr_type = AF_INET6; - struct sockaddr_in6 *sain ; - sain = (struct sockaddr_in6 *)(void *)res->ai_addr; - unsigned char tmp[16]; - + ip[2] = sain->sin_addr.s_addr >> 8; + ip[3] = sain->sin_addr.s_addr >> 0; + + case AF_INET6 : + addr_type = AF_INET6; + struct sockaddr_in6 *sain6 ; + sain6 = (struct sockaddr_in6 *)(void *)res->ai_addr; + + /* ipv6 implementation of network to host byte order function */ - /* May be unnecessary - check */ + /* + unsigned char tmp[16]; if (BYTE_ORDER == LITTLE_ENDIAN) { - 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]; + tmp[3] = (sain6->sin6_addr.s6_addr[0] << 24) | (sain6->sin6_addr.s6_addr[1] << 16) | (sain6->sin6_addr.s6_addr[2] << 8) | sain6->sin6_addr.s6_addr[3]; + tmp[2] = (sain6->sin6_addr.s6_addr[4] << 24) | (sain6->sin6_addr.s6_addr[5] << 16) | (sain6->sin6_addr.s6_addr[6] << 8) | sain6->sin6_addr.s6_addr[7]; + tmp[1] = (sain6->sin6_addr.s6_addr[8] << 24) | (sain6->sin6_addr.s6_addr[9] << 16) | (sain6->sin6_addr.s6_addr[10] << 8) | sain6->sin6_addr.s6_addr[11]; + tmp[0] = (sain6->sin6_addr.s6_addr[12] << 24) | (sain6->sin6_addr.s6_addr[13] << 16) | (sain6->sin6_addr.s6_addr[14] << 8) | sain6->sin6_addr.s6_addr[15]; } else { - tmp[0] = (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[1] = (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[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]; + tmp[0] = (sain6->sin6_addr.s6_addr[0] << 24) | (sain6->sin6_addr.s6_addr[1] << 16) | (sain6->sin6_addr.s6_addr[2] << 8) | sain6->sin6_addr.s6_addr[3]; + tmp[1] = (sain6->sin6_addr.s6_addr[4] << 24) | (sain6->sin6_addr.s6_addr[5] << 16) | (sain6->sin6_addr.s6_addr[6] << 8) | sain6->sin6_addr.s6_addr[7]; + tmp[2] = (sain6->sin6_addr.s6_addr[8] << 24) | (sain6->sin6_addr.s6_addr[9] << 16) | (sain6->sin6_addr.s6_addr[10] << 8) | sain6->sin6_addr.s6_addr[11]; + tmp[3] = (sain6->sin6_addr.s6_addr[12] << 24) | (sain6->sin6_addr.s6_addr[13] << 16) | (sain6->sin6_addr.s6_addr[14] << 8) | sain6->sin6_addr.s6_addr[15]; } - - strcpy(sain->sin6_addr.s6_addr, (unsigned char *)tmp) ; - inet_ntop(AF_INET6, &(sain->sin6_addr), *ip, INET6_ADDRSTRLEN); - - /* incase inet_ntop doesn't work as expected - ip[0] = sain->sin6_addr.s6_addr >> 120; - ip[1] = sain->sin6_addr.s6_addr >> 112; - ip[2] = sain->sin6_addr.s6_addr >> 104; - ip[3] = sain->sin6_addr.s6_addr >> 96; - ip[4] = sain->sin6_addr.s6_addr >> 88; - ip[5] = sain->sin6_addr.s6_addr >> 80; - ip[6] = sain->sin6_addr.s6_addr >> 72; - ip[7] = sain->sin6_addr.s6_addr >> 64; - ip[8] = sain->sin6_addr.s6_addr >> 56; - ip[9] = sain->sin6_addr.s6_addr >> 48; - ip[10] = sain->sin6_addr.s6_addr >> 40; - ip[11] = sain->sin6_addr.s6_addr >> 32; - ip[12] = sain->sin6_addr.s6_addr >> 24; - ip[13] = sain->sin6_addr.s6_addr >> 16; - ip[14] = sain->sin6_addr.s6_addr >> 8; - ip[15] = sain->sin6_addr.s6_addr >> 0; - */ + strcpy(sain6->sin6_addr.s6_addr, (unsigned char *)tmp) ; + */ + + inet_ntop(AF_INET6, &(sain6->sin6_addr), *ip, INET6_ADDRSTRLEN); - default: - return (NULL); } freeaddrinfo(res);