bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2025-07-15 07:33:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Internal: renamed xioopts_t to xioparms_t

Browse source
This commit is contained in:
Gerhard Rieger 2023-06-23 16:21:05 +02:00
parent eeabf31e04
commit 3e282ee7a0
14 changed files with 58 additions and 56 deletions

8
xio-ip.c
View file

@ -273,13 +273,13 @@ int xiogetaddrinfo(const char *node, const char *service,
service = NULL; /* do not resolve later again */
record = res;
if (family == PF_UNSPEC && xioopts.preferred_ip == '0') {
if (family == PF_UNSPEC && xioparms.preferred_ip == '0') {
/* we just take the first result */
family = res[0].ai_addr->sa_family;
}
if (family == PF_UNSPEC) {
int trypf;
trypf = (xioopts.preferred_ip=='6'?PF_INET6:PF_INET);
trypf = (xioparms.preferred_ip=='6'?PF_INET6:PF_INET);
/* we must look for a matching entry */
while (record != NULL) {
if (record->ai_family == trypf) {
@ -339,7 +339,7 @@ int xiogetaddrinfo(const char *node, const char *service,
/* first fallback is getipnodebyname() */
if (family == PF_UNSPEC) {
#if WITH_IP4 && WITH_IP6
family = xioopts.default_ip=='6'?PF_INET6:PF_INET;
family = xioparms.default_ip=='6'?PF_INET6:PF_INET;
#elif WITH_IP6
family = PF_INET6;
#else
@ -390,7 +390,7 @@ int xiogetaddrinfo(const char *node, const char *service,
be useful somewhere sometimes in a future even for IP6 */
if (family == PF_UNSPEC) {
#if WITH_IP4 && WITH_IP6
family = xioopts.default_ip=='6'?PF_INET6:PF_INET;
family = xioparms.default_ip=='6'?PF_INET6:PF_INET;
#elif WITH_IP6
family = PF_INET6;
#else