d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bracket struct mfc and struct rtdetq with #ifdef _KERNEL.

Browse Source 
Match the bracketing in netstat.
Since the cleanup of MROUTING, ports have broken because they
expect to include <netinet/ip_mroute.h> without including
<sys/queue.h>. Fix breakage at source.

The real fix, of course, is to fix the MROUTING APIs by blowing them
away and replacing them with something else...
This commit is contained in:
Bruce M Simpson 2009-04-21 12:47:09 +00:00
parent 5def3edcad
commit 86979280fc
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=191356
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/netinet/ip_mroute.h
View File

@ -52,7 +52,6 @@
* bandwidth metering and signaling. * bandwidth metering and signaling.
*/ */
/* /*
* Multicast Routing set/getsockopt commands. * Multicast Routing set/getsockopt commands.
*/ */
@ -85,6 +84,7 @@ typedef u_short vifi_t; /* type of a vif index */
#define VIFM_COPY(mfrom, mto) ((mto) = (mfrom)) #define VIFM_COPY(mfrom, mto) ((mto) = (mfrom))
#define VIFM_SAME(m1, m2) ((m1) == (m2)) #define VIFM_SAME(m1, m2) ((m1) == (m2))
struct mfc;
/* /*
* Argument structure for MRT_ADD_VIF. * Argument structure for MRT_ADD_VIF.
@ -265,6 +265,7 @@ struct vif {
struct route v_route; /* cached route */ struct route v_route; /* cached route */
}; };
#ifdef _KERNEL
/* /*
* The kernel's multicast forwarding cache entry structure * The kernel's multicast forwarding cache entry structure
*/ */
@ -285,6 +286,7 @@ struct mfc {
u_long mfc_nstall; /* # of packets awaiting mfc */ u_long mfc_nstall; /* # of packets awaiting mfc */
TAILQ_HEAD(, rtdetq) mfc_stall; /* q of packets awaiting mfc */ TAILQ_HEAD(, rtdetq) mfc_stall; /* q of packets awaiting mfc */
}; };
#endif /* _KERNEL */
/* /*
* Struct used to communicate from kernel to multicast router * Struct used to communicate from kernel to multicast router
@ -304,6 +306,7 @@ struct igmpmsg {
struct in_addr im_src, im_dst; struct in_addr im_src, im_dst;
}; };
#ifdef _KERNEL
/* /*
* Argument structure used for pkt info. while upcall is made * Argument structure used for pkt info. while upcall is made
*/ */
@ -314,6 +317,7 @@ struct rtdetq {
vifi_t xmt_vif; /* Saved copy of imo_multicast_vif */ vifi_t xmt_vif; /* Saved copy of imo_multicast_vif */
}; };
#define MAX_UPQ 4 /* max. no of pkts in upcall Q */ #define MAX_UPQ 4 /* max. no of pkts in upcall Q */
#endif /* _KERNEL */
/* /*
* Structure for measuring the bandwidth and sending an upcall if the * Structure for measuring the bandwidth and sending an upcall if the

3
usr.bin/netstat/mroute.c
View File

@ -59,7 +59,10 @@ __FBSDID("$FreeBSD$");
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/igmp.h> #include <netinet/igmp.h>
#include <net/route.h> #include <net/route.h>
#define _KERNEL 1
#include <netinet/ip_mroute.h> #include <netinet/ip_mroute.h>
#undef _KERNEL
#include <err.h> #include <err.h>
#include <stdint.h> #include <stdint.h>