[ovs-git] [openvswitch/ovs] 3c1c21: Windows: Add conntrack netfilter netlink definitio...

Sat Jul 2 03:55:44 UTC 2016

  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: 3c1c21190dbeff8845ee276ea1f4bf3c789cb76b
      https://github.com/openvswitch/ovs/commit/3c1c21190dbeff8845ee276ea1f4bf3c789cb76b
  Author: Sairam Venugopal <vsairam at vmware.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M build-aux/extract-odp-netlink-h
    M datapath-windows/automake.mk
    A datapath-windows/include/OvsDpInterfaceCtExt.h
    M datapath-windows/ovsext/ovsext.vcxproj
    M datapath-windows/ovsext/precomp.h
    M include/windows/automake.mk
    A include/windows/linux/netfilter/nf_conntrack_common.h
    A include/windows/linux/netfilter/nf_conntrack_ftp.h
    A include/windows/linux/netfilter/nf_conntrack_sctp.h
    A include/windows/linux/netfilter/nf_conntrack_tcp.h
    A include/windows/linux/netfilter/nfnetlink.h
    A include/windows/linux/netfilter/nfnetlink_conntrack.h

  Log Message:
  -----------
  Windows: Add conntrack netfilter netlink definitions to kernel and userspace

Include netfilter-conntrack header definitions. This will be used by
Windows userspace for adding debugging support in Conntrack. Few of these
files are intentionally left blank to avoid removing #includes in
userspace. New file - OvsDpInterfaceCtExt.h has been defined similar to
OvsDpInterfaceExt.h to be reused by userspace and kernel.

Signed-off-by: Sairam Venugopal <vsairam at vmware.com>
Acked-by: Nithin Raju <nithin at vmware.com>
Signed-off-by: Gurucharan Shetty <guru at ovn.org>

  Commit: 9f8407b9027df9614909bfdee49ab43f0612f39b
      https://github.com/openvswitch/ovs/commit/9f8407b9027df9614909bfdee49ab43f0612f39b
  Author: Sairam Venugopal <vsairam at vmware.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M datapath-windows/ovsext/Netlink/Netlink.c
    M datapath-windows/ovsext/Netlink/Netlink.h
    M datapath-windows/ovsext/Netlink/NetlinkProto.h

  Log Message:
  -----------
  datapath-windows: Add support for Netfilter netlink message

Introduce NF_GEN_MSG_HDR similar to GENL_MSG_HDR that will be used for
communicating via netfilter-netlink channel. This will be used by
userspace to retrieve and modify Conntrack data in Windows.

Signed-off-by: Sairam Venugopal <vsairam at vmware.com>
Acked-by: Paul-Daniel Boca <pboca at cloudbasesolutions.com>
Acked-by: Nithin Raju <nithin at vmware.com>
Signed-off-by: Gurucharan Shetty <guru at ovn.org>

  Commit: d115da85482f3cb534651899831fba177714aec5
      https://github.com/openvswitch/ovs/commit/d115da85482f3cb534651899831fba177714aec5
  Author: Sairam Venugopal <vsairam at vmware.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M datapath-windows/ovsext/Netlink/Netlink.c
    M datapath-windows/ovsext/Netlink/Netlink.h

  Log Message:
  -----------
  datapath-windows: Add new NlFillOvsMsgForNfGenMsg method in Netlink.c

Create a new method to create and fill OvsMessage with NfGenMsg. This will
be used for sending Netfilter based Netlink messages.

Signed-off-by: Sairam Venugopal <vsairam at vmware.com>
Acked-by: Paul-Daniel Boca <pboca at cloudbasesolutions.com>
Acked-by: Nithin Raju <nithin at vmware.com>
Signed-off-by: Gurucharan Shetty <guru at ovn.org>

  Commit: 434972b721ff5f15a848eff5dfe566ad8dbf4140
      https://github.com/openvswitch/ovs/commit/434972b721ff5f15a848eff5dfe566ad8dbf4140
  Author: Sairam Venugopal <vsairam at vmware.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M datapath-windows/ovsext/Conntrack.c

  Log Message:
  -----------
  datapath-windows: Add support for flushing conntrack entries

Flush out all conntrack entries or those that match a given zone. Since
the conntrack module is internal to OVS in Windows, this functionality
needs to be added in.

Signed-off-by: Sairam Venugopal <vsairam at vmware.com>
Acked-by: Paul-Daniel Boca <pboca at cloudbasesolutions.com>
Acked-by: Nithin Raju <nithin at vmware.com>
Signed-off-by: Gurucharan Shetty <guru at ovn.org>

  Commit: 78f31c2b4c3e90fb72d7ae4f2cd4211b97709480
      https://github.com/openvswitch/ovs/commit/78f31c2b4c3e90fb72d7ae4f2cd4211b97709480
  Author: Sairam Venugopal <vsairam at vmware.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M datapath-windows/include/OvsDpInterfaceExt.h
    M datapath-windows/ovsext/Datapath.c

  Log Message:
  -----------
  datapath-windows: Add support for Conntrack IPCTNL_MSG_CT_DELETE cmd in Datapath.c

Create new NETLINK_CMD and NETLINK_FAMILY to assist in flushing conntrack entries. Modify
Datapath.c to now support netfilter-netlink messages apart from the
existing netfilter-generic messages. Also hookup the command handler to
execute the OvsCtFlush in Conntrack.c

Signed-off-by: Sairam Venugopal <vsairam at vmware.com>
Acked-by: Paul-Daniel Boca <pboca at cloudbasesolutions.com>
Acked-by: Nithin Raju <nithin at vmware.com>
Signed-off-by: Gurucharan Shetty <guru at ovn.org>

  Commit: b50d56a76732d833d7c4ce3cc12b7a200a61bd4b
      https://github.com/openvswitch/ovs/commit/b50d56a76732d833d7c4ce3cc12b7a200a61bd4b
  Author: Sairam Venugopal <vsairam at vmware.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M datapath-windows/ovsext/Conntrack-tcp.c
    M datapath-windows/ovsext/Conntrack.c
    M datapath-windows/ovsext/Conntrack.h
    M datapath-windows/ovsext/Util.h

  Log Message:
  -----------
  datapath-windows: Add support for dump-conntrack in datapath

Create the methods used for dumping conntrack entries from the hyper-v
datapath to userspace by means of netfilter netlink messages. Some of the
attributes are not supported by the datapath and have been defaulted to 0.

Signed-off-by: Sairam Venugopal <vsairam at vmware.com>
Acked-by: Paul-Daniel Boca <pboca at cloudbasesolutions.com>
Acked-by: Nithin Raju <nithin at vmware.com>
Signed-off-by: Gurucharan Shetty <guru at ovn.org>

  Commit: 8bed11fd283edabe942434451c3b431a61bfba89
      https://github.com/openvswitch/ovs/commit/8bed11fd283edabe942434451c3b431a61bfba89
  Author: Sairam Venugopal <vsairam at vmware.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M datapath-windows/ovsext/Conntrack-other.c
    M datapath-windows/ovsext/Conntrack-tcp.c

  Log Message:
  -----------
  datapath-windows: Conntrack - Handle memory allocation failure

Return null if Windows fails to allocate memory for the conntrack entry.

Signed-off-by: Sairam Venugopal <vsairam at vmware.com>
Acked-by: Paul-Daniel Boca <pboca at cloudbasesolutions.com>
Acked-by: Nithin Raju <nithin at vmware.com>
Signed-off-by: Gurucharan Shetty <guru at ovn.org>

  Commit: 2e4bd7a144e68f1157a977530a54ddfafacc6b75
      https://github.com/openvswitch/ovs/commit/2e4bd7a144e68f1157a977530a54ddfafacc6b75
  Author: Sairam Venugopal <vsairam at vmware.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M datapath-windows/ovsext/Datapath.c

  Log Message:
  -----------
  datapath-windows: Add support for Conntrack IPCTNL_MSG_CT_GET cmd in Datapath.c

This will be used by userspace for dumping conntrack entries - "ovs-dpctl
dump-conntrack".

Signed-off-by: Sairam Venugopal <vsairam at vmware.com>
Acked-by: Paul-Daniel Boca <pboca at cloudbasesolutions.com>
Acked-by: Nithin Raju <nithin at vmware.com>
Signed-off-by: Gurucharan Shetty <guru at ovn.org>

  Commit: d33f0efaf252862f355cd76ffad4ad1cded009be
      https://github.com/openvswitch/ovs/commit/d33f0efaf252862f355cd76ffad4ad1cded009be
  Author: Sairam Venugopal <vsairam at vmware.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M datapath-windows/ovsext/Conntrack.c

  Log Message:
  -----------
  datapath-windows: Track the number of conntrack entries

Add a counter to track the number of connection tracking entries. Iterate
over the conntrack entry table only if there are entries.

Signed-off-by: Sairam Venugopal <vsairam at vmware.com>
Acked-by: Nithin Raju <nithin at vmware.com>
Signed-off-by: Gurucharan Shetty <guru at ovn.org>

  Commit: e0467f6dfc1b5df216cc192f5aaf65c30c02247c
      https://github.com/openvswitch/ovs/commit/e0467f6dfc1b5df216cc192f5aaf65c30c02247c
  Author: Sairam Venugopal <vsairam at vmware.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M lib/automake.mk
    M lib/dpif-netlink.c
    M lib/netlink-conntrack.c

  Log Message:
  -----------
  Windows: Add conntrack dump and flush support in userspace

Modify dpif-netlink.c and netlink-conntrack.c to send down dump and flush command
to Windows datapath. Include netlink-conntrack.c and netlink-conntrack.h
in automake.mk for Windows binaries.

Windows currently supports only NETLINK_GENERIC port. In order to support
the NETLINK_NETFILTER messages, the port id is being overwritten to
NETLINK_GENERIC on Windows and datapath has been updated to support the
new message format.

Signed-off-by: Sairam Venugopal <vsairam at vmware.com>
Acked-by: Paul-Daniel Boca <pboca at cloudbasesolutions.com>
Acked-by: Nithin Raju <nithin at vmware.com>
Acked-by: Nithin Raju <nithin at vmware.com>
Signed-off-by: Gurucharan Shetty <guru at ovn.org>

  Commit: f5d29e922c0ee44999955dc7f1de37e9e3225527
      https://github.com/openvswitch/ovs/commit/f5d29e922c0ee44999955dc7f1de37e9e3225527
  Author: Sairam Venugopal <vsairam at vmware.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M lib/netlink-conntrack.c

  Log Message:
  -----------
  Windows: Ignore the dpif conversions for windows in netlink-conntrack.c

The flags and state sent by Windows datapath are currently in the
userspace format. So prevent further translation.

Signed-off-by: Sairam Venugopal <vsairam at vmware.com>
Acked-by: Nithin Raju <nithin at vmware.com>
Signed-off-by: Gurucharan Shetty <guru at ovn.org>

Compare: https://github.com/openvswitch/ovs/compare/715038b6b222...f5d29e922c0e