romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 04:13:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

socket: support binding to interface *AND* IP

Browse source 
Introduce new notation for CURLOPT_INTERFACE / --interface:
ifhost!<interface>!<host>

Binding to an interface doesn't set the address, and an interface can
have multiple addresses.

When binding to an address (without interface), the kernel is free to
choose the route, and it can route through any device that can access
the target address, not necessarily the one with the chosen address.

Moreover, it is possible for different interfaces to have the same IP
address, on which case we need to provide a way to be more specific.

Factor out the parsing part of interface option, and add unit tests:
1663.

Closes #13719
This commit is contained in:
Orgad Shaneh 2024-05-17 14:44:44 +03:00 • committed by Daniel Stenberg
parent 23fe1a52dc
commit 3060557af7
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
10 changed files with 322 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/data/Makefile.inc
View file

@ -211,7 +211,7 @@ test1620 test1621 \
test1630 test1631 test1632 test1633 test1634 test1635 \
\
test1650 test1651 test1652 test1653 test1654 test1655 \
test1660 test1661 test1662 \
test1660 test1661 test1662 test1663 \
\
test1670 test1671 \
\

23
tests/data/test1663 Normal file
View file

@ -0,0 +1,23 @@
<testcase>
<info>
<keywords>
unittest
interface
bind
</keywords>
</info>
#
# Client-side
<client>
<server>
none
</server>
<features>
unittest
</features>
<name>
unit tests for interface option parsing
</name>
</client>
</testcase>

4
tests/unit/Makefile.inc
View file

@ -37,7 +37,7 @@ UNITPROGS = unit1300 unit1302 unit1303 unit1304 unit1305 unit1307 \
unit1608 unit1609 unit1610 unit1611 unit1612 unit1614 unit1615 unit1616 \
unit1620 unit1621 \
unit1650 unit1651 unit1652 unit1653 unit1654 unit1655 \
unit1660 unit1661 \
unit1660 unit1661 unit1663 \
unit2600 unit2601 unit2602 unit2603 unit2604 \
unit3200 \
unit3205
@ -126,6 +126,8 @@ unit1660_SOURCES = unit1660.c $(UNITFILES)
unit1661_SOURCES = unit1661.c $(UNITFILES)
unit1663_SOURCES = unit1663.c $(UNITFILES)
unit2600_SOURCES = unit2600.c $(UNITFILES)
unit2601_SOURCES = unit2601.c $(UNITFILES)

98
tests/unit/unit1663.c Normal file
View file

@ -0,0 +1,98 @@
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
* / __| | | | |_) | |
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at https://curl.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
* furnished to do so, under the terms of the COPYING file.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
* SPDX-License-Identifier: curl
*
***************************************************************************/
#include "curlcheck.h"
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
#ifdef HAVE_NETINET_IN6_H
#include <netinet/in6.h>
#endif
#include <curl/curl.h>
#include "cf-socket.h"
#include "memdebug.h" /* LAST include file */
static CURLcode unit_setup(void)
{
CURLcode res = CURLE_OK;
global_init(CURL_GLOBAL_ALL);
return res;
}
static void unit_stop(void)
{
curl_global_cleanup();
}
static void test_parse(
const char *input,
const char *exp_dev,
const char *exp_iface,
const char *exp_host,
CURLcode exp_rc)
{
char *dev = NULL;
char *iface = NULL;
char *host = NULL;
CURLcode rc = Curl_parse_interface(
input, strlen(input), &dev, &iface, &host);
fail_unless(rc == exp_rc, "Curl_parse_interface() failed");
fail_unless(!!exp_dev == !!dev, "dev expectation failed.");
fail_unless(!!exp_iface == !!iface, "iface expectation failed");
fail_unless(!!exp_host == !!host, "host expectation failed");
if(!unitfail) {
fail_unless(!exp_dev || strcmp(dev, exp_dev) == 0,
"dev should be equal to exp_dev");
fail_unless(!exp_iface || strcmp(iface, exp_iface) == 0,
"iface should be equal to exp_iface");
fail_unless(!exp_host || strcmp(host, exp_host) == 0,
"host should be equal to exp_host");
}
free(dev);
free(iface);
free(host);
}
UNITTEST_START
{
test_parse("dev", "dev", NULL, NULL, CURLE_OK);
test_parse("if!eth0", NULL, "eth0", NULL, CURLE_OK);
test_parse("host!myname", NULL, NULL, "myname", CURLE_OK);
test_parse("ifhost!eth0!myname", NULL, "eth0", "myname", CURLE_OK);
test_parse("", NULL, NULL, NULL, CURLE_BAD_FUNCTION_ARGUMENT);
test_parse("!", "!", NULL, NULL, CURLE_OK);
test_parse("if!", NULL, NULL, NULL, CURLE_BAD_FUNCTION_ARGUMENT);
test_parse("if!eth0!blubb", NULL, "eth0!blubb", NULL, CURLE_OK);
test_parse("host!", NULL, NULL, NULL, CURLE_BAD_FUNCTION_ARGUMENT);
test_parse("ifhost!", NULL, NULL, NULL, CURLE_BAD_FUNCTION_ARGUMENT);
test_parse("ifhost!eth0", NULL, NULL, NULL, CURLE_BAD_FUNCTION_ARGUMENT);
test_parse("ifhost!eth0!", NULL, NULL, NULL, CURLE_BAD_FUNCTION_ARGUMENT);
}
UNITTEST_STOP