X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Ftcp_sockets.c;h=fa37c18d3a7ff42f0264cb8f4e02427480f54144;hb=981a324cf4ad0365808ba1c6e2fdc324086f212a;hp=a32285b7d959b08b501d3dcfdb0bc1db8d210e03;hpb=5867a09ba4ea152b1b5deb380a1b287748b565dc;p=citadel.git diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c index a32285b7d..fa37c18d3 100644 --- a/webcit/tcp_sockets.c +++ b/webcit/tcp_sockets.c @@ -69,41 +69,80 @@ int uds_connectsock(char *sockpath) /* - * TCP client - connect to a host/port (FIXME this needs to be IPv6 enabled) + * TCP client - connect to a host/port */ -int tcp_connectsock(char *host, int port) +int tcp_connectsock(char *host, char *service) { - struct sockaddr_in stSockAddr; - int rv; - int sock; - - sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); - if (sock < 0) { - lprintf(1, "Can't create socket: %s\n", strerror(errno)); + struct in6_addr serveraddr; + struct addrinfo hints; + struct addrinfo *res = NULL; + struct addrinfo *ai = NULL; + int rc = (-1); + int s = (-1); + + if ((host == NULL) || IsEmptyStr(host)) + return (-1); + if ((service == NULL) || IsEmptyStr(service)) return (-1); + + lprintf(9, "tcp_connectsock(%s,%s)\n", host, service); + + memset(&hints, 0x00, sizeof(hints)); + hints.ai_flags = AI_NUMERICSERV; + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + + /* + * Handle numeric IPv4 and IPv6 addresses + */ + rc = inet_pton(AF_INET, host, &serveraddr); + if (rc == 1) { /* dotted quad */ + hints.ai_family = AF_INET; + hints.ai_flags |= AI_NUMERICHOST; + } else { + rc = inet_pton(AF_INET6, host, &serveraddr); + if (rc == 1) { /* IPv6 address */ + hints.ai_family = AF_INET6; + hints.ai_flags |= AI_NUMERICHOST; + } } - memset(&stSockAddr, 0, sizeof(struct sockaddr_in)); - stSockAddr.sin_family = AF_INET; - stSockAddr.sin_port = htons(port); - rv = inet_pton(AF_INET, host, &stSockAddr.sin_addr); + /* Begin the connection process */ - if (rv <= 0) { - lprintf(1, "Can't grok %s: %s\n", host, strerror(errno)); - return (-1); + rc = getaddrinfo(host, service, &hints, &res); + if (rc != 0) { + lprintf(1, "%s: %s\n", host, gai_strerror(rc)); + return(-1); } - if (connect(sock, (const struct sockaddr *)&stSockAddr, sizeof(struct sockaddr_in)) != 0) { - lprintf(1, "Can't connect to %s.%d: %s\n", host, port, strerror(errno)); - close(sock); - return (-1); + /* + * Try all available addresses until we connect to one or until we run out. + */ + for (ai = res; ai != NULL; ai = ai->ai_next) { + + if (ai->ai_family == AF_INET) lprintf(9, "Trying IPv4\n"); + else if (ai->ai_family == AF_INET6) lprintf(9, "Trying IPv6\n"); + else lprintf(9, "This is going to fail.\n"); + + s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); + if (s < 0) { + lprintf(1, "socket() failed: %s\n", strerror(errno)); + return(-1); + } + rc = connect(s, res->ai_addr, res->ai_addrlen); + if (rc >= 0) { + return(s); + } + else { + lprintf(1, "connect() failed: %s\n", strerror(errno)); + close(s); + } } - return (sock); + return(-1); } - /* * input string from pipe */ @@ -499,30 +538,43 @@ int ClientGetLine(ParsedHttpHdrs *Hdr, StrBuf *Target) * port_number port number to bind * queue_len number of incoming connections to allow in the queue */ -int ig_tcp_server(char *ip_addr, int port_number, int queue_len) +int webcit_tcp_server(char *ip_addr, int port_number, int queue_len) { struct protoent *p; - struct sockaddr_in6 sin; - int s, i; + struct sockaddr_in6 sin6; + struct sockaddr_in sin4; + int s, i, b; + int ip_version = 6; - memset(&sin, 0, sizeof(sin)); - sin.sin6_family = AF_INET6; + memset(&sin6, 0, sizeof(sin6)); + memset(&sin4, 0, sizeof(sin4)); + sin6.sin6_family = AF_INET6; + sin4.sin_family = AF_INET; - if ( (ip_addr == NULL) /* any address */ + if ( (ip_addr == NULL) /* any IPv6 */ || (IsEmptyStr(ip_addr)) - || (!strcmp(ip_addr, "0.0.0.0")) || (!strcmp(ip_addr, "*")) ) { - sin.sin6_addr = in6addr_any; - } else { - char bind_to[256]; - if ((strchr(ip_addr, '.')) && (!strchr(ip_addr, ':'))) { /* specific IPv4 */ - snprintf(bind_to, sizeof bind_to, "::ffff:%s", ip_addr); - } - else { - safestrncpy(bind_to, ip_addr, sizeof bind_to); /* specific IPv6 */ + ip_version = 6; + sin6.sin6_addr = in6addr_any; + } + else if (!strcmp(ip_addr, "0.0.0.0")) /* any IPv4 */ + { + ip_version = 4; + sin4.sin_addr.s_addr = INADDR_ANY; + } + else if ((strchr(ip_addr, '.')) && (!strchr(ip_addr, ':'))) /* specific IPv4 */ + { + ip_version = 4; + if (inet_pton(AF_INET, ip_addr, &sin4.sin_addr) <= 0) { + lprintf(1, "Error binding to [%s] : %s\n", ip_addr, strerror(errno)); + return (-WC_EXIT_BIND); } - if (inet_pton(AF_INET6, bind_to, &sin.sin6_addr) <= 0) { + } + else /* specific IPv6 */ + { + ip_version = 6; + if (inet_pton(AF_INET6, ip_addr, &sin6.sin6_addr) <= 0) { lprintf(1, "Error binding to [%s] : %s\n", ip_addr, strerror(errno)); return (-WC_EXIT_BIND); } @@ -532,23 +584,32 @@ int ig_tcp_server(char *ip_addr, int port_number, int queue_len) lprintf(1, "Cannot start: no port number specified.\n"); return (-WC_EXIT_BIND); } - sin.sin6_port = htons((u_short) port_number); + sin6.sin6_port = htons((u_short) port_number); + sin4.sin_port = htons((u_short) port_number); p = getprotobyname("tcp"); - s = socket(PF_INET6, SOCK_STREAM, (p->p_proto)); + s = socket( ((ip_version == 6) ? PF_INET6 : PF_INET), SOCK_STREAM, (p->p_proto)); if (s < 0) { - lprintf(1, "Can't create an IPv6 socket: %s\n", strerror(errno)); + lprintf(1, "Can't create a listening socket: %s\n", strerror(errno)); return (-WC_EXIT_BIND); } /* Set some socket options that make sense. */ i = 1; setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)); - if (bind(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) { + if (ip_version == 6) { + b = bind(s, (struct sockaddr *) &sin6, sizeof(sin6)); + } + else { + b = bind(s, (struct sockaddr *) &sin4, sizeof(sin4)); + } + + if (b < 0) { lprintf(1, "Can't bind: %s\n", strerror(errno)); return (-WC_EXIT_BIND); } + if (listen(s, queue_len) < 0) { lprintf(1, "Can't listen: %s\n", strerror(errno)); return (-WC_EXIT_BIND); @@ -562,7 +623,7 @@ int ig_tcp_server(char *ip_addr, int port_number, int queue_len) * sockpath - file name of the unix domain socket * queue_len - Number of incoming connections to allow in the queue */ -int ig_uds_server(char *sockpath, int queue_len) +int webcit_uds_server(char *sockpath, int queue_len) { struct sockaddr_un addr; int s;