Module Name: src
Committed By: ozaki-r
Date: Fri Apr 1 09:16:02 UTC 2016
Modified Files:
src/sys/netinet: ip_icmp.c
src/sys/netinet6: icmp6.c
Log Message:
Remove unnecessary casts and do s/0/NULL/ for rtrequest
To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 src/sys/netinet/ip_icmp.c
cvs rdiff -u -r1.180 -r1.181 src/sys/netinet6/icmp6.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_icmp.c
diff -u src/sys/netinet/ip_icmp.c:1.144 src/sys/netinet/ip_icmp.c:1.145
--- src/sys/netinet/ip_icmp.c:1.144 Thu Jan 21 15:41:30 2016
+++ src/sys/netinet/ip_icmp.c Fri Apr 1 09:16:02 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_icmp.c,v 1.144 2016/01/21 15:41:30 riastradh Exp $ */
+/* $NetBSD: ip_icmp.c,v 1.145 2016/04/01 09:16:02 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -94,7 +94,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.144 2016/01/21 15:41:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.145 2016/04/01 09:16:02 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -1106,8 +1106,7 @@ icmp_mtudisc(struct icmp *icp, struct in
if ((rt->rt_flags & RTF_HOST) == 0) {
struct rtentry *nrt;
- error = rtrequest((int) RTM_ADD, dst,
- (struct sockaddr *) rt->rt_gateway, NULL,
+ error = rtrequest(RTM_ADD, dst, rt->rt_gateway, NULL,
RTF_GATEWAY | RTF_HOST | RTF_DYNAMIC, &nrt);
if (error) {
rtfree(rt);
@@ -1220,8 +1219,8 @@ icmp_mtudisc_timeout(struct rtentry *rt,
if ((rt->rt_flags & (RTF_DYNAMIC | RTF_HOST)) ==
(RTF_DYNAMIC | RTF_HOST)) {
- rtrequest((int) RTM_DELETE, rt_getkey(rt),
- rt->rt_gateway, rt_mask(rt), rt->rt_flags, 0);
+ rtrequest(RTM_DELETE, rt_getkey(rt),
+ rt->rt_gateway, rt_mask(rt), rt->rt_flags, NULL);
} else {
if ((rt->rt_rmx.rmx_locks & RTV_MTU) == 0) {
rt->rt_rmx.rmx_mtu = 0;
@@ -1238,8 +1237,8 @@ icmp_redirect_timeout(struct rtentry *rt
if ((rt->rt_flags & (RTF_DYNAMIC | RTF_HOST)) ==
(RTF_DYNAMIC | RTF_HOST)) {
- rtrequest((int) RTM_DELETE, rt_getkey(rt),
- rt->rt_gateway, rt_mask(rt), rt->rt_flags, 0);
+ rtrequest(RTM_DELETE, rt_getkey(rt),
+ rt->rt_gateway, rt_mask(rt), rt->rt_flags, NULL);
}
}
Index: src/sys/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.180 src/sys/netinet6/icmp6.c:1.181
--- src/sys/netinet6/icmp6.c:1.180 Fri Apr 1 08:12:00 2016
+++ src/sys/netinet6/icmp6.c Fri Apr 1 09:16:02 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.180 2016/04/01 08:12:00 ozaki-r Exp $ */
+/* $NetBSD: icmp6.c,v 1.181 2016/04/01 09:16:02 ozaki-r Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.180 2016/04/01 08:12:00 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.181 2016/04/01 09:16:02 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2682,8 +2682,7 @@ icmp6_mtudisc_clone(struct sockaddr *dst
if ((rt->rt_flags & RTF_HOST) == 0) {
struct rtentry *nrt;
- error = rtrequest((int) RTM_ADD, dst,
- (struct sockaddr *) rt->rt_gateway, NULL,
+ error = rtrequest(RTM_ADD, dst, rt->rt_gateway, NULL,
RTF_GATEWAY | RTF_HOST | RTF_DYNAMIC, &nrt);
if (error) {
rtfree(rt);
@@ -2712,7 +2711,7 @@ icmp6_mtudisc_timeout(struct rtentry *rt
if ((rt->rt_flags & (RTF_DYNAMIC | RTF_HOST)) ==
(RTF_DYNAMIC | RTF_HOST)) {
- rtrequest((int) RTM_DELETE, rt_getkey(rt),
+ rtrequest(RTM_DELETE, rt_getkey(rt),
rt->rt_gateway, rt_mask(rt), rt->rt_flags, NULL);
} else {
if (!(rt->rt_rmx.rmx_locks & RTV_MTU))
@@ -2729,7 +2728,7 @@ icmp6_redirect_timeout(struct rtentry *r
if ((rt->rt_flags & (RTF_GATEWAY | RTF_DYNAMIC | RTF_HOST)) ==
(RTF_GATEWAY | RTF_DYNAMIC | RTF_HOST)) {
- rtrequest((int) RTM_DELETE, rt_getkey(rt),
+ rtrequest(RTM_DELETE, rt_getkey(rt),
rt->rt_gateway, rt_mask(rt), rt->rt_flags, NULL);
}
}
