The structure was updated for both IPv4 and IPv6 tunnel src and
dst addresses, so renaming it was necessary.
Signed-off-by: Sorin Vinturis <svintu...@cloudbasesolutions.com>
---
datapath-windows/ovsext/Actions.c | 8 ++++----
datapath-windows/ovsext/DpInternal.h | 10 +++++-----
datapath-windows/ovsext/Flow.c | 10 +++++-----
datapath-windows/ovsext/Flow.h | 4 ++--
datapath-windows/ovsext/Gre.c | 8 ++++----
datapath-windows/ovsext/Gre.h | 4 ++--
datapath-windows/ovsext/IpHelper.c | 2 +-
datapath-windows/ovsext/IpHelper.h | 2 +-
datapath-windows/ovsext/Stt.c | 8 ++++----
datapath-windows/ovsext/Stt.h | 4 ++--
datapath-windows/ovsext/Tunnel.c | 2 +-
datapath-windows/ovsext/User.c | 4 ++--
datapath-windows/ovsext/Vxlan.c | 8 ++++----
datapath-windows/ovsext/Vxlan.h | 6 +++---
14 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/datapath-windows/ovsext/Actions.c
b/datapath-windows/ovsext/Actions.c
index 909a84a..ead9741 100644
--- a/datapath-windows/ovsext/Actions.c
+++ b/datapath-windows/ovsext/Actions.c
@@ -104,7 +104,7 @@ typedef struct OvsForwardingContext {
* - specified in actions during tunneling Tx
* - extracted from an NBL during tunneling Rx
*/
- OvsIPv4TunnelKey tunKey;
+ OvsIPTunnelKey tunKey;
/*
* Tunneling - Tx:
@@ -1239,12 +1239,12 @@ OvsActionMplsPush(OvsForwardingContext *ovsFwdCtx,
/*
* --------------------------------------------------------------------------
* OvsTunnelAttrToIPv4TunnelKey --
- * Convert tunnel attribute to OvsIPv4TunnelKey.
+ * Convert tunnel attribute to OvsIPTunnelKey.
* --------------------------------------------------------------------------
*/
static __inline NDIS_STATUS
OvsTunnelAttrToIPv4TunnelKey(PNL_ATTR attr,
- OvsIPv4TunnelKey *tunKey)
+ OvsIPTunnelKey *tunKey)
{
PNL_ATTR a;
INT rem;
@@ -1516,7 +1516,7 @@ OvsExecuteSetAction(OvsForwardingContext *ovsFwdCtx,
case OVS_KEY_ATTR_TUNNEL:
{
- OvsIPv4TunnelKey tunKey;
+ OvsIPTunnelKey tunKey;
status = OvsTunnelAttrToIPv4TunnelKey((PNL_ATTR)a, &tunKey);
ASSERT(status == NDIS_STATUS_SUCCESS);
tunKey.flow_hash = (uint16)(hash ? *hash : OvsHashFlow(key));
diff --git a/datapath-windows/ovsext/DpInternal.h
b/datapath-windows/ovsext/DpInternal.h
index 526efe6..e3f2c20 100644
--- a/datapath-windows/ovsext/DpInternal.h
+++ b/datapath-windows/ovsext/DpInternal.h
@@ -130,7 +130,7 @@ typedef struct L2Key {
/* Number of packet attributes required to store OVS tunnel key. */
#define NUM_PKT_ATTR_REQUIRED 9
-typedef union OvsIPv4TunnelKey {
+typedef union OvsIPTunnelKey {
struct {
SOCKADDR_INET dst;
SOCKADDR_INET src;
@@ -147,7 +147,7 @@ typedef union OvsIPv4TunnelKey {
};
};
uint64_t attr[NUM_PKT_ATTR_REQUIRED];
-} OvsIPv4TunnelKey; /* Size of 72 byte. */
+} OvsIPTunnelKey; /* Size of 72 byte. */
typedef struct MplsKey {
ovs_be32 lse; /* MPLS topmost label stack entry. */
@@ -155,7 +155,7 @@ typedef struct MplsKey {
} MplsKey; /* Size of 8 bytes. */
typedef __declspec(align(8)) struct OvsFlowKey {
- OvsIPv4TunnelKey tunKey; /* 72 bytes */
+ OvsIPTunnelKey tunKey; /* 72 bytes */
L2Key l2; /* 24 bytes */
union {
/* These headers are mutually exclusive. */
@@ -176,7 +176,7 @@ typedef __declspec(align(8)) struct OvsFlowKey {
} ct; /* Connection Tracking Flags */
} OvsFlowKey;
-#define OVS_WIN_TUNNEL_KEY_SIZE (sizeof (OvsIPv4TunnelKey))
+#define OVS_WIN_TUNNEL_KEY_SIZE (sizeof (OvsIPTunnelKey))
#define OVS_L2_KEY_SIZE (sizeof (L2Key))
#define OVS_IP_KEY_SIZE (sizeof (IpKey))
#define OVS_IPV6_KEY_SIZE (sizeof (Ipv6Key))
@@ -262,7 +262,7 @@ typedef struct _OVS_PACKET_INFO {
uint32_t queue;
uint32_t inPort;
uint32_t cmd;
- OvsIPv4TunnelKey tunnelKey;
+ OvsIPTunnelKey tunnelKey;
uint8_t *payload;
/* Includes user data defined as chain of netlink attributes followed by
the
* packet data. */
diff --git a/datapath-windows/ovsext/Flow.c b/datapath-windows/ovsext/Flow.c
index c40da8a..1eb5102 100644
--- a/datapath-windows/ovsext/Flow.c
+++ b/datapath-windows/ovsext/Flow.c
@@ -981,12 +981,12 @@ error_nested_start:
/*
*----------------------------------------------------------------------------
* MapFlowTunKeyToNlKey --
- * Maps OvsIPv4TunnelKey to OVS_TUNNEL_KEY_ATTR_ID attribute.
+ * Maps OvsIPTunnelKey to OVS_TUNNEL_KEY_ATTR_ID attribute.
*----------------------------------------------------------------------------
*/
NTSTATUS
MapFlowTunKeyToNlKey(PNL_BUFFER nlBuf,
- OvsIPv4TunnelKey *tunKey,
+ OvsIPTunnelKey *tunKey,
UINT16 tunKeyType)
{
NTSTATUS rc = STATUS_SUCCESS;
@@ -1880,7 +1880,7 @@ OvsExtractFlow(const NET_BUFFER_LIST *packet,
UINT32 inPort,
OvsFlowKey *flow,
POVS_PACKET_HDR_INFO layers,
- OvsIPv4TunnelKey *tunKey)
+ OvsIPTunnelKey *tunKey)
{
struct Eth_Header *eth;
UINT8 offset = 0;
@@ -2225,7 +2225,7 @@ OvsLookupFlow(OVS_DATAPATH *datapath,
UINT8 *start;
BOOLEAN isNullDst = IsNullIpAddr(&key->tunKey.dst);
- ASSERT(!isNullDst || offset == sizeof(OvsIPv4TunnelKey));
+ ASSERT(!isNullDst || offset == sizeof(OvsIPTunnelKey));
ASSERT(isNullDst || offset == 0);
start = (UINT8 *)key + offset;
@@ -2283,7 +2283,7 @@ OvsHashFlow(const OvsFlowKey *key)
UINT8 *start;
BOOLEAN isNullDst = IsNullIpAddr(&key->tunKey.dst);
- ASSERT(!isNullDst || offset == sizeof(OvsIPv4TunnelKey));
+ ASSERT(!isNullDst || offset == sizeof(OvsIPTunnelKey));
ASSERT(isNullDst || offset == 0);
start = (UINT8 *)key + offset;
return OvsJhashBytes(start, size, 0);
diff --git a/datapath-windows/ovsext/Flow.h b/datapath-windows/ovsext/Flow.h
index fb3fb59..9efd46d 100644
--- a/datapath-windows/ovsext/Flow.h
+++ b/datapath-windows/ovsext/Flow.h
@@ -55,7 +55,7 @@ NDIS_STATUS OvsGetFlowMetadata(OvsFlowKey *key,
PNL_ATTR *keyAttrs);
NDIS_STATUS OvsExtractFlow(const NET_BUFFER_LIST *pkt, UINT32 inPort,
OvsFlowKey *flow, POVS_PACKET_HDR_INFO layers,
- OvsIPv4TunnelKey *tunKey);
+ OvsIPTunnelKey *tunKey);
OvsFlow* OvsLookupFlow(OVS_DATAPATH *datapath, const OvsFlowKey *key,
UINT64 *hash, BOOLEAN hashValid);
OvsFlow* OvsLookupFlowRecirc(OVS_DATAPATH *datapath,
@@ -79,7 +79,7 @@ NTSTATUS OvsFlowNlGetCmdHandler(POVS_USER_PARAMS_CONTEXT
usrParamsCtx,
UINT32 *replyLen);
NTSTATUS MapFlowKeyToNlKey(PNL_BUFFER nlBuf, OvsFlowKey *flowKey,
UINT16 keyType, UINT16 tunKeyType);
-NTSTATUS MapFlowTunKeyToNlKey(PNL_BUFFER nlBuf, OvsIPv4TunnelKey *tunKey,
+NTSTATUS MapFlowTunKeyToNlKey(PNL_BUFFER nlBuf, OvsIPTunnelKey *tunKey,
UINT16 tunKeyType);
VOID MapTunAttrToFlowPut(PNL_ATTR *keyAttrs, PNL_ATTR *tunAttrs,
OvsFlowKey *destKey);
diff --git a/datapath-windows/ovsext/Gre.c b/datapath-windows/ovsext/Gre.c
index 1cc4e69..0ceaab5 100644
--- a/datapath-windows/ovsext/Gre.c
+++ b/datapath-windows/ovsext/Gre.c
@@ -37,7 +37,7 @@
static NDIS_STATUS
OvsDoEncapGre(POVS_VPORT_ENTRY vport, PNET_BUFFER_LIST curNbl,
- const OvsIPv4TunnelKey *tunKey,
+ const OvsIPTunnelKey *tunKey,
const POVS_FWD_INFO fwdInfo,
POVS_PACKET_HDR_INFO layers,
POVS_SWITCH_CONTEXT switchContext,
@@ -93,7 +93,7 @@ OvsCleanupGreTunnel(POVS_VPORT_ENTRY vport)
NDIS_STATUS
OvsEncapGre(POVS_VPORT_ENTRY vport,
PNET_BUFFER_LIST curNbl,
- OvsIPv4TunnelKey *tunKey,
+ OvsIPTunnelKey *tunKey,
POVS_SWITCH_CONTEXT switchContext,
POVS_PACKET_HDR_INFO layers,
PNET_BUFFER_LIST *newNbl)
@@ -121,7 +121,7 @@ OvsEncapGre(POVS_VPORT_ENTRY vport,
NDIS_STATUS
OvsDoEncapGre(POVS_VPORT_ENTRY vport,
PNET_BUFFER_LIST curNbl,
- const OvsIPv4TunnelKey *tunKey,
+ const OvsIPTunnelKey *tunKey,
const POVS_FWD_INFO fwdInfo,
POVS_PACKET_HDR_INFO layers,
POVS_SWITCH_CONTEXT switchContext,
@@ -292,7 +292,7 @@ ret_error:
NDIS_STATUS
OvsDecapGre(POVS_SWITCH_CONTEXT switchContext,
PNET_BUFFER_LIST curNbl,
- OvsIPv4TunnelKey *tunKey,
+ OvsIPTunnelKey *tunKey,
PNET_BUFFER_LIST *newNbl)
{
PNET_BUFFER curNb;
diff --git a/datapath-windows/ovsext/Gre.h b/datapath-windows/ovsext/Gre.h
index d2472d9..d560491 100644
--- a/datapath-windows/ovsext/Gre.h
+++ b/datapath-windows/ovsext/Gre.h
@@ -61,14 +61,14 @@ void OvsCleanupGreTunnel(POVS_VPORT_ENTRY vport);
NDIS_STATUS OvsEncapGre(POVS_VPORT_ENTRY vport,
PNET_BUFFER_LIST curNbl,
- OvsIPv4TunnelKey *tunKey,
+ OvsIPTunnelKey *tunKey,
POVS_SWITCH_CONTEXT switchContext,
POVS_PACKET_HDR_INFO layers,
PNET_BUFFER_LIST *newNbl);
NDIS_STATUS OvsDecapGre(POVS_SWITCH_CONTEXT switchContext,
PNET_BUFFER_LIST curNbl,
- OvsIPv4TunnelKey *tunKey,
+ OvsIPTunnelKey *tunKey,
PNET_BUFFER_LIST *newNbl);
static __inline UINT16
diff --git a/datapath-windows/ovsext/IpHelper.c
b/datapath-windows/ovsext/IpHelper.c
index b919084..a36f078 100644
--- a/datapath-windows/ovsext/IpHelper.c
+++ b/datapath-windows/ovsext/IpHelper.c
@@ -1206,7 +1206,7 @@ OvsEnqueueIpHelperRequest(POVS_IP_HELPER_REQUEST request)
NTSTATUS
OvsFwdIPHelperRequest(PNET_BUFFER_LIST nbl,
UINT32 inPort,
- const OvsIPv4TunnelKey *tunnelKey,
+ const OvsIPTunnelKey *tunnelKey,
OvsIPHelperCallback cb,
PVOID cbData1,
PVOID cbData2)
diff --git a/datapath-windows/ovsext/IpHelper.h
b/datapath-windows/ovsext/IpHelper.h
index 5a685c3..157234b 100644
--- a/datapath-windows/ovsext/IpHelper.h
+++ b/datapath-windows/ovsext/IpHelper.h
@@ -88,7 +88,7 @@ typedef VOID (*OvsIPHelperCallback)(PNET_BUFFER_LIST nbl,
typedef struct _OVS_FWD_REQUEST_INFO {
PNET_BUFFER_LIST nbl;
UINT32 inPort;
- OvsIPv4TunnelKey tunnelKey;
+ OvsIPTunnelKey tunnelKey;
OvsIPHelperCallback cb;
PVOID cbData1;
PVOID cbData2;
diff --git a/datapath-windows/ovsext/Stt.c b/datapath-windows/ovsext/Stt.c
index a7290d5..48f5c12 100644
--- a/datapath-windows/ovsext/Stt.c
+++ b/datapath-windows/ovsext/Stt.c
@@ -44,7 +44,7 @@ static OVS_STT_THREAD_CTX sttDefragThreadCtx;
static NDIS_STATUS
OvsDoEncapStt(POVS_VPORT_ENTRY vport, PNET_BUFFER_LIST curNbl,
- const OvsIPv4TunnelKey *tunKey,
+ const OvsIPTunnelKey *tunKey,
const POVS_FWD_INFO fwdInfo,
POVS_PACKET_HDR_INFO layers,
POVS_SWITCH_CONTEXT switchContext,
@@ -102,7 +102,7 @@ OvsCleanupSttTunnel(POVS_VPORT_ENTRY vport)
NDIS_STATUS
OvsEncapStt(POVS_VPORT_ENTRY vport,
PNET_BUFFER_LIST curNbl,
- OvsIPv4TunnelKey *tunKey,
+ OvsIPTunnelKey *tunKey,
POVS_SWITCH_CONTEXT switchContext,
POVS_PACKET_HDR_INFO layers,
PNET_BUFFER_LIST *newNbl)
@@ -135,7 +135,7 @@ OvsEncapStt(POVS_VPORT_ENTRY vport,
NDIS_STATUS
OvsDoEncapStt(POVS_VPORT_ENTRY vport,
PNET_BUFFER_LIST curNbl,
- const OvsIPv4TunnelKey *tunKey,
+ const OvsIPTunnelKey *tunKey,
const POVS_FWD_INFO fwdInfo,
POVS_PACKET_HDR_INFO layers,
POVS_SWITCH_CONTEXT switchContext,
@@ -735,7 +735,7 @@ OvsDecapSetOffloads(PNET_BUFFER_LIST curNbl, SttHdr *sttHdr)
NDIS_STATUS
OvsDecapStt(POVS_SWITCH_CONTEXT switchContext,
PNET_BUFFER_LIST curNbl,
- OvsIPv4TunnelKey *tunKey,
+ OvsIPTunnelKey *tunKey,
PNET_BUFFER_LIST *newNbl)
{
NDIS_STATUS status = NDIS_STATUS_FAILURE;
diff --git a/datapath-windows/ovsext/Stt.h b/datapath-windows/ovsext/Stt.h
index a3e3915..676235d 100644
--- a/datapath-windows/ovsext/Stt.h
+++ b/datapath-windows/ovsext/Stt.h
@@ -86,7 +86,7 @@ VOID OvsCleanupSttTunnel(POVS_VPORT_ENTRY vport);
NDIS_STATUS OvsEncapStt(POVS_VPORT_ENTRY vport,
PNET_BUFFER_LIST curNbl,
- OvsIPv4TunnelKey *tunKey,
+ OvsIPTunnelKey *tunKey,
POVS_SWITCH_CONTEXT switchContext,
POVS_PACKET_HDR_INFO layers,
PNET_BUFFER_LIST *newNbl);
@@ -94,7 +94,7 @@ NDIS_STATUS OvsEncapStt(POVS_VPORT_ENTRY vport,
NDIS_STATUS OvsDecapStt(POVS_SWITCH_CONTEXT switchContext,
PNET_BUFFER_LIST curNbl,
- OvsIPv4TunnelKey *tunKey,
+ OvsIPTunnelKey *tunKey,
PNET_BUFFER_LIST *newNbl);
NTSTATUS OvsInitSttDefragmentation();
diff --git a/datapath-windows/ovsext/Tunnel.c b/datapath-windows/ovsext/Tunnel.c
index 97d2020..67c70cc 100644
--- a/datapath-windows/ovsext/Tunnel.c
+++ b/datapath-windows/ovsext/Tunnel.c
@@ -215,7 +215,7 @@ OvsInjectPacketThroughActions(PNET_BUFFER_LIST pNbl,
OVS_TUNNEL_PENDED_PACKET *packet)
{
NTSTATUS status;
- OvsIPv4TunnelKey tunnelKey;
+ OvsIPTunnelKey tunnelKey;
NET_BUFFER *pNb;
ULONG sendCompleteFlags = 0;
BOOLEAN dispatch;
diff --git a/datapath-windows/ovsext/User.c b/datapath-windows/ovsext/User.c
index 110a6cc..c915cd0 100644
--- a/datapath-windows/ovsext/User.c
+++ b/datapath-windows/ovsext/User.c
@@ -807,7 +807,7 @@ OvsCreateAndAddPackets(PVOID userData,
static __inline UINT32
OvsGetUpcallMsgSize(PVOID userData,
UINT32 userDataLen,
- OvsIPv4TunnelKey *tunnelKey,
+ OvsIPTunnelKey *tunnelKey,
UINT32 payload)
{
UINT32 size = NLMSG_ALIGN(sizeof(struct ovs_header)) +
@@ -982,7 +982,7 @@ OvsCreateQueueNlPacket(PVOID userData,
UINT8 *src, *dst;
NDIS_TCP_IP_CHECKSUM_NET_BUFFER_LIST_INFO csumInfo;
NDIS_NET_BUFFER_LIST_8021Q_INFO vlanInfo;
- OvsIPv4TunnelKey *tunnelKey = (OvsIPv4TunnelKey *)&key->tunKey;
+ OvsIPTunnelKey *tunnelKey = (OvsIPTunnelKey *)&key->tunKey;
UINT32 pid;
UINT32 nlMsgSize;
NL_BUFFER nlBuf;
diff --git a/datapath-windows/ovsext/Vxlan.c b/datapath-windows/ovsext/Vxlan.c
index 63e3680..7f64acc 100644
--- a/datapath-windows/ovsext/Vxlan.c
+++ b/datapath-windows/ovsext/Vxlan.c
@@ -174,7 +174,7 @@ OvsCleanupVxlanTunnel(PIRP irp,
static __inline NDIS_STATUS
OvsDoEncapVxlan(POVS_VPORT_ENTRY vport,
PNET_BUFFER_LIST curNbl,
- OvsIPv4TunnelKey *tunKey,
+ OvsIPTunnelKey *tunKey,
POVS_FWD_INFO fwdInfo,
POVS_PACKET_HDR_INFO layers,
POVS_SWITCH_CONTEXT switchContext,
@@ -328,7 +328,7 @@ ret_error:
NDIS_STATUS
OvsEncapVxlan(POVS_VPORT_ENTRY vport,
PNET_BUFFER_LIST curNbl,
- OvsIPv4TunnelKey *tunKey,
+ OvsIPTunnelKey *tunKey,
POVS_SWITCH_CONTEXT switchContext,
POVS_PACKET_HDR_INFO layers,
PNET_BUFFER_LIST *newNbl)
@@ -406,7 +406,7 @@ OvsCalculateUDPChecksum(PNET_BUFFER_LIST curNbl,
NDIS_STATUS
OvsDecapVxlan(POVS_SWITCH_CONTEXT switchContext,
PNET_BUFFER_LIST curNbl,
- OvsIPv4TunnelKey *tunKey,
+ OvsIPTunnelKey *tunKey,
PNET_BUFFER_LIST *newNbl)
{
PNET_BUFFER curNb;
@@ -498,7 +498,7 @@ dropNbl:
NDIS_STATUS
OvsSlowPathDecapVxlan(const PNET_BUFFER_LIST packet,
- OvsIPv4TunnelKey *tunnelKey)
+ OvsIPTunnelKey *tunnelKey)
{
NDIS_STATUS status = NDIS_STATUS_FAILURE;
UDPHdr udpStorage;
diff --git a/datapath-windows/ovsext/Vxlan.h b/datapath-windows/ovsext/Vxlan.h
index b9462f0..be154a5 100644
--- a/datapath-windows/ovsext/Vxlan.h
+++ b/datapath-windows/ovsext/Vxlan.h
@@ -57,18 +57,18 @@ NTSTATUS OvsCleanupVxlanTunnel(PIRP irp,
PVOID tunnelContext);
NDIS_STATUS OvsSlowPathDecapVxlan(const PNET_BUFFER_LIST packet,
- OvsIPv4TunnelKey *tunnelKey);
+ OvsIPTunnelKey *tunnelKey);
NDIS_STATUS OvsEncapVxlan(POVS_VPORT_ENTRY vport,
PNET_BUFFER_LIST curNbl,
- OvsIPv4TunnelKey *tunKey,
+ OvsIPTunnelKey *tunKey,
POVS_SWITCH_CONTEXT switchContext,
POVS_PACKET_HDR_INFO layers,
PNET_BUFFER_LIST *newNbl);
NDIS_STATUS OvsDecapVxlan(POVS_SWITCH_CONTEXT switchContext,
PNET_BUFFER_LIST curNbl,
- OvsIPv4TunnelKey *tunKey,
+ OvsIPTunnelKey *tunKey,
PNET_BUFFER_LIST *newNbl);
static __inline UINT32
--
1.9.0.msysgit.0
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
