Module Name: src
Committed By: ozaki-r
Date: Wed Mar 22 07:14:18 UTC 2017
Modified Files:
src/sys/net: route.c rtsock.c
Log Message:
Tweak and KNF some functions
To generate a diff of this commit:
cvs rdiff -u -r1.192 -r1.193 src/sys/net/route.c
cvs rdiff -u -r1.209 -r1.210 src/sys/net/rtsock.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/net/route.c
diff -u src/sys/net/route.c:1.192 src/sys/net/route.c:1.193
--- src/sys/net/route.c:1.192 Mon Feb 20 04:23:11 2017
+++ src/sys/net/route.c Wed Mar 22 07:14:18 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.192 2017/02/20 04:23:11 ozaki-r Exp $ */
+/* $NetBSD: route.c,v 1.193 2017/03/22 07:14:18 ozaki-r Exp $ */
/*-
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.192 2017/02/20 04:23:11 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.193 2017/03/22 07:14:18 ozaki-r Exp $");
#include <sys/param.h>
#ifdef RTFLUSH_DEBUG
@@ -1186,7 +1186,7 @@ rtrequest1(int req, struct rt_addrinfo *
int error = 0, rc;
struct rtentry *rt;
rtbl_t *rtbl;
- struct ifaddr *ifa = NULL, *ifa2 = NULL;
+ struct ifaddr *ifa = NULL;
struct sockaddr_storage maskeddst;
const struct sockaddr *dst = info->rti_info[RTAX_DST];
const struct sockaddr *gateway = info->rti_info[RTAX_GATEWAY];
@@ -1292,6 +1292,7 @@ rtrequest1(int req, struct rt_addrinfo *
ss = pserialize_read_enter();
if (info->rti_info[RTAX_IFP] != NULL) {
+ struct ifaddr *ifa2;
ifa2 = ifa_ifwithnet(info->rti_info[RTAX_IFP]);
if (ifa2 != NULL)
rt->rt_ifp = ifa2->ifa_ifp;
Index: src/sys/net/rtsock.c
diff -u src/sys/net/rtsock.c:1.209 src/sys/net/rtsock.c:1.210
--- src/sys/net/rtsock.c:1.209 Fri Mar 17 10:05:02 2017
+++ src/sys/net/rtsock.c Wed Mar 22 07:14:18 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock.c,v 1.209 2017/03/17 10:05:02 ozaki-r Exp $ */
+/* $NetBSD: rtsock.c,v 1.210 2017/03/22 07:14:18 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.209 2017/03/17 10:05:02 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.210 2017/03/22 07:14:18 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -604,7 +604,7 @@ route_output_change(struct rtentry *rt,
struct psref psref_ifa, psref_new_ifa, psref_ifp;
/*
- * new gateway could require new ifaddr, ifp;
+ * New gateway could require new ifaddr, ifp;
* flags may also be different; ifp may be specified
* by ll sockaddr when protocol address is ambiguous
*/
@@ -627,9 +627,11 @@ route_output_change(struct rtentry *rt,
goto out;
}
}
- /* new gateway could require new ifaddr, ifp;
- flags may also be different; ifp may be specified
- by ll sockaddr when protocol address is ambiguous */
+ /*
+ * New gateway could require new ifaddr, ifp;
+ * flags may also be different; ifp may be specified
+ * by ll sockaddr when protocol address is ambiguous
+ */
new_ifa = route_output_get_ifa(*info, rt, &new_ifp, &psref_new_ifa);
if (new_ifa != NULL) {
ifa_release(ifa, &psref_ifa);
@@ -648,13 +650,13 @@ route_output_change(struct rtentry *rt,
ifa_release(ifa, &psref_ifa);
}
ifa_release(new_ifa, &psref_new_ifa);
- if (new_ifp && rt->rt_ifp != new_ifp
- && !if_is_deactivated(new_ifp))
+ if (new_ifp && rt->rt_ifp != new_ifp && !if_is_deactivated(new_ifp))
rt->rt_ifp = new_ifp;
rt_setmetrics(rtm->rtm_inits, rtm, rt);
- if (rt->rt_flags != info->rti_flags)
- rt->rt_flags = (info->rti_flags & ~PRESERVED_RTF)
- | (rt->rt_flags & PRESERVED_RTF);
+ if (rt->rt_flags != info->rti_flags) {
+ rt->rt_flags = (info->rti_flags & ~PRESERVED_RTF) |
+ (rt->rt_flags & PRESERVED_RTF);
+ }
if (rt->rt_ifa && rt->rt_ifa->ifa_rtrequest)
rt->rt_ifa->ifa_rtrequest(RTM_ADD, rt, info);
out:
