projects
/
cascardo
/
ovs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Fix memory leak and memory exhaustion bugs in group_mod.
[cascardo/ovs.git]
/
ofproto
/
tunnel.h
diff --git
a/ofproto/tunnel.h
b/ofproto/tunnel.h
index
1b055ae
..
1f3dfc2
100644
(file)
--- a/
ofproto/tunnel.h
+++ b/
ofproto/tunnel.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013 Nicira, Inc.
+/* Copyright (c) 2013
, 2015
Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-20,31
+20,41
@@
#include <stdint.h>
#include "flow.h"
#include <stdint.h>
#include "flow.h"
-/* skb mark used for IPsec tunnel packets */
-#define IPSEC_MARK 1
-
/* Tunnel port emulation layer.
*
* These functions emulate tunnel virtual ports based on the outer
* header information from the kernel. */
/* Tunnel port emulation layer.
*
* These functions emulate tunnel virtual ports based on the outer
* header information from the kernel. */
-struct ofport;
-struct tnl_port;
+struct ovs_action_push_tnl;
+struct ofport_dpif;
+struct netdev;
-bool tnl_port_reconfigure(const struct ofport *, uint32_t odp_port,
- struct tnl_port **);
+void ofproto_tunnel_init(void);
+bool tnl_port_reconfigure(const struct ofport_dpif *, const struct netdev *,
+ odp_port_t, bool native_tnl, const char name[]);
-struct tnl_port *tnl_port_add(const struct ofport *, uint32_t odp_port);
-void tnl_port_del(struct tnl_port *);
+int tnl_port_add(const struct ofport_dpif *, const struct netdev *,
+ odp_port_t odp_port, bool native_tnl, const char name[]);
+void tnl_port_del(const struct ofport_dpif *);
-const struct ofport *tnl_port_receive(struct flow *);
-uint32_t tnl_port_send(const struct tnl_port *, struct flow *);
+const struct ofport_dpif *tnl_port_receive(const struct flow *);
+void tnl_wc_init(struct flow *, struct flow_wildcards *);
+bool tnl_process_ecn(struct flow *);
+odp_port_t tnl_port_send(const struct ofport_dpif *, struct flow *,
+ struct flow_wildcards *wc);
/* Returns true if 'flow' should be submitted to tnl_port_receive(). */
static inline bool
tnl_port_should_receive(const struct flow *flow)
{
/* Returns true if 'flow' should be submitted to tnl_port_receive(). */
static inline bool
tnl_port_should_receive(const struct flow *flow)
{
- return flow
->tunnel.ip_dst != 0
;
+ return flow
_tnl_dst_is_set(&flow->tunnel)
;
}
}
+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,
+ const struct in6_addr *ipv6_src,
+ struct ovs_action_push_tnl *data);
+
#endif /* tunnel.h */
#endif /* tunnel.h */