Module Name: src
Committed By: spz
Date: Fri Feb 1 05:40:07 UTC 2013
Modified Files:
src/usr.sbin/npf/npfctl: npf_disassemble.c npfctl.c
Log Message:
IPv6 linklocal address printing cosmetics
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/npf/npfctl/npf_disassemble.c
cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/npf/npfctl/npfctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npfctl/npf_disassemble.c
diff -u src/usr.sbin/npf/npfctl/npf_disassemble.c:1.13 src/usr.sbin/npf/npfctl/npf_disassemble.c:1.14
--- src/usr.sbin/npf/npfctl/npf_disassemble.c:1.13 Mon Dec 10 02:26:04 2012
+++ src/usr.sbin/npf/npfctl/npf_disassemble.c Fri Feb 1 05:40:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_disassemble.c,v 1.13 2012/12/10 02:26:04 rmind Exp $ */
+/* $NetBSD: npf_disassemble.c,v 1.14 2013/02/01 05:40:07 spz Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
* FIXME: config generation should be redesigned..
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: npf_disassemble.c,v 1.13 2012/12/10 02:26:04 rmind Exp $");
+__RCSID("$NetBSD: npf_disassemble.c,v 1.14 2013/02/01 05:40:07 spz Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -213,6 +213,7 @@ npfctl_ncode_operand(nc_inf_t *ni, char
sin6->sin6_len = sizeof(*sin6);
sin6->sin6_family = AF_INET6;
sin6->sin6_port = 0;
+ sin6->sin6_scope_id = 0;
memcpy(&sin6->sin6_addr, ni->ni_pc, sizeof(sin6->sin6_addr));
sockaddr_snprintf(buf, bufsiz, "%a", (struct sockaddr *)sin6);
if (ni) {
Index: src/usr.sbin/npf/npfctl/npfctl.c
diff -u src/usr.sbin/npf/npfctl/npfctl.c:1.27 src/usr.sbin/npf/npfctl/npfctl.c:1.28
--- src/usr.sbin/npf/npfctl/npfctl.c:1.27 Mon Dec 24 19:05:46 2012
+++ src/usr.sbin/npf/npfctl/npfctl.c Fri Feb 1 05:40:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: npfctl.c,v 1.27 2012/12/24 19:05:46 rmind Exp $ */
+/* $NetBSD: npfctl.c,v 1.28 2013/02/01 05:40:07 spz Exp $ */
/*-
* Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: npfctl.c,v 1.27 2012/12/24 19:05:46 rmind Exp $");
+__RCSID("$NetBSD: npfctl.c,v 1.28 2013/02/01 05:40:07 spz Exp $");
#include <sys/ioctl.h>
#include <sys/stat.h>
@@ -236,6 +236,7 @@ npfctl_print_addrmask(int alen, npf_addr
sin6->sin6_len = sizeof(*sin6);
sin6->sin6_family = AF_INET6;
sin6->sin6_port = 0;
+ sin6->sin6_scope_id = 0;
memcpy(&sin6->sin6_addr, addr, sizeof(sin6->sin6_addr));
break;
}
