util: use common functions to convert to/from sockaddr

This commit is contained in:
Miroslav Lichvar
2014-09-26 17:49:07 +02:00
parent 2db20adc3e
commit 55a22656b8
6 changed files with 84 additions and 123 deletions

View File

@@ -124,32 +124,21 @@ open_io(const char *hostname, int port)
exit(1);
}
memset(&his_addr, 0, sizeof (his_addr));
switch (ip.family) {
case IPADDR_INET4:
sock_fd = socket(AF_INET, SOCK_DGRAM, 0);
his_addr.in4.sin_family = AF_INET;
his_addr.in4.sin_addr.s_addr = htonl(ip.addr.in4);
his_addr.in4.sin_port = htons(port);
his_addr_len = sizeof (his_addr.in4);
break;
#ifdef FEAT_IPV6
case IPADDR_INET6:
sock_fd = socket(AF_INET6, SOCK_DGRAM, 0);
his_addr.in6.sin6_family = AF_INET6;
memcpy(his_addr.in6.sin6_addr.s6_addr, ip.addr.in6,
sizeof (his_addr.in6.sin6_addr.s6_addr));
his_addr.in6.sin6_port = htons(port);
his_addr_len = sizeof (his_addr.in6);
break;
#endif
default:
assert(0);
}
his_addr_len = UTI_IPAndPort2Sockaddr(&ip, port, &his_addr.u);
if (sock_fd < 0) {
perror("Can't create socket");
exit(1);