/*
* $Id$
+ *
+ * Copyright (c) 1987-2010 by the citadel.org team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/*
/*
- * Connect a unix domain socket
- * sockpath where to open a unix domain socket
+ * Client side - connect to a unix domain socket
*/
int uds_connectsock(char *sockpath)
{
s = socket(AF_UNIX, SOCK_STREAM, 0);
if (s < 0) {
- lprintf(1, "Can't create socket[%s]: %s\n",
- sockpath,
- strerror(errno));
+ lprintf(1, "Can't create socket[%s]: %s\n", sockpath, strerror(errno));
return(-1);
}
if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- lprintf(1, "Can't connect [%s]: %s\n",
- sockpath,
- strerror(errno));
+ lprintf(1, "Can't connect [%s]: %s\n", sockpath, strerror(errno));
close(s);
return(-1);
}
/*
- * Connect a TCP/IP socket
- * host the host to connect to
- * service the service on the host to call
+ * TCP client - connect to a host/port
*/
-int tcp_connectsock(char *host, char *service)
+int tcp_connectsock(char *host, int port)
{
- int fdflags;
- struct hostent *phe;
- struct servent *pse;
- struct protoent *ppe;
- struct sockaddr_in sin;
- int s;
-
- memset(&sin, 0, sizeof(sin));
- sin.sin_family = AF_INET;
+ struct sockaddr_in stSockAddr;
+ int rv;
+ int sock;
- pse = getservbyname(service, "tcp");
- if (pse) {
- sin.sin_port = pse->s_port;
- } else if ((sin.sin_port = htons((u_short) atoi(service))) == 0) {
- lprintf(1, "Can't get %s service entry\n", service);
- return (-1);
- }
- phe = gethostbyname(host);
- if (phe) {
- memcpy(&sin.sin_addr, phe->h_addr, phe->h_length);
- } else if ((sin.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE) {
- lprintf(1, "Can't get %s host entry: %s\n",
- host, strerror(errno));
- return (-1);
- }
- if ((ppe = getprotobyname("tcp")) == 0) {
- lprintf(1, "Can't get TCP protocol entry: %s\n",
- strerror(errno));
- return (-1);
- }
-
- s = socket(PF_INET, SOCK_STREAM, ppe->p_proto);
- if (s < 0) {
+ sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+ if (sock < 0) {
lprintf(1, "Can't create socket: %s\n", strerror(errno));
return (-1);
}
- fdflags = fcntl(s, F_GETFL);
- if (fdflags < 0)
- lprintf(1, "unable to get socket flags! %s.%s: %s \n",
- host, service, strerror(errno));
- fdflags = fdflags | O_NONBLOCK;
- if (fcntl(s, F_SETFD, fdflags) < 0)
- lprintf(1, "unable to set socket nonblocking flags! %s.%s: %s \n",
- host, service, strerror(errno));
-
- signal(SIGALRM, timeout);
- alarm(30);
+ 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);
- if (connect(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
- lprintf(1, "Can't connect to %s.%s: %s\n",
- host, service, strerror(errno));
- close(s);
+ if (rv <= 0) {
+ lprintf(1, "Can't grok %s: %s\n", host, strerror(errno));
return (-1);
}
- alarm(0);
- signal(SIGALRM, SIG_IGN);
- if (!is_https) {
- fdflags = fcntl(s, F_GETFL);
- if (fdflags < 0)
- lprintf(1, "unable to get socket flags! %s.%s: %s \n",
- host, service, strerror(errno));
- fdflags = fdflags | O_NONBLOCK;
- if (fcntl(s, F_SETFD, fdflags) < 0)
- lprintf(1, "unable to set socket nonblocking flags! %s.%s: %s \n",
- host, service, strerror(errno));
+
+ 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);
}
- return (s);
+
+ return (sock);
}
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;
return -1;
}
- pch = ChrPtr(WCC->ReadBuf);
- YetRead = WCC->ReadPos - pch;
- if (YetRead > 0)
- {
- long StillThere;
-
- StillThere = StrLength(WCC->ReadBuf) -
- YetRead;
-
- StrBufPlain(Ret,
- WCC->ReadPos,
- StillThere);
- total_len -= StillThere;
- }
- FlushStrBuf(WCC->ReadBuf);
- WCC->ReadPos = NULL;
-
+ if (WCC->ReadPos != NULL) {
+ pch = ChrPtr(WCC->ReadBuf);
+
+ YetRead = WCC->ReadPos - pch;
+ if (YetRead > 0)
+ {
+ long StillThere;
+
+ StillThere = StrLength(WCC->ReadBuf) -
+ YetRead;
+
+ StrBufPlain(Ret,
+ WCC->ReadPos,
+ StillThere);
+ total_len -= StillThere;
+ }
+ FlushStrBuf(WCC->ReadBuf);
+ WCC->ReadPos = NULL;
+ }
if (total_len > 0)
{
rc = StrBufReadBLOB(Ret,
int ClientGetLine(ParsedHttpHdrs *Hdr, StrBuf *Target)
{
- const char *Error, *pch, *pchs;
+ const char *Error;
+#ifdef HAVE_OPENSSL
+ const char *pch, *pchs;
int rlen, len, retval = 0;
-#ifdef HAVE_OPENSSL
if (is_https) {
int ntries = 0;
if (StrLength(Hdr->ReadBuf) > 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.
+ * a TCP port. The server shuts down if the bind fails. (IPv4/IPv6 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_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);
+ }
+ if (inet_pton(AF_INET6, bind_to, &sin.sin6_addr) <= 0) {
+ lprintf(1, "Error binding to [%s] : %s\n", ip_addr, strerror(errno));
+ return (-WC_EXIT_BIND);
+ }
+ }
+
+ if (port_number == 0) {
+ lprintf(1, "Cannot start: no port number specified.\n");
+ return (-WC_EXIT_BIND);
+ }
+ sin.sin6_port = htons((u_short) port_number);
+
+ p = getprotobyname("tcp");
+
+ s = socket(PF_INET6, SOCK_STREAM, (p->p_proto));
+ if (s < 0) {
+ lprintf(1, "Can't create an IPv6 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) {
+ 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
s = socket(PF_INET, SOCK_STREAM, (p->p_proto));
if (s < 0) {
- lprintf(1, "Can't create a socket: %s\n", strerror(errno));
+ lprintf(1, "Can't create an IPv4 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);
}
return (s);
}
-
+#endif
/*
s = socket(AF_UNIX, SOCK_STREAM, 0);
if (s < 0) {
- lprintf(1, "webcit: Can't create a socket: %s\n",
- strerror(errno));
+ lprintf(1, "webcit: Can't create a unix domain socket: %s\n", strerror(errno));
return (-WC_EXIT_BIND);
}
if (retval < 0) {
lprintf(2, "client_read() failed: %s\n",
Error);
+ wc_backtrace();
return retval;
}
}
}
+ if (WCC->WFBuf != NULL) {
+ WildFireSerializePayload(WCC->WFBuf, WCC->HBuf, &WCC->Hdr->nWildfireHeaders, NULL);
+ FreeStrBuf(&WCC->WFBuf);
+ }
+
if (WCC->Hdr->HR.prohibit_caching)
hprintf("Pragma: no-cache\r\nCache-Control: no-store\r\nExpires:-1\r\n");
hprintf("Content-length: %d\r\n\r\n", StrLength(WCC->WBuf));
projects / citadel.git / blobdiff