This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [NETLINK]: Restore API compatibility of address and neighbour bits


Hi Thomas,

Am Donnerstag, 7. Dezember 2006 11:55 schrieb Thomas Graf:

> --- net-2.6.orig/include/linux/rtnetlink.h	2006-12-07 11:25:29.000000000
> +0100 +++ net-2.6/include/linux/rtnetlink.h	2006-12-07 11:32:25.000000000
> +0100 @@ -3,6 +3,8 @@
>
>  #include <linux/netlink.h>
>  #include <linux/if_link.h>
> +#include <linux/if_addr.h>
> +#include <linux/neighbour.h>
>
>  /****
>   *		Routing/neighbour discovery messages.

The _RTA and _PAYLOAD-macros are also part of userspace headers and need to be
restored. Both dhcpclient and quagga need at least IFA_RTA and IFLA_RTA to
compile, but there may be more macros than in the following patch. You may want
to look at keepalived, iproute, ...

Stefan

--- linux-2.6.19/include/linux/if_addr.h.orig	2006-12-08 14:08:29.000000000 +0100
+++ linux-2.6.19/include/linux/if_addr.h	2006-12-08 15:16:59.000000000 +0100
@@ -52,4 +52,12 @@
 	__u32	tstamp; /* updated timestamp, hundredths of seconds */
 };
 
+#ifndef __KERNEL__
+
+/* Userspace header compatibility */
+#define IFA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
+#define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg))
+
+#endif
+
 #endif
--- linux-2.6.19/include/linux/if_link.h.orig	2006-12-08 14:08:29.000000000 +0100
+++ linux-2.6.19/include/linux/if_link.h	2006-12-08 15:16:47.000000000 +0100
@@ -133,4 +133,12 @@
 	__u32	retrans_time;
 };
 
+#ifndef __KERNEL__
+
+/* Userspace header compatibility */
+#define IFLA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
+#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg))
+
+#endif
+
 #endif /* _LINUX_IF_LINK_H */



Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]