tree 69fc09bc5d6255cd7db81d558510f4c375847897
parent f82ab9ab11840ca0bd6ed9656e34c934ab1c417b
parent dfcea9f6a09ead01089a3c9d20c7032f2c0af2c1
author Tamir Duberstein <tamird@google.com> 1579298037 -0500
committer Tamir Duberstein <tamird@google.com> 1579561981 -0500
mergetag object dfcea9f6a09ead01089a3c9d20c7032f2c0af2c1
 type commit
 tag 3.7
 tagger Bruce A. Mah <bmah@es.net> 1561085100 -0700
 
 tagging 3.7
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEE+Fo4IENp9xo01E6DSYSRCoyq7ooFAl0MRK0ACgkQSYSRCoyq
 7op8gQf+OPXa/pvePGgid3hvYifjFjBAloIs2rYFHJVcP3EtF1gxoY7ZFqS/TLIf
 M+ln/V1sv8FpqPxX0/ICAEiHgIy0BOfXYD/3wqIkRRJ50UK13vycvtNZEFzCBbch
 0P1Uue0dflzbfrP4EFJAukFSBhVjBS9w9c6ZJCb2XMM/6gOXthQ2FbufBOrDNzb7
 skhAuCqrYhNdAhOyWmbuwtu1tUcHOyb2LyPEI/PGDhVwjSkOA3mOfAbF4aAzOCLs
 MjD4rnUEUJQvCtcaqZ8p2eWFd/oTbmxU2KyAi+qvFlIpqLZORM1T29F1bms5RG3B
 y0aYmAX/YDP0xJHq+fYGOk4WH+mFxA==
 =pPCM
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCgAdFiEEGdbxTRDxXfPwlFQKMuM+wV4f7zwFAl4mNAUACgkQMuM+wV4f
 7zzEngv/VmcbHkU4DerEmN1Vic8Y1UMq5H6IE+N+o3vrYwZvL096Su+GrxgIFc/1
 OlD3Kt7ombKw+urRPz1OU1H3vV3TiSq6KHGu2UEacpWFI/80xrmrR1ch/6ZJgXho
 L/ESwNNyIzBigF8IKEohrPuWERs4N6bAPlUClVADyr2CnDWrAKLqJIGkZA10mf6q
 GpRkvC9gBPkTusivxZVPowaDH2cf0IBubdHgTTjfiBfaGMJYQrsXsyGIUNSMhHfm
 HsSA3dG7otJKPpKF38snlvIZENUBjL0462Sc62KFTHLaraBxNRJs11ZeeLgWVY1+
 XxJBY1ZEd1XngXMQZdjBE57b8CnT8QrNC7wLE6dDmR1Hc7N//v00rxRYZ57buioK
 dKiTSsUEM2/ZjKl43oz7JJ3iH79aOjZGRwXKSFafjSKbHI1qke+gsN+qcpbdxSUB
 +kKmzj8zmbA/5wrh9AemVw+fjS7pwlGuA2gkvB95o2m7fM1D9sXQBDrAgz01odYZ
 7RshJoX7
 =Bitr
 -----END PGP SIGNATURE-----

Merge tag '3.7' into HEAD

This removes a bunch of workarounds which are no longer necessary,
greatly reducing the diff between us and upstream. The diffstat is now:

  .gitignore                   |   2 --
  BUILD.gn                     |  93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  README.fuchsia               |  19 +++++++++++++++++++
  meta/iperf3.cmx              |  13 +++++++++++++
  src/fuchsia/fuchsia-compat.c | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  src/fuchsia/fuchsia-compat.h |  16 ++++++++++++++++
  src/iperf_api.c              |   2 ++
  src/iperf_client_api.c       |   7 +++++++
  src/iperf_config.h           | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  src/iperf_sctp.c             |   5 +++++
  src/iperf_server_api.c       |  10 ++++++++++
  src/iperf_tcp.c              |   5 +++++
  src/iperf_util.c             |  30 ++++++++++++++++++++++++++++++
  src/main.c                   |   3 ++-
  src/net.c                    |   5 +++++
  src/version.h                |  27 +++++++++++++++++++++++++++
  16 files changed, 529 insertions(+), 3 deletions(-)

which should make future merges simpler.

Test:
  as client: fx shell iperf3 -c fe80::2bb1:ddd5:10c7:d54e%2
  as server: fx shell iperf3 -s -6 # exercises IPV6_ONLY

Change-Id: I9fb62d791c9ed4420692fc9e75fe7a01ff3e0372