Module Name: src
Committed By: mrg
Date: Mon Feb 4 10:48:46 UTC 2019
Modified Files:
src/sys/netinet: ip_output.c
src/sys/netinet6: ip6_output.c
Log Message:
rework the #ifdef IPSEC code to not use fallthru.
same number of lines with more local context.
To generate a diff of this commit:
cvs rdiff -u -r1.309 -r1.310 src/sys/netinet/ip_output.c
cvs rdiff -u -r1.216 -r1.217 src/sys/netinet6/ip6_output.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.309 src/sys/netinet/ip_output.c:1.310
--- src/sys/netinet/ip_output.c:1.309 Sat Dec 22 13:11:38 2018
+++ src/sys/netinet/ip_output.c Mon Feb 4 10:48:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_output.c,v 1.309 2018/12/22 13:11:38 maxv Exp $ */
+/* $NetBSD: ip_output.c,v 1.310 2019/02/04 10:48:46 mrg Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.309 2018/12/22 13:11:38 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.310 2019/02/04 10:48:46 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1238,9 +1238,9 @@ ip_ctloutput(int op, struct socket *so,
error = ipsec_set_policy(inp,
sopt->sopt_data, sopt->sopt_size,
curlwp->l_cred);
- break;
- }
- /*FALLTHROUGH*/
+ } else
+ error = ENOPROTOOPT;
+ break;
#endif /* IPSEC */
default:
Index: src/sys/netinet6/ip6_output.c
diff -u src/sys/netinet6/ip6_output.c:1.216 src/sys/netinet6/ip6_output.c:1.217
--- src/sys/netinet6/ip6_output.c:1.216 Sat Dec 22 14:28:57 2018
+++ src/sys/netinet6/ip6_output.c Mon Feb 4 10:48:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_output.c,v 1.216 2018/12/22 14:28:57 maxv Exp $ */
+/* $NetBSD: ip6_output.c,v 1.217 2019/02/04 10:48:46 mrg Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.216 2018/12/22 14:28:57 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.217 2019/02/04 10:48:46 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1702,9 +1702,9 @@ else \
error = ipsec_set_policy(in6p,
sopt->sopt_data, sopt->sopt_size,
kauth_cred_get());
- break;
- }
- /*FALLTHROUGH*/
+ } else
+ error = ENOPROTOOPT;
+ break;
#endif /* IPSEC */
default:
@@ -1910,9 +1910,9 @@ else \
sopt->sopt_size, &m);
if (!error)
error = sockopt_setmbuf(sopt, m);
- break;
- }
- /*FALLTHROUGH*/
+ } else
+ error = ENOPROTOOPT;
+ break;
#endif /* IPSEC */
default:
