patch-2.3.39 linux/include/net/dn_fib.h

Next file: linux/include/net/dn_nsp.h
Previous file: linux/include/net/dn_dev.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.38/linux/include/net/dn_fib.h linux/include/net/dn_fib.h
@@ -5,81 +5,203 @@
 
 #ifdef CONFIG_DECNET_ROUTER
 
+#include <linux/rtnetlink.h>
+
+struct dn_kern_rta
+{
+        void            *rta_dst;
+        void            *rta_src;
+        int             *rta_iif;
+        int             *rta_oif;
+        void            *rta_gw;
+        u32             *rta_priority;
+        void            *rta_prefsrc;
+        struct rtattr   *rta_mx;
+        struct rtattr   *rta_mp;
+        unsigned char   *rta_protoinfo;
+        unsigned char   *rta_flow;
+        struct rta_cacheinfo *rta_ci;
+};
+
+struct dn_fib_key {
+	dn_address src;
+	dn_address dst;
+	int iif;
+	int oif;
+	u32 fwmark;
+	unsigned char scope;
+};
 
 struct dn_fib_res {
-	dn_address res_addr;
-	dn_address res_mask;
-	int res_ifindex;
-	int res_proto;
-	int res_cost;
-	int res_type;
-	struct dn_fib_node *res_fn;
-	struct dn_fib_action *res_fa;
-};
-
-struct dn_fib_action {
-	struct dn_fib_action *fa_next;
-	dn_address fa_key;
-	dn_address fa_mask;
-	int fa_ifindex;
-	int fa_proto;
-	int fa_cost;
-	int fa_type;
-	union {
-		struct neighbour *fau_neigh;	/* Normal route */
-		int fau_error;			/* Reject       */
-		int fau_table;			/* Throw        */
-	} fa_u;
-#define fa_neigh fa_u.fau_neigh
-#define fa_error fa_u.fau_error
-#define fa_table fa_u.fau_table
+	struct dn_fib_rule *r;
+	struct dn_fib_info *fi;
+	unsigned char prefixlen;
+	unsigned char nh_sel;
+	unsigned char type;
+	unsigned char scope;
 };
 
-struct dn_fib_node {
-	struct dn_fib_node *fn_up;
-	dn_address fn_cmpmask;
-	dn_address fn_key;
-	int fn_shift;
-	struct dn_fib_action *fn_action;
-	struct dn_fib_node *fn_children[2];
+struct dn_fib_nh {
+	struct net_device	*nh_dev;
+	unsigned		nh_flags;
+	unsigned char		nh_scope;
+	int			nh_weight;
+	int			nh_power;
+	int			nh_oif;
+	u32			nh_gw;
+};
+
+struct dn_fib_info {
+	struct dn_fib_info	*fib_next;
+	struct dn_fib_info	*fib_prev;
+	int 			fib_treeref;
+	atomic_t		fib_clntref;
+	int			fib_dead;
+	unsigned		fib_flags;
+	int			fib_protocol;
+	dn_address		fib_prefsrc;
+	u32			fib_priority;
+	int			fib_nhs;
+	int			fib_power;
+	struct dn_fib_nh	fib_nh[0];
+#define fib_dev		fib_nh[0].nh_dev
 };
 
-#define DN_FIB_NEXT(fibnode, key) ((fibnode)->fn_children[((key) ^ (fibnode)->fn_cmpmask) >> (fibnode)->fn_shift]) 
 
-struct dn_fib_walker_t;
+#define DN_FIB_RES_NH(res)	((res).fi->fib_nh[(res).nh_sel])
+#define DN_FIB_RES_RESET(res)	((res).nh_sel = 0)
+#define DN_FIB_RES_GW(res)	(DN_FIB_RES_NH(res).nh_gw)
+#define DN_FIB_RES_DEV(res)	(DN_FIB_RES_NH(res).nh_dev)
+#define DN_FIB_RES_OIF(res)	(DN_FIB_RES_NH(res).nh_oif)
+
+typedef struct {
+	u16	datum;
+} dn_fib_key_t;
+
+typedef struct {
+	u16	datum;
+} dn_fib_hash_t;
+
+typedef struct {
+	u16	datum;
+} dn_fib_idx_t;
+
+struct dn_fib_node {
+	struct dn_fib_node *fn_next;
+	struct dn_fib_info *fn_info;
+#define DN_FIB_INFO(f) ((f)->fn_info)
+	dn_fib_key_t	fn_key;
+	u8		fn_type;
+	u8		fn_scope;
+	u8		fn_state;
+};
+
 
 struct dn_fib_table {
 	int n;
-	unsigned long count;
-	struct dn_fib_node *root;
 
-	int (*insert)(struct dn_fib_table *t, struct dn_fib_action *fa);
-	int (*delete)(struct dn_fib_table *t, struct dn_fib_action *fa);
-	int (*lookup)(struct dn_fib_table *t, struct dn_fib_res *res);
-	int (*walk)(struct dn_fib_walker_t *fwt);
+	int (*insert)(struct dn_fib_table *t, struct rtmsg *r, 
+			struct dn_kern_rta *rta, struct nlmsghdr *n, 
+			struct netlink_skb_parms *req);
+	int (*delete)(struct dn_fib_table *t, struct rtmsg *r,
+			struct dn_kern_rta *rta, struct nlmsghdr *n,
+			struct netlink_skb_parms *req);
+	int (*lookup)(struct dn_fib_table *t, const struct dn_fib_key *key, 
+			struct dn_fib_res *res);
+	int (*flush)(struct dn_fib_table *t);
+#ifdef CONFIG_PROC_FS
+	int (*get_info)(struct dn_fib_table *table, char *buf,
+			int first, int count);
+#endif /* CONFIG_PROC_FS */
 #ifdef CONFIG_RTNETLINK
 	int (*dump)(struct dn_fib_table *t, struct sk_buff *skb, struct netlink_callback *cb);
 #endif /* CONFIG_RTNETLINK */
-};
 
-struct dn_fib_walker_t {
-	struct dn_fib_table *table;
-	void *arg;
-	int (*fxn)(struct dn_fib_walker_t *fwt, struct dn_fib_node *n);
+	unsigned char data[0];
 };
 
+
+/*
+ * dn_fib.c
+ */
 extern void dn_fib_init(void);
 extern void dn_fib_cleanup(void);
 
 extern int dn_fib_rt_message(struct sk_buff *skb);
-extern int dn_fib_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
-extern int dn_fib_resolve(struct dn_fib_res *res);
-
+extern int dn_fib_ioctl(struct socket *sock, unsigned int cmd, 
+			unsigned long arg);
+extern struct dn_fib_info *dn_fib_create_info(const struct rtmsg *r, 
+				struct dn_kern_rta *rta, 
+				const struct nlmsghdr *nlh, int *errp);
+extern int dn_fib_semantic_match(int type, struct dn_fib_info *fi, 
+			const struct dn_fib_key *key, struct dn_fib_res *res);
+extern void dn_fib_release_info(struct dn_fib_info *fi);
+extern u16 dn_fib_get_attr16(struct rtattr *attr, int attrlen, int type);
+extern void dn_fib_flush(void);
+extern void dn_fib_select_multipath(const struct dn_fib_key *key, 
+					struct dn_fib_res *res);
+extern int dn_fib_sync_down(dn_address local, struct net_device *dev, 
+				int force);
+extern int dn_fib_sync_up(struct net_device *dev);
+
+/*
+ * dn_tables.c
+ */
+extern struct dn_fib_table *dn_fib_get_table(int n, int creat);
+extern struct dn_fib_table *dn_fib_empty_table(void);
+extern void dn_fib_table_init(void);
+extern void dn_fib_table_cleanup(void);
+
+/*
+ * dn_rules.c
+ */
+extern void dn_fib_rules_init(void);
+extern void dn_fib_rules_cleanup(void);
+extern void dn_fib_rule_put(struct dn_fib_rule *);
+extern int dn_fib_lookup(struct dn_fib_key *key, struct dn_fib_res *res);
+
+/*
+ * rtnetlink interface
+ */
 #ifdef CONFIG_RTNETLINK
 extern int dn_fib_rtm_delroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg);
 extern int dn_fib_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg);
 extern int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb);
+
+extern int dn_fib_rtm_delrule(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg);
+extern int dn_fib_rtm_newrule(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg);
+extern int dn_fib_dump_rules(struct sk_buff *skb, struct netlink_callback *cb);
 #endif /* CONFIG_RTNETLINK */
+
+#define DN_NUM_TABLES 255
+#define DN_MIN_TABLE 1
+#define DN_DEFAULT_TABLE 1
+#define DN_L1_TABLE 1
+#define DN_L2_TABLE 2
+
+extern void dn_fib_free_info(struct dn_fib_info *fi);
+
+static __inline__ void dn_fib_info_put(struct dn_fib_info *fi)
+{
+	if (atomic_dec_and_test(&fi->fib_clntref))
+		dn_fib_free_info(fi);
+}
+
+static __inline__ void dn_fib_res_put(struct dn_fib_res *res)
+{
+	if (res->fi)
+		dn_fib_info_put(res->fi);
+	if (res->r)
+		dn_fib_rule_put(res->r);
+}
+
+static __inline__ u16 dnet_make_mask(int n)
+{
+        if (n)
+                return htons(~((1<<(16-n))-1));
+        return 0;
+}
+
 #endif /* CONFIG_DECNET_ROUTER */
 
 #endif /* _NET_DN_FIB_H */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)