Acked-by: Nithin Raju <[email protected]> One another change that comes to mind is the validation that a socket of type NETLINK_GENERIC does not send a CT command and vice-versa. It should be a small change within Datapath.c and can be done as a incremental patch.
-----Original Message----- From: Sairam Venugopal <[email protected]> Date: Tuesday, July 12, 2016 at 2:41 PM To: Nithin Raju <[email protected]> Subject: FW: [PATCH v3 2/2] Windows: Use NETLINK_NETFILTER instead of NETLINK_GENERIC > > >On 7/11/16, 2:59 PM, "Sairam Venugopal" <[email protected]> wrote: > >>Windows datapath lacked support for different Netlink Family protocols. >>Now that Windows supports different Netlink protocol, revert the change >>to >>override NETLINK_NETFILTER to use NETLINK_GENERIC. >> >>Signed-off-by: Sairam Venugopal <[email protected]> >>--- >> lib/netlink-conntrack.c | 8 -------- >> lib/netlink-protocol.h | 1 + >> 2 files changed, 1 insertion(+), 8 deletions(-) >> >>diff --git a/lib/netlink-conntrack.c b/lib/netlink-conntrack.c >>index 5132bf2..d83b09a 100644 >>--- a/lib/netlink-conntrack.c >>+++ b/lib/netlink-conntrack.c >>@@ -75,14 +75,6 @@ static struct vlog_rate_limit rl = >>VLOG_RATE_LIMIT_INIT(1, 5); >> #define IPS_UNTRACKED_BIT 12 >> #define IPS_UNTRACKED (1 << IPS_UNTRACKED_BIT) >> >>-#ifdef _WIN32 >>-#ifdef NETLINK_NETFILTER >>-#undef NETLINK_NETFILTER >>-#endif >>-/* Reuse same socket for nfgenmsg and genlmsghdr in Windows*/ >>-#define NETLINK_NETFILTER NETLINK_GENERIC >>-#endif >>- >> static const struct nl_policy nfnlgrp_conntrack_policy[] = { >> [CTA_TUPLE_ORIG] = { .type = NL_A_NESTED, .optional = false }, >> [CTA_TUPLE_REPLY] = { .type = NL_A_NESTED, .optional = false }, >>diff --git a/lib/netlink-protocol.h b/lib/netlink-protocol.h >>index 8938055..a7b9a65 100644 >>--- a/lib/netlink-protocol.h >>+++ b/lib/netlink-protocol.h >>@@ -38,6 +38,7 @@ >> #include <linux/genetlink.h> >> >> #else >>+#define NETLINK_NETFILTER 12 >> #define NETLINK_GENERIC 16 >> >> /* nlmsg_flags bits. */ >>-- >>2.9.0.windows.1 >> > _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
