Attachment 168474 Details for Bug 208196 – moving declaration struct ifaddr "to up"

[patch] moving declaration struct ifaddr "to up"

patch-x-net-if_var.h (text/plain), 3.10 KB, created by onborodin on 2016-03-22 08:02:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: onborodin

Created: 2016-03-22 08:02:40 UTC

Size: 3.10 KB

patch

obsolete

>--- ./net/if_var.h.orig	2016-03-21 05:41:14.000000000 +0200
>+++ ./net/if_var.h	2016-03-22 07:40:10.795021000 +0200
>@@ -313,6 +313,39 @@
> 	 */
> };
> 
>+/*
>+ * The ifaddr structure contains information about one address
>+ * of an interface.  They are maintained by the different address families,
>+ * are allocated and attached when an address is set, and are linked
>+ * together so all addresses for an interface can be located.
>+ *
>+ * NOTE: a 'struct ifaddr' is always at the beginning of a larger
>+ * chunk of malloc'ed memory, where we store the three addresses
>+ * (ifa_addr, ifa_dstaddr and ifa_netmask) referenced here.
>+ */
>+struct ifaddr {
>+	struct	sockaddr *ifa_addr;	/* address of interface */
>+	struct	sockaddr *ifa_dstaddr;	/* other end of p-to-p link */
>+#define	ifa_broadaddr	ifa_dstaddr	/* broadcast address interface */
>+	struct	sockaddr *ifa_netmask;	/* used to determine subnet */
>+	struct	ifnet *ifa_ifp;		/* back-pointer to interface */
>+	struct	carp_softc *ifa_carp;	/* pointer to CARP data */
>+	TAILQ_ENTRY(ifaddr) ifa_link;	/* queue macro glue */
>+	void	(*ifa_rtrequest)	/* check or clean routes (+ or -)'d */
>+		(int, struct rtentry *, struct rt_addrinfo *);
>+	u_short	ifa_flags;		/* mostly rt_flags for cloning */
>+#define	IFA_ROUTE	RTF_UP		/* route installed */
>+#define	IFA_RTSELF	RTF_HOST	/* loopback route to self installed */
>+	u_int	ifa_refcnt;		/* references to this structure */
>+
>+	counter_u64_t	ifa_ipackets;
>+	counter_u64_t	ifa_opackets;	 
>+	counter_u64_t	ifa_ibytes;
>+	counter_u64_t	ifa_obytes;
>+};
>+
>+
>+
> /* for compatibility with other BSDs */
> #define	if_addrlist	if_addrhead
> #define	if_list		if_link
>@@ -418,37 +451,6 @@
> 
> #define	TOEDEV(ifp)	((ifp)->if_llsoftc)
> 
>-/*
>- * The ifaddr structure contains information about one address
>- * of an interface.  They are maintained by the different address families,
>- * are allocated and attached when an address is set, and are linked
>- * together so all addresses for an interface can be located.
>- *
>- * NOTE: a 'struct ifaddr' is always at the beginning of a larger
>- * chunk of malloc'ed memory, where we store the three addresses
>- * (ifa_addr, ifa_dstaddr and ifa_netmask) referenced here.
>- */
>-struct ifaddr {
>-	struct	sockaddr *ifa_addr;	/* address of interface */
>-	struct	sockaddr *ifa_dstaddr;	/* other end of p-to-p link */
>-#define	ifa_broadaddr	ifa_dstaddr	/* broadcast address interface */
>-	struct	sockaddr *ifa_netmask;	/* used to determine subnet */
>-	struct	ifnet *ifa_ifp;		/* back-pointer to interface */
>-	struct	carp_softc *ifa_carp;	/* pointer to CARP data */
>-	TAILQ_ENTRY(ifaddr) ifa_link;	/* queue macro glue */
>-	void	(*ifa_rtrequest)	/* check or clean routes (+ or -)'d */
>-		(int, struct rtentry *, struct rt_addrinfo *);
>-	u_short	ifa_flags;		/* mostly rt_flags for cloning */
>-#define	IFA_ROUTE	RTF_UP		/* route installed */
>-#define	IFA_RTSELF	RTF_HOST	/* loopback route to self installed */
>-	u_int	ifa_refcnt;		/* references to this structure */
>-
>-	counter_u64_t	ifa_ipackets;
>-	counter_u64_t	ifa_opackets;	 
>-	counter_u64_t	ifa_ibytes;
>-	counter_u64_t	ifa_obytes;
>-};
>-
> /* For compatibility with other BSDs. SCTP uses it. */
> #define	ifa_list	ifa_link
>

Actions: View | Diff

Attachments on bug 208196: 168474