/*
- * TCP client - connect to a host/port
+ * 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, ai->ai_addr, ai->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
*/
return rc;
}
+
+void FlushReadBuf (void)
+{
+ long len;
+ const char *pch;
+ const char *pche;
+ wcsession *WCC = WC;
+
+ len = StrLength(WCC->ReadBuf);
+ if ((len > 0) &&
+ (WCC->ReadPos != NULL) &&
+ (WCC->ReadPos != StrBufNOTNULL))
+
+ {
+ pch = ChrPtr(WCC->ReadBuf);
+ pche = pch + len;
+ if (WCC->ReadPos != pche)
+ {
+ lprintf(1, "ERROR: somebody didn't eat his soup! Remaing Chars: %d [%s]\n",
+ pche - WCC->ReadPos, pche);
+ lprintf(1,
+ "--------------------------------------------------------------------------------\n"
+ "Whole buf: [%s]\n"
+ "--------------------------------------------------------------------------------\n",
+ pch);
+ AppendImportantMessage(HKEY("Suppenkasper alert! watch your webcit logfile and get connected to your favourite opensource Crew."));
+ }
+ }
+
+ FlushStrBuf(WCC->ReadBuf);
+ WCC->ReadPos = NULL;
+
+
+}
+
+
/*
* send binary to server
* buf the buffer to write to citadel server
int bytes_written = 0;
int retval;
- FlushStrBuf(WCC->ReadBuf);
- WCC->ReadPos = NULL;
+ FlushReadBuf();
while (bytes_written < nbytes) {
retval = write(WCC->serv_sock, &buf[bytes_written],
nbytes - bytes_written);
*/
void serv_puts(const char *string)
{
- wcsession *WCC = WC;
#ifdef SERV_TRACE
lprintf(9, "%3d>>>%s\n", WC->serv_sock, string);
#endif
- FlushStrBuf(WCC->ReadBuf);
- WCC->ReadPos = NULL;
+ FlushReadBuf();
serv_write(string, strlen(string));
serv_write("\n", 1);
*/
void serv_putbuf(const StrBuf *string)
{
- wcsession *WCC = WC;
#ifdef SERV_TRACE
lprintf(9, "%3d>>>%s\n", WC->serv_sock, ChrPtr(string));
#endif
- FlushStrBuf(WCC->ReadBuf);
- WCC->ReadPos = NULL;
+ FlushReadBuf();
serv_write(ChrPtr(string), StrLength(string));
serv_write("\n", 1);
*/
void serv_printf(const char *format,...)
{
- wcsession *WCC = WC;
va_list arg_ptr;
char buf[SIZ];
size_t len;
- FlushStrBuf(WCC->ReadBuf);
- WCC->ReadPos = NULL;
+ FlushReadBuf();
va_start(arg_ptr, format);
vsnprintf(buf, sizeof buf, format, arg_ptr);
if (MaxRead == -1)
{
- serv_printf("READ %d|%d", 0, total_len);
+ serv_printf("READ %d|"SIZE_T_FMT, 0, total_len);
if (StrBuf_ServGetln(Buf) > 0)
{
long YetRead;
&Error);
}
-#ifdef CTDL_IPV6
/*
* This is a generic function to set up a master socket for listening on
* 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);
-}
-
-#else /* CTDL_IPV6 */
-
-/*
- * 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.
- *
- * 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 /* CTDL_IPV6 */
-
/*
* Create a Unix domain socket and listen on it
* 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;