Checkign in new iproute2

[iproute2.git] / ip / ip_common.h

diff --git a/ip/ip_common.h b/ip/ip_common.h
index 1fe4a69..273065f 100644 (file)
--- a/ip/ip_common.h
+++ b/ip/ip_common.h
@@ -1,9 +1,11 @@
-extern int print_linkinfo(const struct sockaddr_nl *who, 
-                         struct nlmsghdr *n, 
+extern int print_linkinfo(const struct sockaddr_nl *who,
+                         struct nlmsghdr *n,
                          void *arg);
 extern int print_addrinfo(const struct sockaddr_nl *who,
-                         struct nlmsghdr *n, 
+                         struct nlmsghdr *n,
                          void *arg);
+extern int print_addrlabel(const struct sockaddr_nl *who,
+                          struct nlmsghdr *n, void *arg);
 extern int print_neigh(const struct sockaddr_nl *who,
                       struct nlmsghdr *n, void *arg);
 extern int print_ntable(const struct sockaddr_nl *who,
@@ -16,20 +18,51 @@ extern void iproute_reset_filter(void);
 extern void ipaddr_reset_filter(int);
 extern void ipneigh_reset_filter(void);
 extern void ipntable_reset_filter(void);
-extern int print_route(const struct sockaddr_nl *who, 
+extern int print_route(const struct sockaddr_nl *who,
                       struct nlmsghdr *n, void *arg);
 extern int print_prefix(const struct sockaddr_nl *who,
                        struct nlmsghdr *n, void *arg);
+extern int print_rule(const struct sockaddr_nl *who,
+                     struct nlmsghdr *n, void *arg);
 extern int do_ipaddr(int argc, char **argv);
+extern int do_ipaddrlabel(int argc, char **argv);
 extern int do_iproute(int argc, char **argv);
 extern int do_iprule(int argc, char **argv);
 extern int do_ipneigh(int argc, char **argv);
 extern int do_ipntable(int argc, char **argv);
 extern int do_iptunnel(int argc, char **argv);
+extern int do_ip6tunnel(int argc, char **argv);
 extern int do_iplink(int argc, char **argv);
 extern int do_ipmonitor(int argc, char **argv);
 extern int do_multiaddr(int argc, char **argv);
 extern int do_multiroute(int argc, char **argv);
 extern int do_xfrm(int argc, char **argv);
 
+static inline int rtm_get_table(struct rtmsg *r, struct rtattr **tb)
+{
+       __u32 table = r->rtm_table;
+       if (tb[RTA_TABLE])
+               table = *(__u32*) RTA_DATA(tb[RTA_TABLE]);
+       return table;
+}
+
 extern struct rtnl_handle rth;
+
+struct link_util
+{
+       struct link_util        *next;
+       const char              *id;
+       int                     maxattr;
+       int                     (*parse_opt)(struct link_util *, int, char **,
+                                            struct nlmsghdr *);
+       void                    (*print_opt)(struct link_util *, FILE *,
+                                            struct rtattr *[]);
+       void                    (*print_xstats)(struct link_util *, FILE *,
+                                            struct rtattr *);
+};
+
+struct link_util *get_link_kind(const char *kind);
+
+#ifndef        INFINITY_LIFE_TIME
+#define     INFINITY_LIFE_TIME      0xFFFFFFFFU
+#endif