X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Ftunnel.h;h=e853146090e6d60d6bbee056d32a0bb6775deb29;hb=735d7efbaf03fd769d4716b7785fd81cc70f50d9;hp=89e73bac67677ea46df8289cedb3b8e258767df5;hpb=d1eb60ccff0c2dbef2300cdfc5fead3c2d394beb;p=sliver-openvswitch.git

diff --git a/datapath/tunnel.h b/datapath/tunnel.h
index 89e73bac6..e85314609 100644
--- a/datapath/tunnel.h
+++ b/datapath/tunnel.h
@@ -1,93 +1,83 @@
 /*
- * Copyright (c) 2010 Nicira Networks.
- * Distributed under the terms of the GNU GPL version 2.
+ * Copyright (c) 2007-2012 Nicira, Inc.
  *
- * Significant portions of this file may be copied from parts of the Linux
- * kernel, by Linus Torvalds and others.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
  */
 
 #ifndef TUNNEL_H
 #define TUNNEL_H 1
 
-#include "openvswitch/tunnel.h"
-#include "table.h"
-#include "vport.h"
-
-/* The absolute minimum fragment size.  Note that there are many other
- * definitions of the minimum MTU. */
-#define IP_MIN_MTU 68
-
-/*
- * One of these goes in your struct tnl_ops and in tnl_find_port().
- * These values are in the same namespace as other TNL_T_* values, so
- * you have only the first 10 bits to define protocol identifiers.
- */
-#define TNL_T_PROTO_GRE		0
-
-/* You only need these flags when you are 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)
-
-struct tnl_mutable_config {
-	struct rcu_head rcu;
+#include <linux/version.h>
+#include <net/net_namespace.h>
+#include <net/netns/generic.h>
 
-	unsigned char eth_addr[ETH_ALEN];
-	unsigned int mtu;
-	struct tnl_port_config port_config;
-
-	/* Set of TNL_T_* flags that define the category for lookup. */
-	u32 tunnel_type;
-
-	int tunnel_hlen; /* Tunnel header length. */
-};
+#include "flow.h"
+#include "vport.h"
 
 struct tnl_ops {
-	/* Put your TNL_T_PROTO_* type in here. */
-	u32 tunnel_type;
-	u8 ipproto;
-
-	int (*hdr_len)(const struct tnl_port_config *);
-	void (*build_header)(struct sk_buff *, const struct vport *,
-			     const struct tnl_mutable_config *);
+	u8 ipproto;		/* The IP protocol for the tunnel. */
+
+	/*
+	 * Returns the length of the tunnel header that will be added in
+	 * build_header() (i.e. excludes the IP header).
+	 */
+	int (*hdr_len)(const struct ovs_key_ipv4_tunnel *);
+	/*
+	* Builds header for given SKB.  Space will have already been
+	* allocated at the start of the packet equal
+	* to sizeof(struct iphdr) + value returned by hdr_len().
+	*/
+	void (*build_header)(const struct vport *, struct sk_buff *,
+			     int tunnel_hlen);
 };
 
 struct tnl_vport {
 	struct rcu_head rcu;
-	struct tbl_node tbl_node;
 
+	__be16 dst_port;
 	char name[IFNAMSIZ];
 	const struct tnl_ops *tnl_ops;
-
-	/* Protected by RCU. */
-	struct tnl_mutable_config *mutable;
 };
 
-int tnl_init(void);
-void tnl_exit(void);
-struct vport *tnl_create(const char *name, const void __user *config,
-			 const struct vport_ops *,
-			 const struct tnl_ops *);
-int tnl_modify(struct vport *, const void __user *config);
-int tnl_destroy(struct vport *);
-int tnl_set_mtu(struct vport *vport, int mtu);
-int tnl_set_addr(struct vport *vport, const unsigned char *addr);
-const char *tnl_get_name(const struct vport *vport);
-const unsigned char *tnl_get_addr(const struct vport *vport);
-int tnl_get_mtu(const struct vport *vport);
-int tnl_send(struct vport *vport, struct sk_buff *skb);
-void tnl_rcv(struct vport *vport, struct sk_buff *skb);
+struct vport *ovs_tnl_create(const struct vport_parms *, const struct vport_ops *,
+			     const struct tnl_ops *);
+void ovs_tnl_destroy(struct vport *);
 
-struct vport *tnl_find_port(__be32 saddr, __be32 daddr, __be32 key,
-			    int tunnel_type,
-			    const struct tnl_mutable_config **mutable);
-bool tnl_frag_needed(struct vport *vport,
-		     const struct tnl_mutable_config *mutable,
-		     struct sk_buff *skb, unsigned int mtu, __be32 flow_key);
+const char *ovs_tnl_get_name(const struct vport *vport);
+int ovs_tnl_send(struct vport *vport, struct sk_buff *skb);
+void ovs_tnl_rcv(struct vport *vport, struct sk_buff *skb);
+u16 ovs_tnl_get_src_port(struct sk_buff *skb);
 
 static inline struct tnl_vport *tnl_vport_priv(const struct vport *vport)
 {
 	return vport_priv(vport);
 }
 
+static inline void tnl_tun_key_init(struct ovs_key_ipv4_tunnel *tun_key,
+				    const struct iphdr *iph, __be64 tun_id, u32 tun_flags)
+{
+	tun_key->tun_id = tun_id;
+	tun_key->ipv4_src = iph->saddr;
+	tun_key->ipv4_dst = iph->daddr;
+	tun_key->ipv4_tos = iph->tos;
+	tun_key->ipv4_ttl = iph->ttl;
+	tun_key->tun_flags = tun_flags;
+
+	/* clear struct padding. */
+	memset((unsigned char*) tun_key + OVS_TUNNEL_KEY_SIZE, 0,
+	       sizeof(*tun_key) - OVS_TUNNEL_KEY_SIZE);
+}
+
 #endif /* tunnel.h */