Resynchronise with upstream libutp.c, commit 4be31bb7.

diff --git a/third-party/libutp/README.md b/third-party/libutp/README.md
index d7fca4c66bbf0da79855f5817665143838020680..83270e69e9baf167b926826036800b9fa597a857 100644 (file)
--- a/third-party/libutp/README.md
+++ b/third-party/libutp/README.md
@@ -45,6 +45,13 @@ from libutp:
 
     cd utp_test && make
 
+## Packaging and API
+
+The libutp API is considered unstable, and probably always will be. We encourage
+you to test with the version of libutp you have, and be mindful when upgrading.
+For this reason, it is probably also a good idea to bundle libutp with your
+application.
+
 ## License
 
 libutp is released under the [MIT][lic] license.

diff --git a/third-party/libutp/utp.cpp b/third-party/libutp/utp.cpp
index 17d6e720dd4b94f18d5e8dc5ce428a569994a574..db99c8ffa2e9df03306a68c56af546ec45e2d149 100644 (file)
--- a/third-party/libutp/utp.cpp
+++ b/third-party/libutp/utp.cpp
@@ -120,7 +120,7 @@ struct PACKED_ATTRIBUTE PackedSockAddr {
 
        byte get_family() const
        {
-               return (IN6_IS_ADDR_V4MAPPED((in6_addr*)_sin6) != 0) ? AF_INET : AF_INET6;
+               return (IN6_IS_ADDR_V4MAPPED(&_in._in6addr) != 0) ? AF_INET : AF_INET6;
        }
 
        bool operator==(const PackedSockAddr& rhs) const