[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 37/41: ipv6_scope: support unique local addresses
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 37/41: ipv6_scope: support unique local addresses |
Date: |
Sun, 20 Aug 2017 20:46:59 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.55.1
in repository gnurl.
commit b748d7af7ea4bb9baf5517cc53756f8d4d7be1ca
Author: Daniel Stenberg <address@hidden>
AuthorDate: Sun Aug 13 17:51:52 2017 +0200
ipv6_scope: support unique local addresses
Fixes #1764
Closes #1773
Reported-by: James Slaughter
---
lib/if2ip.c | 4 +++-
lib/if2ip.h | 5 +++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/lib/if2ip.c b/lib/if2ip.c
index 3e74cc687..a91b6d2ab 100644
--- a/lib/if2ip.c
+++ b/lib/if2ip.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2016, Daniel Stenberg, <address@hidden>, et al.
+ * Copyright (C) 1998 - 2017, Daniel Stenberg, <address@hidden>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -71,6 +71,8 @@ unsigned int Curl_ipv6_scope(const struct sockaddr *sa)
const unsigned char *b = sa6->sin6_addr.s6_addr;
unsigned short w = (unsigned short) ((b[0] << 8) | b[1]);
+ if((b[0] & 0xFE) == 0xFC) /* Handle ULAs */
+ return IPV6_SCOPE_UNIQUELOCAL;
switch(w & 0xFFC0) {
case 0xFE80:
return IPV6_SCOPE_LINKLOCAL;
diff --git a/lib/if2ip.h b/lib/if2ip.h
index f3a7ff0b2..a90e66216 100644
--- a/lib/if2ip.h
+++ b/lib/if2ip.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2014, Daniel Stenberg, <address@hidden>, et al.
+ * Copyright (C) 1998 - 2017, Daniel Stenberg, <address@hidden>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -27,7 +27,8 @@
#define IPV6_SCOPE_GLOBAL 0 /* Global scope. */
#define IPV6_SCOPE_LINKLOCAL 1 /* Link-local scope. */
#define IPV6_SCOPE_SITELOCAL 2 /* Site-local scope (deprecated). */
-#define IPV6_SCOPE_NODELOCAL 3 /* Loopback. */
+#define IPV6_SCOPE_UNIQUELOCAL 3 /* Unique local */
+#define IPV6_SCOPE_NODELOCAL 4 /* Loopback. */
unsigned int Curl_ipv6_scope(const struct sockaddr *sa);
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 27/41: curl/system.h: add Oracle Solaris Studio, (continued)
- [GNUnet-SVN] [gnurl] 27/41: curl/system.h: add Oracle Solaris Studio, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 30/41: connect-to.d: better language, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 24/41: docs: fix typo stuct -> struct, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 23/41: test1447: require a curl with http support, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 13/41: mkhelp.pl: allow executing this script directly, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 31/41: cmake: allow user to override CMAKE_DEBUG_POSTFIX, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 25/41: docs: fix grammar in CURL_SSLVERSION_MAX_DEFAULT description, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 22/41: curl/system.h: support more architectures, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 29/41: connect-to.d: clarified, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 12/41: configure: use the threaded resolver backend by default if possible, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 37/41: ipv6_scope: support unique local addresses,
gnunet <=
- [GNUnet-SVN] [gnurl] 35/41: test1448: verify redirect to IDN using URL, gnunet, 2017/08/20
- [GNUnet-SVN] [gnurl] 41/41: Patchset for gnURL microfork: * Patches to rename libcurl to libgnurl by Christian * Updated for latest curl using git cherry-pick by Jeff, Florian, ng0 * Patches to fix the testsuite (deleted tests/data/test1139, renamed reference from libcurl.* to libgnurl.*) by ng0 * Added guix-gnurl.scm which can be used to build this with guix prior to installing it. (author: ng0) * Further adjustments by ng0 * 7.55.0: Manual addition of a7bbbb7c368c6096802007f61f19a02e9d75285b and f864bd8c880d5a91637 [...], gnunet, 2017/08/20