sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

util: use SCOPE_DELIMITER for the IPv6 scope delimiter

Browse Source 
Signed-off-by: Bjoern Jacke <bj@sernet.de>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Björn Jacke <bj@sernet.de>
Autobuild-Date(master): Fri Dec  9 20:45:15 CET 2016 on sn-devel-144
This commit is contained in:
Björn Jacke 2016-12-08 17:53:43 +01:00 committed by Bjoern Jacke
parent bfc6adfb20
commit 44a01a2d3d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/util/util_net.c
View File

@ -86,7 +86,7 @@ static char *normalize_ipv6_literal(const char *str, char *buf, size_t *_len)
cnt_delimiter += 1;
break;
case 's':
buf[i] = '%';
buf[i] = SCOPE_DELIMITER;
idx_chars += 1;
break;
case '0':
@ -131,7 +131,7 @@ static char *normalize_ipv6_literal(const char *str, char *buf, size_t *_len)
for (; idx_chars != 0 && i < len; i++) {
switch (str[i]) {
case '%':
case SCOPE_DELIMITER:
case ':':
return NULL;
default:
@ -185,7 +185,7 @@ bool interpret_string_addr_internal(struct addrinfo **ppres,
}
if (strchr_m(str, ':')) {
char *p = strchr_m(str, '%');
char *p = strchr_m(str, SCOPE_DELIMITER);
/*
* Cope with link-local.
@ -502,7 +502,7 @@ bool is_ipaddress_v6(const char *str)
unsigned int idx = 0;
struct in6_addr ip6;
p = strchr_m(str, '%');
p = strchr_m(str, SCOPE_DELIMITER);
if (p && (p > str)) {
len = PTR_DIFF(p, str);
idxs = p + 1;