#include "connectivity.h"
#include "csum.h"
#include "dpif.h"
-#include "dynamic-string.h"
+#include "openvswitch/dynamic-string.h"
#include "fat-rwlock.h"
#include "hash.h"
#include "hmap.h"
#include "netdev.h"
#include "odp-util.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
#include "packets.h"
#include "route-table.h"
#include "seq.h"
#include "smap.h"
#include "socket-util.h"
-#include "tnl-arp-cache.h"
#include "tnl-ports.h"
#include "tunnel.h"
#include "openvswitch/vlog.h"
tnl_port->change_seq = netdev_get_change_seq(tnl_port->netdev);
tnl_port->match.in_key = cfg->in_key;
- if (cfg->ip_src) {
- in6_addr_set_mapped_ipv4(&tnl_port->match.ipv6_src, cfg->ip_src);
- }
- if (cfg->ip_dst) {
- in6_addr_set_mapped_ipv4(&tnl_port->match.ipv6_dst, cfg->ip_dst);
- }
+ tnl_port->match.ipv6_src = cfg->ipv6_src;
+ tnl_port->match.ipv6_dst = cfg->ipv6_dst;
tnl_port->match.ip_src_flow = cfg->ip_src_flow;
tnl_port->match.ip_dst_flow = cfg->ip_dst_flow;
tnl_port->match.pkt_mark = cfg->ipsec ? IPSEC_MARK : 0;
tnl_port_mod_log(tnl_port, "adding");
if (native_tnl) {
- tnl_port_map_insert(odp_port, cfg->dst_port, name);
+ const char *type;
+
+ type = netdev_get_type(netdev);
+ tnl_port_map_insert(odp_port, cfg->dst_port, name, type);
+
}
return true;
}
netdev_get_tunnel_config(tnl_port->netdev);
struct hmap **map;
- tnl_port_map_delete(cfg->dst_port);
+ tnl_port_map_delete(cfg->dst_port, netdev_get_type(tnl_port->netdev));
tnl_port_mod_log(tnl_port, "removing");
map = tnl_match_map(&tnl_port->match);
hmap_remove(*map, &tnl_port->match_node);
return true;
}
- if (is_ip_any(flow) && (flow->tunnel.ip_tos & IP_ECN_MASK) == IP_ECN_CE) {
+ if (is_ip_any(flow) && IP_ECN_is_ce(flow->tunnel.ip_tos)) {
if ((flow->nw_tos & IP_ECN_MASK) == IP_ECN_NOT_ECT) {
VLOG_WARN_RL(&rl, "dropping tunnel packet marked ECN CE"
" but is not ECN capable");
{
if (tnl_port_should_receive(flow)) {
wc->masks.tunnel.tun_id = OVS_BE64_MAX;
- wc->masks.tunnel.ip_src = OVS_BE32_MAX;
- wc->masks.tunnel.ip_dst = OVS_BE32_MAX;
+ if (flow->tunnel.ip_dst) {
+ wc->masks.tunnel.ip_src = OVS_BE32_MAX;
+ wc->masks.tunnel.ip_dst = OVS_BE32_MAX;
+ } else {
+ wc->masks.tunnel.ipv6_src = in6addr_exact;
+ wc->masks.tunnel.ipv6_dst = in6addr_exact;
+ }
wc->masks.tunnel.flags = (FLOW_TNL_F_DONT_FRAGMENT |
FLOW_TNL_F_CSUM |
FLOW_TNL_F_KEY);
wc->masks.tunnel.ip_tos = UINT8_MAX;
- wc->masks.tunnel.ip_ttl = UINT8_MAX;
+ wc->masks.tunnel.ip_ttl = 0;
/* The tp_src and tp_dst members in flow_tnl are set to be always
* wildcarded, not to unwildcard them here. */
wc->masks.tunnel.tp_src = 0;
memset(&wc->masks.pkt_mark, 0xff, sizeof wc->masks.pkt_mark);
if (is_ip_any(flow)
- && (flow->tunnel.ip_tos & IP_ECN_MASK) == IP_ECN_CE) {
+ && IP_ECN_is_ce(flow->tunnel.ip_tos)) {
wc->masks.nw_tos |= IP_ECN_MASK;
}
}
if (!cfg->ip_src_flow) {
flow->tunnel.ip_src = in6_addr_get_mapped_ipv4(&tnl_port->match.ipv6_src);
+ if (!flow->tunnel.ip_src) {
+ flow->tunnel.ipv6_src = tnl_port->match.ipv6_src;
+ } else {
+ flow->tunnel.ipv6_src = in6addr_any;
+ }
}
if (!cfg->ip_dst_flow) {
flow->tunnel.ip_dst = in6_addr_get_mapped_ipv4(&tnl_port->match.ipv6_dst);
+ if (!flow->tunnel.ip_dst) {
+ flow->tunnel.ipv6_dst = tnl_port->match.ipv6_dst;
+ } else {
+ flow->tunnel.ipv6_dst = in6addr_any;
+ }
}
flow->pkt_mark = tnl_port->match.pkt_mark;
if (is_ip_any(flow)) {
wc->masks.nw_tos |= IP_ECN_MASK;
- if ((flow->nw_tos & IP_ECN_MASK) == IP_ECN_CE) {
+ if (IP_ECN_is_ce(flow->nw_tos)) {
flow->tunnel.ip_tos |= IP_ECN_ECT_0;
} else {
flow->tunnel.ip_tos |= flow->nw_tos & IP_ECN_MASK;
* here as a description of how to treat received
* packets. */
match.in_key = in_key_flow ? 0 : flow->tunnel.tun_id;
- if (ip_src == IP_SRC_CFG && flow->tunnel.ip_dst) {
- in6_addr_set_mapped_ipv4(&match.ipv6_src, flow->tunnel.ip_dst);
+ if (ip_src == IP_SRC_CFG) {
+ match.ipv6_src = flow_tnl_dst(&flow->tunnel);
}
- if (!ip_dst_flow && flow->tunnel.ip_src) {
- in6_addr_set_mapped_ipv4(&match.ipv6_dst, flow->tunnel.ip_src);
+ if (!ip_dst_flow) {
+ match.ipv6_dst = flow_tnl_src(&flow->tunnel);
}
match.odp_port = flow->in_port.odp_port;
match.pkt_mark = flow->pkt_mark;
int
tnl_port_build_header(const struct ofport_dpif *ofport,
- const struct flow *tnl_flow,
- const struct eth_addr dmac,
- const struct eth_addr smac,
- ovs_be32 ip_src, struct ovs_action_push_tnl *data)
+ struct ovs_action_push_tnl *data,
+ const struct netdev_tnl_build_header_params *params)
{
struct tnl_port *tnl_port;
- struct eth_header *eth;
- struct ip_header *ip;
- void *l3;
int res;
fat_rwlock_rdlock(&rwlock);
tnl_port = tnl_find_ofport(ofport);
ovs_assert(tnl_port);
-
- /* Build Ethernet and IP headers. */
- memset(data->header, 0, sizeof data->header);
-
- eth = (struct eth_header *)data->header;
- eth->eth_dst = dmac;
- eth->eth_src = smac;
- eth->eth_type = htons(ETH_TYPE_IP);
-
- l3 = (eth + 1);
- ip = (struct ip_header *) l3;
-
- ip->ip_ihl_ver = IP_IHL_VER(5, 4);
- ip->ip_tos = tnl_flow->tunnel.ip_tos;
- ip->ip_ttl = tnl_flow->tunnel.ip_ttl;
- ip->ip_frag_off = (tnl_flow->tunnel.flags & FLOW_TNL_F_DONT_FRAGMENT) ?
- htons(IP_DF) : 0;
-
- put_16aligned_be32(&ip->ip_src, ip_src);
- put_16aligned_be32(&ip->ip_dst, tnl_flow->tunnel.ip_dst);
-
- res = netdev_build_header(tnl_port->netdev, data, tnl_flow);
- ip->ip_csum = csum(ip, sizeof *ip);
+ res = netdev_build_header(tnl_port->netdev, data, params);
fat_rwlock_unlock(&rwlock);
return res;
projects / cascardo / ovs.git / blobdiff