aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

connect_socket(): simplify code a bit.

Browse Source
This commit is contained in:
Laurent MONIN 2006-01-05 18:36:22 +01:00 committed by Laurent MONIN
parent c6dfce8ad8
commit 18649c8988
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/network/socket.c
View File

@ -505,25 +505,20 @@ connect_socket(struct socket *csocket, enum connection_state state)
for (i = connect_info->triedno + 1; i < connect_info->addrno; i++) { for (i = connect_info->triedno + 1; i < connect_info->addrno; i++) {
#ifdef CONFIG_IPV6 #ifdef CONFIG_IPV6
struct sockaddr_in6 addr = *((struct sockaddr_in6 *) &connect_info->addr[i]); struct sockaddr_in6 addr = *((struct sockaddr_in6 *) &connect_info->addr[i]);
int family = addr.sin6_family;
#else #else
struct sockaddr_in addr = *((struct sockaddr_in *) &connect_info->addr[i]); struct sockaddr_in addr = *((struct sockaddr_in *) &connect_info->addr[i]);
int family = addr.sin_family;
#endif #endif
int pf; int pf;
int family;
int force_family = connect_info->ip_family; int force_family = connect_info->ip_family;
#ifdef CONFIG_IPV6
family = addr.sin6_family;
#else
family = addr.sin_family;
#endif
connect_info->triedno++; connect_info->triedno++;
if (only_local) { if (only_local) {
int local = 0; int local = 0;
#ifdef CONFIG_IPV6 #ifdef CONFIG_IPV6
if (addr.sin6_family == AF_INET6) if (family == AF_INET6)
local = check_if_local_address6((struct sockaddr_in6 *) &addr); local = check_if_local_address6((struct sockaddr_in6 *) &addr);
else else
#endif #endif
@ -583,7 +578,7 @@ connect_socket(struct socket *csocket, enum connection_state state)
* something else ;-). --pasky */ * something else ;-). --pasky */
#ifdef CONFIG_IPV6 #ifdef CONFIG_IPV6
if (addr.sin6_family == AF_INET6) { if (family == AF_INET6) {
if (connect(sock, (struct sockaddr *) &addr, if (connect(sock, (struct sockaddr *) &addr,
sizeof(struct sockaddr_in6)) == 0) { sizeof(struct sockaddr_in6)) == 0) {
/* Success */ /* Success */