[ovs-git] [openvswitch/ovs] addbb5: conntrack: fix tcp seq adjustments when mangling c...

GitHub noreply at github.com
Wed Jan 23 00:00:23 UTC 2019


  Branch: refs/heads/branch-2.9
  Home:   https://github.com/openvswitch/ovs
  Commit: addbb52274aee8392eda64bb1a7ffb9f54827f87
      https://github.com/openvswitch/ovs/commit/addbb52274aee8392eda64bb1a7ffb9f54827f87
  Author: David Marchand <david.marchand at redhat.com>
  Date:   2019-01-22 (Tue, 22 Jan 2019)

  Changed paths:
    M Vagrantfile
    M Vagrantfile-FreeBSD
    M lib/conntrack.c
    M tests/atlocal.in
    M tests/system-traffic.at

  Log Message:
  -----------
  conntrack: fix tcp seq adjustments when mangling commands.

The ftp alg deals with packets in two ways for the command connection:
either they are inspected and can be mangled when nat is enabled
(CT_FTP_CTL_INTEREST) or they just go through without being modified
(CT_FTP_CTL_OTHER).

For CT_FTP_CTL_INTEREST packets, we must both adjust the packet tcp seq
number by the connection current offset, then prepare for the next
packets by setting an accumulated offset in the ct object.  However,
this was not done for multiple CT_FTP_CTL_INTEREST packets for the same
connection.
This is relevant for handling multiple child data connections that also
need natting.

The tests are updated so that some ftp+NAT tests send multiple port
commands or other similar commands for a single control connection.
Wget is not able to do this, so switch to lftp.

Fixes: bd5e81a0e596 ("Userspace Datapath: Add ALG infra and FTP.")
Co-authored-by: Darrell Ball <dlu998 at gmail.com>
Signed-off-by: Darrell Ball <dlu998 at gmail.com>
Signed-off-by: David Marchand <david.marchand at redhat.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: 24c50444a611e6949a2c50153c0930dc29d3d44f
      https://github.com/openvswitch/ovs/commit/24c50444a611e6949a2c50153c0930dc29d3d44f
  Author: David Marchand <david.marchand at redhat.com>
  Date:   2019-01-22 (Tue, 22 Jan 2019)

  Changed paths:
    M lib/conntrack.c
    M tests/system-traffic.at

  Log Message:
  -----------
  conntrack: fix expectations for ftp+DNAT.

When configuring the nat part of an expectation, care must be taken to
look at the master nat action and direction to properly reproduce it.

DNAT tests have been added to both active and passive modes, all
ftp/tftp tests titles have been updated to reflect they are dealing with
SNAT.

Fixes: bd5e81a0e596 ("Userspace Datapath: Add ALG infra and FTP.")
Co-authored-by: Darrell Ball <dlu998 at gmail.com>
Signed-off-by: Darrell Ball <dlu998 at gmail.com>
Signed-off-by: David Marchand <david.marchand at redhat.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


  Commit: 668c59e0c89a69775df0010f703e41c0c176a33e
      https://github.com/openvswitch/ovs/commit/668c59e0c89a69775df0010f703e41c0c176a33e
  Author: Darrell Ball <dlu998 at gmail.com>
  Date:   2019-01-22 (Tue, 22 Jan 2019)

  Changed paths:
    M lib/conntrack.c

  Log Message:
  -----------
  conntrack: Fix FTP seq_skew boundary adjustments.

At the same time, splice out a function and also rely on the compiler
for overflow/underflow handling.

Found by inspection.

Fixes: bd5e81a0e596 ("Userspace Datapath: Add ALG infra and FTP.")
Signed-off-by: Darrell Ball <dlu998 at gmail.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>


Compare: https://github.com/openvswitch/ovs/compare/4b51f868e8a3...668c59e0c89a
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.


More information about the git mailing list