X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Ftunnel.h;h=8d20c77b94a0bd35ea8545eb8ebcb60669f7b7bc;hb=b1184a78452e7160db81e379783cd18937866382;hp=b488e467f688a0e5098b772cc2d562a4331ca6e6;hpb=df2c07f4338faac04f4969f243fe4e8083b309ac;p=openvswitch

diff --git a/datapath/tunnel.h b/datapath/tunnel.h
index b488e467..8d20c77b 100644
--- a/datapath/tunnel.h
+++ b/datapath/tunnel.h
@@ -13,7 +13,6 @@
 
 #include "flow.h"
 #include "openvswitch/tunnel.h"
-#include "table.h"
 #include "vport.h"
 
 /*
@@ -34,7 +33,6 @@
 /* These flags are only needed when calling tnl_find_port(). */
 #define TNL_T_KEY_EXACT		(1 << 10)
 #define TNL_T_KEY_MATCH		(1 << 11)
-#define TNL_T_KEY_EITHER	(TNL_T_KEY_EXACT | TNL_T_KEY_MATCH)
 
 /* Private flags not exposed to userspace in this form. */
 #define TNL_F_IN_KEY_MATCH      (1 << 16) /* Store the key in tun_id to match in flow table. */
@@ -45,38 +43,50 @@
 		      TNL_F_DF_INHERIT | TNL_F_DF_DEFAULT | TNL_F_PMTUD | \
 		      TNL_F_HDR_CACHE | TNL_F_IPSEC)
 
+/**
+ * struct port_lookup_key - Tunnel port key, used as hash table key.
+ * @in_key: Key to match on input, 0 for wildcard.
+ * @saddr: IPv4 source address to match, 0 to accept any source address.
+ * @daddr: IPv4 destination of tunnel.
+ * @tunnel_type: Set of TNL_T_* flags that define lookup.
+ */
+struct port_lookup_key {
+	__be64 in_key;
+	__be32 saddr;
+	__be32 daddr;
+	u32    tunnel_type;
+};
+
+#define PORT_KEY_LEN 	(offsetof(struct port_lookup_key, tunnel_type) + \
+			 FIELD_SIZEOF(struct port_lookup_key, tunnel_type))
+
 /**
  * struct tnl_mutable_config - modifiable configuration for a tunnel.
+ * @key: Used as key for tunnel port.  Configured via OVS_TUNNEL_ATTR_*
+ * attributes.
  * @rcu: RCU callback head for deferred destruction.
  * @seq: Sequence number for distinguishing configuration versions.
- * @tunnel_type: Set of TNL_T_* flags that define lookup.
  * @tunnel_hlen: Tunnel header length.
  * @eth_addr: Source address for packets generated by tunnel itself
  * (e.g. ICMP fragmentation needed messages).
- * @in_key: Key to match on input, 0 for wildcard.
  * @out_key: Key to use on output, 0 if this tunnel has no fixed output key.
  * @flags: TNL_F_* flags.
- * @saddr: IPv4 source address to match, 0 to accept any source address.
- * @daddr: IPv4 destination of tunnel.
  * @tos: IPv4 TOS value to use for tunnel, 0 if no fixed TOS.
  * @ttl: IPv4 TTL value to use for tunnel, 0 if no fixed TTL.
  */
 struct tnl_mutable_config {
+	struct port_lookup_key key;
 	struct rcu_head rcu;
 
 	unsigned seq;
 
-	u32 tunnel_type;
 	unsigned tunnel_hlen;
 
 	unsigned char eth_addr[ETH_ALEN];
 
 	/* Configured via OVS_TUNNEL_ATTR_* attributes. */
-	__be64	in_key;
 	__be64	out_key;
 	u32	flags;
-	__be32	saddr;
-	__be32	daddr;
 	u8	tos;
 	u8	ttl;
 };
@@ -187,7 +197,7 @@ struct tnl_cache {
 
 struct tnl_vport {
 	struct rcu_head rcu;
-	struct tbl_node tbl_node;
+	struct hlist_node hash_node;
 
 	char name[IFNAMSIZ];
 	const struct tnl_ops *tnl_ops;
@@ -217,7 +227,7 @@ struct tnl_vport {
 
 struct vport *tnl_create(const struct vport_parms *, const struct vport_ops *,
 			 const struct tnl_ops *);
-int tnl_destroy(struct vport *);
+void tnl_destroy(struct vport *);
 
 int tnl_set_options(struct vport *, struct nlattr *);
 int tnl_get_options(const struct vport *, struct sk_buff *);
@@ -236,6 +246,8 @@ bool tnl_frag_needed(struct vport *vport,
 		     struct sk_buff *skb, unsigned int mtu, __be64 flow_key);
 void tnl_free_linked_skbs(struct sk_buff *skb);
 
+int tnl_init(void);
+void tnl_exit(void);
 static inline struct tnl_vport *tnl_vport_priv(const struct vport *vport)
 {
 	return vport_priv(vport);