- make the first arg of the filter function passed to rtnl_dump_filter constant

  to match normal iproute. No obj-code changes.

diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index faa3f2d06b92360d3adee0ed3296fc5ccd7e6c6e..7a948a19d043c7f012a224ce2a5145358fc94557 100644 (file)
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -196,7 +196,7 @@ static int flush_update(void)
        return 0;
 }
 
-static int print_addrinfo(struct sockaddr_nl *who ATTRIBUTE_UNUSED,
+static int print_addrinfo(const struct sockaddr_nl *who ATTRIBUTE_UNUSED,
                struct nlmsghdr *n, void *arg ATTRIBUTE_UNUSED)
 {
        struct ifaddrmsg *ifa = NLMSG_DATA(n);
@@ -380,7 +380,7 @@ static int print_selected_addrinfo(int ifindex, struct nlmsg_list *ainfo)
 }
 
 
-static int store_nlmsg(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
+static int store_nlmsg(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 {
        struct nlmsg_list **linfo = (struct nlmsg_list**)arg;
        struct nlmsg_list *h;

diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index 59cbf80736748492b0e5cd558438cf24a74968cb..6977a0956e8f59a800fd6dc35d198897d380ce23 100644 (file)
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -78,7 +78,7 @@ static unsigned get_hz(void)
        return hz_internal;
 }
 
-static int print_route(struct sockaddr_nl *who ATTRIBUTE_UNUSED,
+static int print_route(const struct sockaddr_nl *who ATTRIBUTE_UNUSED,
                struct nlmsghdr *n, void *arg)
 {
        FILE *fp = (FILE*)arg;

diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c
index f62429a7ca410e38a49ad70f754f829b2de8693d..2ee7701f83619418d0e84813f440fd5fb87ae665 100644 (file)
--- a/networking/libiproute/iprule.c
+++ b/networking/libiproute/iprule.c
@@ -40,7 +40,7 @@ static void usage(void)
 }
 */
 
-static int print_rule(struct sockaddr_nl *who ATTRIBUTE_UNUSED,
+static int print_rule(const struct sockaddr_nl *who ATTRIBUTE_UNUSED,
                                        struct nlmsghdr *n, void *arg ATTRIBUTE_UNUSED)
 {
        struct rtmsg *r = NLMSG_DATA(n);

diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c
index 47a055ac0008d7d789fe25fb8061e1af9a4a635b..4511d36fab5d3dcd2006729da1ea86f639f8bcd7 100644 (file)
--- a/networking/libiproute/libnetlink.c
+++ b/networking/libiproute/libnetlink.c
@@ -103,7 +103,7 @@ int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len)
 }
 
 static int rtnl_dump_filter(struct rtnl_handle *rth,
-               int (*filter)(struct sockaddr_nl *, struct nlmsghdr *n, void *),
+               int (*filter)(const struct sockaddr_nl *, struct nlmsghdr *n, void *),
                void *arg1/*,
                int (*junk)(struct sockaddr_nl *, struct nlmsghdr *n, void *),
                void *arg2*/)
@@ -195,7 +195,7 @@ static int rtnl_dump_filter(struct rtnl_handle *rth,
 }
 
 int xrtnl_dump_filter(struct rtnl_handle *rth,
-               int (*filter)(struct sockaddr_nl *, struct nlmsghdr *n, void *),
+               int (*filter)(const struct sockaddr_nl *, struct nlmsghdr *, void *),
                void *arg1)
 {
        int ret = rtnl_dump_filter(rth, filter, arg1/*, NULL, NULL*/);
@@ -207,7 +207,7 @@ int xrtnl_dump_filter(struct rtnl_handle *rth,
 int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
              pid_t peer, unsigned groups,
              struct nlmsghdr *answer,
-             int (*junk)(struct sockaddr_nl *, struct nlmsghdr *n, void *),
+             int (*junk)(struct sockaddr_nl *, struct nlmsghdr *, void *),
              void *jarg)
 {
 /* bbox doesn't use parameters no. 3, 4, 6, 7, they are stubbed out */

diff --git a/networking/libiproute/libnetlink.h b/networking/libiproute/libnetlink.h
index 7507c52e71d575844139455a2056987f9fba8128..6c1a881297ab8c8e8eb074570ae92a5aab38cae4 100644 (file)
--- a/networking/libiproute/libnetlink.h
+++ b/networking/libiproute/libnetlink.h
@@ -27,7 +27,7 @@ extern void rtnl_close(struct rtnl_handle *rth);
 extern int xrtnl_wilddump_request(struct rtnl_handle *rth, int fam, int type);
 extern int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len);
 extern int xrtnl_dump_filter(struct rtnl_handle *rth,
-                       int (*filter)(struct sockaddr_nl*, struct nlmsghdr *n, void*),
+                       int (*filter)(const struct sockaddr_nl*, struct nlmsghdr *n, void*),
                        void *arg1);
 
 /* bbox doesn't use parameters no. 3, 4, 6, 7, stub them out */

diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c
index 031b29a60d54e12b1c66d2e8d77728fe6a49fec1..f9b697070b0f1c58cf89798e3b56aa96f61ddb57 100644 (file)
--- a/networking/libiproute/ll_map.c
+++ b/networking/libiproute/ll_map.c
@@ -39,7 +39,7 @@ static struct idxmap *find_by_index(int idx)
        return NULL;
 }
 
-int ll_remember_index(struct sockaddr_nl *who ATTRIBUTE_UNUSED,
+int ll_remember_index(const struct sockaddr_nl *who ATTRIBUTE_UNUSED,
                struct nlmsghdr *n,
                void *arg ATTRIBUTE_UNUSED)
 {

diff --git a/networking/libiproute/ll_map.h b/networking/libiproute/ll_map.h
index c4257894c91830b89a13714584316e5e6bd94c62..6d64ac15a62c1edb82b207e680f734fc7029813a 100644 (file)
--- a/networking/libiproute/ll_map.h
+++ b/networking/libiproute/ll_map.h
@@ -6,7 +6,7 @@
 # pragma GCC visibility push(hidden)
 #endif
 
-int ll_remember_index(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg);
+int ll_remember_index(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg);
 int ll_init_map(struct rtnl_handle *rth);
 int xll_name_to_index(const char *const name);
 const char *ll_index_to_name(int idx);