ports/iperf3
ports/iperf3
1
1
Форкнуть 0
Код Релизы Активность

Make -c and -B work similar with respect to "%" interface specifications.

Просмотр исходного кода 
IPv6 link-local address literals are accepted in both places.
Note that we might not work correctly in the presumably rare case
of a FQDN that resolves to an IPv6 link-local address.

"%" is always treated as a separator for a shortcut to --bind-dev,
for IPv4 and IPv6 literals as well as hostnames passed to -c and -B.
Этот коммит содержится в:
Bruce A. Mah 2021-09-23 11:14:30 -07:00
родитель 36e812992c
Коммит 42436be796
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4984910A8CAAEE8A
1 изменённых файлов: 61 добавлений и 28 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

89
src/iperf_api.c
Просмотреть файл

@ -1103,25 +1103,39 @@ iperf_parse_arguments(struct iperf_test *test, int argc, char **argv)
}
iperf_set_test_role(test, 'c');
iperf_set_test_server_hostname(test, optarg);
// hostname should be extended with `%<dev>` for IPv6 link-local addresses
if ((p = strtok(optarg, "%")) != NULL) {
p1 = strtok(NULL, "%");
if (inet_pton(AF_INET6, p, &ipv6_addr) == 1) {
if (IN6_IS_ADDR_LINKLOCAL(&ipv6_addr)) {
if (!p1) {
i_errno = IEHOSTDEV;
}
} else if (p1) {
i_errno = IEHOSTDEV;
}
} else { //IPv4
if (p1) {
i_errno = IEHOSTDEV;
}
/*
* See if there's a "%", if so, get the name and
* address part.
*/
if ((p = strtok(optarg, "%")) != NULL &&
(p1 = strtok(NULL, "%")) != NULL) {
/*
* If it's an IPv6 literal for link-local, then
* leave the "%" in the hostname.
*/
if (inet_pton(AF_INET6, p, &ipv6_addr) == 1 &&
IN6_IS_ADDR_LINKLOCAL(&ipv6_addr)) {
if (test->debug)
iperf_printf(test, "IPv6 link local address literal detected\n");
}
if (i_errno == IEHOSTDEV) {
/*
* Any other kind of address, or FQDN. The interface
* name after "%" is a shorthand for --bind-dev.
*/
else {
#if defined(HAVE_SO_BINDTODEVICE)
/* Get rid of the hostname we saved earlier. */
free(iperf_get_test_server_hostname(test));
iperf_set_test_server_hostname(test, p);
iperf_set_test_bind_dev(test, p1);
#else /* HAVE_SO_BINDTODEVICE */
i_errno = IEBINDDEVNOSUPPORT;
return -1;
}
#endif /* HAVE_SO_BINDTODEVICE */
}
}
break;
case 'u':
@ -1234,25 +1248,44 @@ iperf_parse_arguments(struct iperf_test *test, int argc, char **argv)
test->settings->socket_bufsize = (int) farg;
client_flag = 1;
break;
case 'B':
// IP ddress format is <addr>[%<device>]
if ((p = strtok(optarg, "%")) == NULL)
test->bind_address = strdup(optarg);
else {
test->bind_address = strdup(p);
if ((p = strtok(NULL, "%")) != NULL) {
#if defined (HAVE_SO_BINDTODEVICE)
test->bind_dev = strdup(p);
iperf_set_test_bind_address(test, optarg);
// IP address format is <addr>[%<device>]
if ((p = strtok(optarg, "%")) != NULL &&
(p1 = strtok(NULL, "%")) != NULL) {
/*
* If it's an IPv6 literal for link-local, then
* leave the "%" in the hostname.
*/
if (inet_pton(AF_INET6, p, &ipv6_addr) == 1 &&
IN6_IS_ADDR_LINKLOCAL(&ipv6_addr)) {
if (test->debug)
iperf_printf(test, "IPv6 link local address literal detected\n");
}
/*
* Other kind of address or FQDN. The interface name
* after "%" is a shorthand for --bind-dev.
*/
else {
#if defined(HAVE_SO_BINDTODEVICE)
/* Get rid of the hostname we saved earlier. */
free(iperf_get_test_bind_address(test));
iperf_set_test_bind_address(test, p);
iperf_set_test_bind_dev(test, p1);
#else /* HAVE_SO_BINDTODEVICE */
i_errno = IEBINDDEVNOSUPPORT;
return -1;
i_errno = IEBINDDEVNOSUPPORT;
return -1;
#endif /* HAVE_SO_BINDTODEVICE */
}
}
break;
#if defined (HAVE_SO_BINDTODEVICE)
case OPT_BIND_DEV:
test->bind_dev = strdup(optarg);
iperf_set_test_bind_dev(test, optarg);
break;
#endif /* HAVE_SO_BINDTODEVICE */
case OPT_CLIENT_PORT: