Fix IPv6 address parsing. (Patch from upstream.) Also enable debugging by default. Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: suffix)
Responsible Changed From-To: freebsd-ports-bugs->wg I'll take it.
State Changed From-To: open->closed Committed. Thanks!
Author: wg Date: Fri Jul 5 11:53:08 2013 New Revision: 322318 URL: http://svnweb.freebsd.org/changeset/ports/322318 Log: benchmarks/flowgrind: fix IPv6 address parsing - Fix IPv6 address parsing (upstream) - Enable debug by default PR: ports/180259 Submitted by: Lars Eggert <lars@eggert.org> (maintainer) Added: head/benchmarks/flowgrind/files/patch-flowgrind (contents, props changed) Modified: head/benchmarks/flowgrind/Makefile Modified: head/benchmarks/flowgrind/Makefile ============================================================================== --- head/benchmarks/flowgrind/Makefile Fri Jul 5 11:39:48 2013 (r322317) +++ head/benchmarks/flowgrind/Makefile Fri Jul 5 11:53:08 2013 (r322318) @@ -3,7 +3,7 @@ PORTNAME= flowgrind PORTVERSION= 0.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= benchmarks MASTER_SITES= https://launchpad.net/flowgrind/trunk/${PORTNAME}-0.6/+download/ @@ -16,6 +16,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libpcap. USE_BZIP2= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-debug FETCH_ARGS= -pRr MAN1= flowgrind-stop.1 \ Added: head/benchmarks/flowgrind/files/patch-flowgrind ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/benchmarks/flowgrind/files/patch-flowgrind Fri Jul 5 11:53:08 2013 (r322318) @@ -0,0 +1,29 @@ +--- src/flowgrind.c ++++ src/flowgrind.c +@@ -1872,7 +1872,7 @@ static void parse_flow_option(int ch, char* optarg, int current_flow_ids[]) { + + if (extra_rpc) { + /* Now it's getting tricky... */ +- /* 1st case: IPv6 with port, e.g. "[a:b::c]a:5999" */ ++ /* 1st case: IPv6 with port, e.g. "[a:b::c]:5999" */ + if ((sepptr = strchr(rpc_address, ']'))) { + is_ipv6 = 1; + *sepptr = '\0'; +@@ -1884,7 +1884,7 @@ static void parse_flow_option(int ch, char* optarg, int current_flow_ids[]) { + port = atoi(sepptr); + } else if ((sepptr = strchr(rpc_address, ':'))) { + /* 2nd case: IPv6 without port, e.g. "a:b::c" */ +- if (strchr(sepptr, ':')) { ++ if (strchr(sepptr+1, ':')) { + is_ipv6 = 1; + } else { + /* 3rd case: IPv4 or name with port 1.2.3.4:5999*/ +@@ -1910,7 +1910,7 @@ static void parse_flow_option(int ch, char* optarg, int current_flow_ids[]) { + fprintf(stderr, "No test host given in argument\n"); + usage(); + } +- if (is_ipv6) ++ if (is_ipv6) + sprintf(url, "http://[%s]:%d/RPC2", rpc_address, port); + else + sprintf(url, "http://%s:%d/RPC2", rpc_address, port); _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"