Add helper and master if existing to a conntrack entry:
1, For CTA_HELP, only support FTP/TFTP;
2, For CTA_TUPLE_MASTER, only support FTP.
Signed-off-by: Jinjun Gao <jinj...@vmware.com>
---
datapath-windows/ovsext/Conntrack-related.c | 1 -
datapath-windows/ovsext/Conntrack.c | 40 ++++++++++++++++++++++++++---
datapath-windows/ovsext/Conntrack.h | 1 +
3 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/datapath-windows/ovsext/Conntrack-related.c
b/datapath-windows/ovsext/Conntrack-related.c
index 950be98..3bdd52f 100644
--- a/datapath-windows/ovsext/Conntrack-related.c
+++ b/datapath-windows/ovsext/Conntrack-related.c
@@ -48,7 +48,6 @@ OvsCtRelatedKeyAreSame(OVS_CT_KEY incomingKey, OVS_CT_KEY
entryKey)
/* FTP ACTIVE - Server initiates the connection */
if ((incomingKey.src.addr.ipv4 == entryKey.src.addr.ipv4) &&
- (incomingKey.src.port == entryKey.src.port) &&
(incomingKey.dst.addr.ipv4 == entryKey.dst.addr.ipv4) &&
(incomingKey.dst.port == entryKey.dst.port) &&
(incomingKey.dl_type == entryKey.dl_type) &&
diff --git a/datapath-windows/ovsext/Conntrack.c
b/datapath-windows/ovsext/Conntrack.c
index ba56116..864095f 100644
--- a/datapath-windows/ovsext/Conntrack.c
+++ b/datapath-windows/ovsext/Conntrack.c
@@ -480,6 +480,9 @@ OvsCtEntryDelete(POVS_CT_ENTRY entry, BOOLEAN forceDelete)
RemoveEntryList(&entry->link);
OVS_RELEASE_SPIN_LOCK(&(entry->lock), irql);
NdisFreeSpinLock(&(entry->lock));
+ if (entry->helper_name) {
+ OvsFreeMemoryWithTag(entry->helper_name, OVS_CT_POOL_TAG);
+ }
OvsFreeMemoryWithTag(entry, OVS_CT_POOL_TAG);
NdisInterlockedDecrement((PLONG)&ctTotalEntries);
return;
@@ -956,8 +959,6 @@ OvsCtExecute_(OvsForwardingContext *fwdCtx,
if (OvsDetectFtpPacket(key)) {
/* FTP parser will always be loaded */
- UNREFERENCED_PARAMETER(helper);
-
status = OvsCtHandleFtp(curNbl, key, layers, currentTime, entry,
(ntohs(key->ipKey.l4.tpDst) == IPPORT_FTP));
if (status != NDIS_STATUS_SUCCESS) {
@@ -965,6 +966,17 @@ OvsCtExecute_(OvsForwardingContext *fwdCtx,
}
}
+ if (!entry->helper_name && helper) {
+ entry->helper_name = OvsAllocateMemoryWithTag(strlen(helper) + 1,
+ OVS_CT_POOL_TAG);
+ if (!entry->helper_name) {
+ OVS_LOG_ERROR("Error while allocating memory");
+ return NDIS_STATUS_RESOURCES;
+ }
+
+ memcpy(entry->helper_name, helper, strlen(helper) + 1);
+ }
+
/* Add original tuple information to flow Key */
if (entry->key.dl_type == ntohs(ETH_TYPE_IPV4)) {
if (entry->parent != NULL) {
@@ -1039,8 +1051,8 @@ OvsExecuteConntrackAction(OvsForwardingContext *fwdCtx,
if (helper == NULL) {
return NDIS_STATUS_INVALID_PARAMETER;
}
- if (strcmp("ftp", helper) != 0) {
- /* Only support FTP */
+ if (strcmp("ftp", helper) != 0 && strcmp("tftp", helper) != 0)
{
+ /* Only support FTP/TFTP */
return NDIS_STATUS_NOT_SUPPORTED;
}
break;
@@ -1680,6 +1692,26 @@ OvsCreateNlMsgFromCtEntry(POVS_CT_ENTRY entry,
}
}
+ if (entry->helper_name) {
+ UINT32 offset;
+ offset = NlMsgStartNested(&nlBuf, CTA_HELP);
+ if (!offset) {
+ return NDIS_STATUS_FAILURE;
+ }
+ if (!NlMsgPutTailString(&nlBuf, CTA_HELP_NAME, entry->helper_name)) {
+ return STATUS_INVALID_BUFFER_SIZE;
+ }
+ NlMsgEndNested(&nlBuf, offset);
+ }
+
+ if (entry->parent) {
+ status = MapCtKeyTupleToNl(&nlBuf, CTA_TUPLE_MASTER,
+ &((POVS_CT_ENTRY)entry->parent)->key);
+ if (status != NDIS_STATUS_SUCCESS) {
+ return STATUS_UNSUCCESSFUL;
+ }
+ }
+
/* CTA_STATUS is required but not implemented. Default to 0 */
if (!NlMsgPutTailU32(&nlBuf, CTA_STATUS, 0)) {
return STATUS_INVALID_BUFFER_SIZE;
diff --git a/datapath-windows/ovsext/Conntrack.h
b/datapath-windows/ovsext/Conntrack.h
index bc6580d..23b0058 100644
--- a/datapath-windows/ovsext/Conntrack.h
+++ b/datapath-windows/ovsext/Conntrack.h
@@ -108,6 +108,7 @@ typedef struct OVS_CT_ENTRY {
struct ovs_key_ct_labels labels;
NAT_ACTION_INFO natInfo;
PVOID parent; /* Points to main connection */
+ PCHAR helper_name;
} OVS_CT_ENTRY, *POVS_CT_ENTRY;
typedef struct OVS_CT_REL_ENTRY {
--
1.8.5.6
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
