/*
- * Copyright (c) 2007-2011 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
#define TUNNEL_H 1
#include <linux/version.h>
+#include <net/net_namespace.h>
+#include <net/netns/generic.h>
#include "flow.h"
#include "openvswitch/tunnel.h"
* identifiers.
*/
#define TNL_T_PROTO_GRE 0
-#define TNL_T_PROTO_CAPWAP 1
+#define TNL_T_PROTO_GRE64 1
+#define TNL_T_PROTO_CAPWAP 2
/* These flags are only needed when calling tnl_find_port(). */
#define TNL_T_KEY_EXACT (1 << 10)
/**
* struct port_lookup_key - Tunnel port key, used as hash table key.
* @in_key: Key to match on input, 0 for wildcard.
+ * @net: Network namespace of the port.
* @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;
+#ifdef CONFIG_NET_NS
+ struct net *net;
+#endif
__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))
+static inline struct net *port_key_get_net(const struct port_lookup_key *key)
+{
+ return read_pnet(&key->net);
+}
+
+static inline void port_key_set_net(struct port_lookup_key *key, struct net *net)
+{
+ write_pnet(&key->net, net);
+}
+
/**
* struct tnl_mutable_config - modifiable configuration for a tunnel.
* @key: Used as key for tunnel port. Configured via OVS_TUNNEL_ATTR_*
unsigned seq;
- unsigned tunnel_hlen;
-
unsigned char eth_addr[ETH_ALEN];
/* Configured via OVS_TUNNEL_ATTR_* attributes. */
* build_header() (i.e. excludes the IP header). Returns a negative
* error code if the configuration is invalid.
*/
- int (*hdr_len)(const struct tnl_mutable_config *);
+ int (*hdr_len)(const struct tnl_mutable_config *,
+ const struct ovs_key_ipv4_tunnel *);
/*
* Builds the static portion of the tunnel header, which is stored in
* called for every packet, so try not to make it too slow.
*/
void (*build_header)(const struct vport *,
- const struct tnl_mutable_config *, void *header);
+ const struct tnl_mutable_config *,
+ const struct ovs_key_ipv4_tunnel *, void *header);
/*
* Updates the cached header of a packet to match the actual packet
*/
struct sk_buff *(*update_header)(const struct vport *,
const struct tnl_mutable_config *,
- struct dst_entry *, struct sk_buff *);
+ struct dst_entry *, struct sk_buff *,
+ int tunnel_hlen);
};
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
const char *ovs_tnl_get_name(const struct vport *vport);
const unsigned char *ovs_tnl_get_addr(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, u8 tos);
+void ovs_tnl_rcv(struct vport *vport, struct sk_buff *skb);
-struct vport *ovs_tnl_find_port(__be32 saddr, __be32 daddr, __be64 key,
- int tunnel_type,
+struct vport *ovs_tnl_find_port(struct net *net, __be32 saddr, __be32 daddr,
+ __be64 key, int tunnel_type,
const struct tnl_mutable_config **mutable);
bool ovs_tnl_frag_needed(struct vport *vport,
const struct tnl_mutable_config *mutable,
- struct sk_buff *skb, unsigned int mtu, __be64 flow_key);
+ struct sk_buff *skb, unsigned int mtu);
void ovs_tnl_free_linked_skbs(struct sk_buff *skb);
int ovs_tnl_init(void);
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;
+}
+
#endif /* tunnel.h */