From 9081014c2c467077723d5ae1d0081003b3eb3504 Mon Sep 17 00:00:00 2001 From: Patrick Monnerat Date: Tue, 16 Dec 2014 13:29:01 +0100 Subject: IPV6: address scope != scope id There was a confusion between these: this commit tries to disambiguate them. - Scope can be computed from the address itself. - Scope id is scope dependent: it is currently defined as 1-based local interface index for link-local scoped addresses, and as a site index(?) for (obsolete) site-local addresses. Linux only supports it for link-local addresses. The URL parser properly parses a scope id as an interface index, but stores it in a field named "scope": confusion. The field has been renamed into "scope_id". Curl_if2ip() used the scope id as it was a scope. This caused failures to bind to an interface. Scope is now computed from the addresses and Curl_if2ip() matches them. If redundantly specified in the URL, scope id is check for mismatch with the interface index. This commit should fix SF bug #1451. --- lib/imap.c | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/imap.c') diff --git a/lib/imap.c b/lib/imap.c index cd96cd804..86cfcf51e 100644 --- a/lib/imap.c +++ b/lib/imap.c @@ -61,7 +61,6 @@ #include #include "urldata.h" #include "sendf.h" -#include "if2ip.h" #include "hostip.h" #include "progress.h" #include "transfer.h" -- cgit v1.2.3