Module Name: src Committed By: ozaki-r Date: Fri Jun 23 05:46:10 UTC 2017
Modified Files: src/sys/net: if_llatbl.c if_llatbl.h rtsock.c Log Message: Tweak lltable_sysctl_dumparp - Rename lltable_sysctl_dumparp to lltable_sysctl_dump because it's not only for ARP - Enable it not only for INET but also for INET6 To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/net/if_llatbl.c cvs rdiff -u -r1.11 -r1.12 src/sys/net/if_llatbl.h cvs rdiff -u -r1.218 -r1.219 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/if_llatbl.c diff -u src/sys/net/if_llatbl.c:1.19 src/sys/net/if_llatbl.c:1.20 --- src/sys/net/if_llatbl.c:1.19 Thu Jun 22 09:56:48 2017 +++ src/sys/net/if_llatbl.c Fri Jun 23 05:46:10 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: if_llatbl.c,v 1.19 2017/06/22 09:56:48 ozaki-r Exp $ */ +/* $NetBSD: if_llatbl.c,v 1.20 2017/06/23 05:46:10 ozaki-r Exp $ */ /* * Copyright (c) 2004 Luigi Rizzo, Alessandro Cerri. All rights reserved. * Copyright (c) 2004-2008 Qing Li. All rights reserved. @@ -149,7 +149,7 @@ lltable_dump_af(struct lltable *llt, str * Dump arp state for a specific address family. */ int -lltable_sysctl_dumparp(int af, struct rt_walkarg *w) +lltable_sysctl_dump(int af, struct rt_walkarg *w) { struct lltable *llt; int error = 0; Index: src/sys/net/if_llatbl.h diff -u src/sys/net/if_llatbl.h:1.11 src/sys/net/if_llatbl.h:1.12 --- src/sys/net/if_llatbl.h:1.11 Thu Jun 22 09:56:48 2017 +++ src/sys/net/if_llatbl.h Fri Jun 23 05:46:10 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: if_llatbl.h,v 1.11 2017/06/22 09:56:48 ozaki-r Exp $ */ +/* $NetBSD: if_llatbl.h,v 1.12 2017/06/23 05:46:10 ozaki-r Exp $ */ /* * Copyright (c) 2004 Luigi Rizzo, Alessandro Cerri. All rights reserved. * Copyright (c) 2004-2008 Qing Li. All rights reserved. @@ -258,7 +258,7 @@ void lltable_prefix_free(const int, con const struct sockaddr *, const u_int); void lltable_drain(int); void lltable_purge_entries(struct lltable *); -int lltable_sysctl_dumparp(int, struct rt_walkarg *); +int lltable_sysctl_dump(int, struct rt_walkarg *); int lltable_dump_entry(struct lltable *, struct llentry *, struct rt_walkarg *, struct sockaddr *); Index: src/sys/net/rtsock.c diff -u src/sys/net/rtsock.c:1.218 src/sys/net/rtsock.c:1.219 --- src/sys/net/rtsock.c:1.218 Fri Jun 23 04:27:55 2017 +++ src/sys/net/rtsock.c Fri Jun 23 05:46:10 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: rtsock.c,v 1.218 2017/06/23 04:27:55 ozaki-r Exp $ */ +/* $NetBSD: rtsock.c,v 1.219 2017/06/23 05:46:10 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.218 2017/06/23 04:27:55 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.219 2017/06/23 05:46:10 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1916,7 +1916,7 @@ again: case NET_RT_DUMP: case NET_RT_FLAGS: -#ifdef INET +#if defined(INET) || defined(INET6) /* * take care of llinfo entries, the caller must * specify an AF @@ -1924,12 +1924,12 @@ again: if (w.w_op == NET_RT_FLAGS && (w.w_arg == 0 || w.w_arg & RTF_LLDATA)) { if (af != 0) - error = lltable_sysctl_dumparp(af, &w); + error = lltable_sysctl_dump(af, &w); else error = EINVAL; break; } -#endif /* INET */ +#endif for (i = 1; i <= AF_MAX; i++) if ((af == 0 || af == i) &&