From owner-svn-soc-all@FreeBSD.ORG Tue Jul 29 17:17:59 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 56FE4B53 for ; Tue, 29 Jul 2014 17:17:59 +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 28FE82A3E for ; Tue, 29 Jul 2014 17:17:59 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6THHxYG078524 for ; Tue, 29 Jul 2014 17:17:59 GMT (envelope-from shonali@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s6THHwB8078521 for svn-soc-all@FreeBSD.org; Tue, 29 Jul 2014 17:17:58 GMT (envelope-from shonali@FreeBSD.org) Date: Tue, 29 Jul 2014 17:17:58 GMT Message-Id: <201407291717.s6THHwB8078521@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: r271540 - soc2014/shonali/head/usr.sbin/bsnmpd/tools/bsnmptools 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, 29 Jul 2014 17:17:59 -0000 Author: shonali Date: Tue Jul 29 17:17:58 2014 New Revision: 271540 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271540 Log: Added code to support ipv6 in bsnmpget.c. Modified: soc2014/shonali/head/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c Modified: soc2014/shonali/head/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c ============================================================================== --- soc2014/shonali/head/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c Tue Jul 29 17:14:13 2014 (r271539) +++ soc2014/shonali/head/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c Tue Jul 29 17:17:58 2014 (r271540) @@ -608,16 +608,33 @@ char *endptr, *str; str = val; - for (i = 0; i < 4; i++) { - v = strtoul(str, &endptr, 10); - if (v > 0xff) - return (-1); - if (*endptr != '.' && *endptr != '\0' && i != 3) - break; - str = endptr + 1; - value->v.ipaddress[i] = (uint8_t) v; - } + + switch (sizeof(*addrs)) { + case 4: + for (i = 0; i < 4; i++) { + v = strtoul(str, &endptr, 10); + if (v > 0xff) + return (-1); + if (*endptr != '.' && *endptr != '\0' && i != 3) + break; + str = endptr + 1; + value->v.ipaddress[i] = (uint8_t) v; + } + case 16: + for (i = 0; i < 16; i++) { + v = strtoul(str, &endptr, 16); + if (v > 0xff) + return (-1); + if (*endptr != ':' && *endptr != '\0' && i != 15) + break; + str = endptr + 1; + value->v.ipaddress[i] = (uint8_t) v; + } + + default: + return (NULL); + } value->syntax = SNMP_SYNTAX_IPADDRESS; return (0); } @@ -946,9 +963,18 @@ int8_t i; dst->syntax = SNMP_SYNTAX_IPADDRESS; - for (i = 0; i < 4; i++) - dst->v.ipaddress[i] = src->v.ipaddress[i]; + + switch (sizeof(src->v.ipaddress)) { + case 4: + for (i = 0; i < 4; i++) + dst->v.ipaddress[i] = src->v.ipaddress[i]; + case 16: + for (i = 0; i < 16; i++) + dst->v.ipaddress[i] = src->v.ipaddress[i]; + default: + return (NULL); + } return (1); }