/*
- * TCP client - connect to a host/port
+ * TCP client - connect to a host/port (FIXME this needs to be IPv6 enabled)
*/
int tcp_connectsock(char *host, int port)
{
&Error);
}
+
/*
* This is a generic function to set up a master socket for listening on
* a TCP port. The server shuts down if the bind fails. (IPv4/IPv6 version)
* 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;
-
- memset(&sin, 0, sizeof(sin));
- sin.sin6_family = AF_INET6;
-
- if ((ip_addr == NULL) || (IsEmptyStr(ip_addr)) || (!strcmp(ip_addr, "0.0.0.0"))) {
- sin.sin6_addr = in6addr_any;
- } else {
- char bind_to[256];
- if ((strchr(ip_addr, '.')) && (!strchr(ip_addr, ':'))) {
- snprintf(bind_to, sizeof bind_to, "::ffff:%s", ip_addr);
- }
- else {
- safestrncpy(bind_to, ip_addr, sizeof bind_to);
+ struct sockaddr_in6 sin6;
+ struct sockaddr_in sin4;
+ int s, i, b;
+ int ip_version = 6;
+
+ 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 IPv6 */
+ || (IsEmptyStr(ip_addr))
+ || (!strcmp(ip_addr, "*"))
+ ) {
+ 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);
}
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));
- #ifndef __APPLE__
- fcntl(s, F_SETFL, O_NONBLOCK); /* maide: this statement is incorrect
- there should be a preceding F_GETFL
- and a bitwise OR with the previous
- fd flags */
- #endif
-
- if (bind(s, (struct sockaddr *) &sin, sizeof(sin)) < 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);
- }
- return (s);
-}
-
-#if 0
-/*
- * This is a generic function to set up a master socket for listening on
- * a TCP port. The server shuts down if the bind fails. (Old IPv4-only version)
- *
- * ip_addr IP address to bind
- * 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)
-{
- struct protoent *p;
- struct sockaddr_in sin;
- int s, i;
-
- memset(&sin, 0, sizeof(sin));
- sin.sin_family = AF_INET;
- if (ip_addr == NULL) {
- sin.sin_addr.s_addr = INADDR_ANY;
- } else {
- sin.sin_addr.s_addr = inet_addr(ip_addr);
- }
-
- if (sin.sin_addr.s_addr == INADDR_NONE) {
- sin.sin_addr.s_addr = INADDR_ANY;
- }
-
- if (port_number == 0) {
- lprintf(1, "Cannot start: no port number specified.\n");
- return (-WC_EXIT_BIND);
+ if (ip_version == 6) {
+ b = bind(s, (struct sockaddr *) &sin6, sizeof(sin6));
}
- sin.sin_port = htons((u_short) port_number);
-
- p = getprotobyname("tcp");
-
- s = socket(PF_INET, SOCK_STREAM, (p->p_proto));
- if (s < 0) {
- lprintf(1, "Can't create an IPv4 socket: %s\n", strerror(errno));
- return (-WC_EXIT_BIND);
+ else {
+ b = bind(s, (struct sockaddr *) &sin4, sizeof(sin4));
}
- /* 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 (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);
}
return (s);
}
-#endif
/*
* 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;