Attachment 199883 Details for Bug 232774 – dnsperf fixes for new bind

[patch] dnsperf fixes for new bind

dnsperf-bind912-fixes.patch (text/plain), 5.45 KB, created by Bernhard Froehlich on 2018-12-06 11:15:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernhard Froehlich

Created: 2018-12-06 11:15:56 UTC

Size: 5.45 KB

patch

obsolete

>--- dns/dnsperf/Makefile	2018-11-06 14:24:11.425814000 +0000
>+++ dns/dnsperf/Makefile	2018-11-12 12:13:37.322348000 +0000
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	dnsperf
> PORTVERSION=	2.1.0.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	dns benchmarks net
> MASTER_SITES=	ftp://ftp.nominum.com/pub/nominum/${PORTNAME}/${PORTVERSION}/
> DISTNAME=	${PORTNAME}-src-${PORTVERSION}-1
>--- dns/dnsperf/files/patch-datafile.c	1970-01-01 00:00:00.000000000 +0000
>+++ dns/dnsperf/files/patch-datafile.c	2018-11-12 12:11:45.000000000 +0000
>@@ -0,0 +1,12 @@
>+--- datafile.c.orig	2015-12-16 00:46:49 UTC
>++++ datafile.c
>+@@ -23,7 +23,9 @@
>+ 
>+ #define ISC_BUFFER_USEINLINE
>+ 
>++#include <isc/boolean.h>
>+ #include <isc/buffer.h>
>++#include <isc/int.h>
>+ #include <isc/mem.h>
>+ 
>+ #include "datafile.h"
>--- dns/dnsperf/files/patch-dns.c	1970-01-01 00:00:00.000000000 +0000
>+++ dns/dnsperf/files/patch-dns.c	2018-11-12 12:05:25.000000000 +0000
>@@ -0,0 +1,14 @@
>+--- dns.c.orig	2015-12-16 00:46:50 UTC
>++++ dns.c
>+@@ -41,9 +41,11 @@
>+ #define ISC_BUFFER_USEINLINE
>+ 
>+ #include <isc/base64.h>
>++#include <isc/boolean.h>
>+ #include <isc/buffer.h>
>+ #include <isc/hmacmd5.h>
>+ #include <isc/hmacsha.h>
>++#include <isc/int.h>
>+ #include <isc/lex.h>
>+ #include <isc/mem.h>
>+ #include <isc/region.h>
>--- dns/dnsperf/files/patch-dnsperf.c	1970-01-01 00:00:00.000000000 +0000
>+++ dns/dnsperf/files/patch-dnsperf.c	2018-11-12 12:11:45.000000000 +0000
>@@ -0,0 +1,43 @@
>+--- dnsperf.c.orig	2015-12-16 00:46:49 UTC
>++++ dnsperf.c
>+@@ -52,8 +52,10 @@
>+ 
>+ #define ISC_BUFFER_USEINLINE
>+ 
>++#include <isc/boolean.h>
>+ #include <isc/buffer.h>
>+ #include <isc/file.h>
>++#include <isc/int.h>
>+ #include <isc/list.h>
>+ #include <isc/mem.h>
>+ #include <isc/netaddr.h>
>+@@ -280,16 +282,16 @@ print_statistics(const config_t *config, const times_t
>+ 
>+ 	printf("Statistics:\n\n");
>+ 
>+-	printf("  %s sent:         %" ISC_PRINT_QUADFORMAT "u\n",
>++	printf("  %s sent:         %" PRIu64 "\n",
>+                units, stats->num_sent);
>+-	printf("  %s completed:    %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)\n",
>++	printf("  %s completed:    %" PRIu64 " (%.2lf%%)\n",
>+ 	       units, stats->num_completed,
>+ 	       SAFE_DIV(100.0 * stats->num_completed, stats->num_sent));
>+-	printf("  %s lost:         %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)\n",
>++	printf("  %s lost:         %" PRIu64 " (%.2lf%%)\n",
>+ 	       units, stats->num_timedout,
>+ 	       SAFE_DIV(100.0 * stats->num_timedout, stats->num_sent));
>+ 	if (stats->num_interrupted > 0)
>+-		printf("  %s interrupted:  %" ISC_PRINT_QUADFORMAT "u "
>++		printf("  %s interrupted:  %" PRIu64 " "
>+                        "(%.2lf%%)\n",
>+ 		       units, stats->num_interrupted,
>+ 		       SAFE_DIV(100.0 * stats->num_interrupted,
>+@@ -305,7 +307,7 @@ print_statistics(const config_t *config, const times_t
>+ 			first_rcode = ISC_FALSE;
>+ 		else
>+ 			printf(", ");
>+-		printf("%s %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)",
>++		printf("%s %" PRIu64 " (%.2lf%%)",
>+ 		       perf_dns_rcode_strings[i], stats->rcodecounts[i],
>+ 		       (stats->rcodecounts[i] * 100.0) / stats->num_completed);
>+ 	}
>--- dns/dnsperf/files/patch-log.c	1970-01-01 00:00:00.000000000 +0000
>+++ dns/dnsperf/files/patch-log.c	2018-11-12 12:06:19.000000000 +0000
>@@ -0,0 +1,11 @@
>+--- log.c.orig	2015-12-16 00:46:50 UTC
>++++ log.c
>+@@ -20,6 +20,8 @@
>+ #include <stdio.h>
>+ #include <stdlib.h>
>+ 
>++#include <isc/int.h>
>++
>+ #include "log.h"
>+ #include "util.h"
>+ 
>--- dns/dnsperf/files/patch-opt.c	1970-01-01 00:00:00.000000000 +0000
>+++ dns/dnsperf/files/patch-opt.c	2018-11-12 12:07:23.000000000 +0000
>@@ -0,0 +1,12 @@
>+--- opt.c.orig	2015-12-16 00:46:50 UTC
>++++ opt.c
>+@@ -22,7 +22,9 @@
>+ 
>+ #include <netinet/in.h>
>+ 
>++#include <isc/boolean.h>
>+ #include <isc/file.h>
>++#include <isc/int.h>
>+ #include <isc/parseint.h>
>+ #include <isc/result.h>
>+ 
>--- dns/dnsperf/files/patch-os.c	1970-01-01 00:00:00.000000000 +0000
>+++ dns/dnsperf/files/patch-os.c	2018-11-12 12:08:20.000000000 +0000
>@@ -0,0 +1,11 @@
>+--- os.c.orig	2015-12-16 00:46:49 UTC
>++++ os.c
>+@@ -22,6 +22,8 @@
>+ 
>+ #include <sys/select.h>
>+ 
>++#include <isc/boolean.h>
>++#include <isc/int.h>
>+ #include <isc/result.h>
>+ #include <isc/types.h>
>+ 
>--- dns/dnsperf/files/patch-resperf.c	1970-01-01 00:00:00.000000000 +0000
>+++ dns/dnsperf/files/patch-resperf.c	2018-11-12 12:10:08.000000000 +0000
>@@ -0,0 +1,37 @@
>+--- resperf.c.orig	2015-12-16 00:46:50 UTC
>++++ resperf.c
>+@@ -46,8 +46,10 @@
>+ 
>+ #include <sys/time.h>
>+ 
>++#include <isc/boolean.h>
>+ #include <isc/buffer.h>
>+ #include <isc/file.h>
>++#include <isc/int.h>
>+ #include <isc/list.h>
>+ #include <isc/mem.h>
>+ #include <isc/print.h>
>+@@ -389,11 +391,11 @@ print_statistics(void) {
>+ 
>+ 	printf("\nStatistics:\n\n");
>+ 
>+-	printf("  Queries sent:         %" ISC_PRINT_QUADFORMAT "u\n",
>++	printf("  Queries sent:         %" PRIu64 "\n",
>+                num_queries_sent);
>+-	printf("  Queries completed:    %" ISC_PRINT_QUADFORMAT "u\n",
>++	printf("  Queries completed:    %" PRIu64 "\n",
>+                num_responses_received);
>+-	printf("  Queries lost:         %" ISC_PRINT_QUADFORMAT "u\n",
>++	printf("  Queries lost:         %" PRIu64 "\n",
>+ 	       num_queries_sent - num_responses_received);
>+ 	printf("  Response codes:       ");
>+ 	first_rcode = ISC_TRUE;
>+@@ -404,7 +406,7 @@ print_statistics(void) {
>+ 			first_rcode = ISC_FALSE;
>+ 		else
>+ 			printf(", ");
>+-		printf("%s %" ISC_PRINT_QUADFORMAT "u (%.2lf%%)",
>++		printf("%s %" PRIu64 " (%.2lf%%)",
>+ 		       perf_dns_rcode_strings[i], rcodecounts[i],
>+ 		       (rcodecounts[i] * 100.0) / num_responses_received);
>+ 	}

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 232774: 199883