Attachment 135395 Details for Bug 180259 – flowgrind-0.6.0_2.patch

[patch] flowgrind-0.6.0_2.patch

flowgrind-0.6.0_2.patch (text/plain), 1.92 KB, created by lars on 2013-07-04 15:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lars

Created: 2013-07-04 15:50:00 UTC

Size: 1.92 KB

patch

obsolete

>diff -ruN ../flowgrind.orig/Makefile ./Makefile
>--- ../flowgrind.orig/Makefile	2013-07-04 16:19:31.000000000 +0200
>+++ ./Makefile	2013-07-04 16:21:51.000000000 +0200
>@@ -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 @@
> 
> USE_BZIP2=	yes
> GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--enable-debug
> FETCH_ARGS=	-pRr
> 
> MAN1=		flowgrind-stop.1 \
>diff -ruN ../flowgrind.orig/files/patch-flowgrind ./files/patch-flowgrind
>--- ../flowgrind.orig/files/patch-flowgrind	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/patch-flowgrind	2013-07-04 16:20:29.000000000 +0200
>@@ -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);

Actions: View | Diff

Attachments on bug 180259: 135395