Attachment 144385 Details for Bug 190964 – IP Filter userland diff

[patch] IP Filter userland diff

ipfilter-userland.diff (text/plain), 1.91 KB, created by Cy Schubert on 2014-07-04 00:38:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2014-07-04 00:38:00 UTC

Size: 1.91 KB

patch

obsolete

>Index: contrib/ipfilter/lib/printhost.c
>===================================================================
>--- contrib/ipfilter/lib/printhost.c	(revision 268203)
>+++ contrib/ipfilter/lib/printhost.c	(working copy)
>@@ -23,9 +23,9 @@
> 	if ((family == -1) || !*addr)
> 		PRINTF("any");
> 	else {
>+#ifdef  USE_INET6
> 		void *ptr = addr;
> 
>-#ifdef  USE_INET6
> 		PRINTF("%s", inet_ntop(family, ptr, ipbuf, sizeof(ipbuf)));
> #else
> 		ipa.s_addr = *addr;
>Index: contrib/ipfilter/lib/printhostmask.c
>===================================================================
>--- contrib/ipfilter/lib/printhostmask.c	(revision 268203)
>+++ contrib/ipfilter/lib/printhostmask.c	(working copy)
>@@ -25,9 +25,9 @@
> 	if ((family == -1) || ((!addr || !*addr) && (!mask || !*mask)))
> 		PRINTF("any");
> 	else {
>+#ifdef  USE_INET6
> 		void *ptr = addr;
> 
>-#ifdef  USE_INET6
> 		PRINTF("%s", inet_ntop(family, ptr, ipbuf, sizeof(ipbuf)));
> #else
> 		ipa.s_addr = *addr;
>Index: contrib/ipfilter/lib/save_v1trap.c
>===================================================================
>--- contrib/ipfilter/lib/save_v1trap.c	(revision 268203)
>+++ contrib/ipfilter/lib/save_v1trap.c	(working copy)
>@@ -178,7 +178,7 @@
> 		if (ctx->fd >= 0) {
> 			ctx->sin.sin_family = AF_INET;
> 			ctx->sin.sin_port = htons(162);
>-			if (connect(ctx->fd, &ctx->sin,
>+			if (connect(ctx->fd, (struct sockaddr *)&ctx->sin,
> 				    sizeof(ctx->sin)) != 0) {
> 					snmpv1_destroy(ctx);
> 					return NULL;
>Index: contrib/ipfilter/lib/save_v2trap.c
>===================================================================
>--- contrib/ipfilter/lib/save_v2trap.c	(revision 268203)
>+++ contrib/ipfilter/lib/save_v2trap.c	(working copy)
>@@ -181,7 +181,7 @@
> 		if (ctx->fd >= 0) {
> 			ctx->sin.sin_family = AF_INET;
> 			ctx->sin.sin_port = htons(162);
>-			if (connect(ctx->fd, &ctx->sin,
>+			if (connect(ctx->fd, (struct sockaddr *)&ctx->sin,
> 				    sizeof(ctx->sin)) != 0) {
> 					snmpv2_destroy(ctx);
> 					return NULL;

Actions: View | Diff

Attachments on bug 190964: 144231 | 144248 | 144348 | 144349 | 144370 | 144372 | 144378 | 144384 | 144385