/*
- * $Id$
- *
* This module handles client-side sockets opened by the Citadel server (for
* the client side of Internet protocols, etc.) It does _not_ handle client
* sockets for the Citadel client; for that you must look in ipc_c_tcp.c
int sock_connect(char *host, char *service)
{
struct in6_addr serveraddr;
- struct addrinfo hints, *res = NULL;
- int rc;
+ struct addrinfo hints;
+ struct addrinfo *res = NULL;
+ struct addrinfo *ai = NULL;
+ int rc = (-1);
int sock = (-1);
if ((host == NULL) || IsEmptyStr(host))
return(-1);
}
- sock = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
- if (sock < 0) {
- CtdlLogPrintf(CTDL_ERR, "socket() failed: %s\n", strerror(errno));
- return(-1);
- }
-
- rc = connect(sock, res->ai_addr, res->ai_addrlen);
- if (rc < 0) {
- /*
- * Note: the res is a linked list of addresses found for server.
- * If the connect() fails to the first one, subsequent addresses
- * (if any) in the list could be tried if desired.
- */
- CtdlLogPrintf(CTDL_ERR, "connect() failed: %s\n", strerror(errno));
- 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) {
+ sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+ if (sock < 0) {
+ CtdlLogPrintf(CTDL_ERR, "socket() failed: %s\n", strerror(errno));
+ return(-1);
+ }
+ rc = connect(sock, ai->ai_addr, ai->ai_addrlen);
+ if (rc >= 0) {
+ return(sock);
+ }
+ else {
+ CtdlLogPrintf(CTDL_ERR, "connect() failed: %s\n", strerror(errno));
+ close(sock);
+ }
}
- return (sock);
+ return(-1);
}
}
-int CtdlSockGetLine(int *sock, StrBuf * Target)
+int CtdlSockGetLine(int *sock, StrBuf * Target, int nSec)
{
CitContext *CCC = MyContext();
const char *Error;
rc = StrBufTCP_read_buffered_line_fast(Target,
CCC->sReadBuf,
&CCC->sPos,
- sock, 5, 1, &Error);
+ sock, nSec, 1, &Error);
if ((rc < 0) && (Error != NULL))
CtdlLogPrintf(CTDL_CRIT,
"%s failed: %s\n", __FUNCTION__, Error);
const char *pCh;
FlushStrBuf(CCC->sMigrateBuf);
- retval = CtdlSockGetLine(sock, CCC->sMigrateBuf);
+ retval = CtdlSockGetLine(sock, CCC->sMigrateBuf, 5);
i = StrLength(CCC->sMigrateBuf);
pCh = ChrPtr(CCC->sMigrateBuf);
- /* Strip the trailing LF, and the trailing CR if present.
- */
- if (bufsize <= i)
- i = bufsize - 1;
- while ((i > 0)
- && ((pCh[i - 1] == 13)
- || (pCh[i - 1] == 10))) {
- i--;
- }
- memcpy(buf, pCh, i);
- buf[i] = 0;
+
+ memcpy(buf, pCh, i + 1);
FlushStrBuf(CCC->sMigrateBuf);
if (retval < 0) {
*/
int sock_write(int *sock, const char *buf, int nbytes)
{
+ int nSuccessLess = 0;
int bytes_written = 0;
int retval;
-
- while ((*sock != -1) && (bytes_written < nbytes)) {
+ fd_set rfds;
+ int fdflags;
+ int IsNonBlock;
+ int timeout = 50;
+ struct timeval tv;
+ int selectresolution = 100;
+
+ fdflags = fcntl(*sock, F_GETFL);
+ IsNonBlock = (fdflags & O_NONBLOCK) == O_NONBLOCK;
+
+ while ((nSuccessLess < timeout) &&
+ (*sock != -1) &&
+ (bytes_written < nbytes))
+ {
+ if (IsNonBlock){
+ tv.tv_sec = selectresolution;
+ tv.tv_usec = 0;
+
+ FD_ZERO(&rfds);
+ FD_SET(*sock, &rfds);
+ if (select(*sock + 1, NULL, &rfds, NULL, &tv) == -1) {
+/// *Error = strerror(errno);
+ close (*sock);
+ *sock = -1;
+ return -1;
+ }
+ }
+ if (IsNonBlock && ! FD_ISSET(*sock, &rfds)) {
+ nSuccessLess ++;
+ continue;
+ }
retval = write(*sock, &buf[bytes_written],
nbytes - bytes_written);
if (retval < 1) {
return (-1);
}
bytes_written = bytes_written + retval;
+ if (IsNonBlock && (bytes_written == nbytes)){
+ tv.tv_sec = selectresolution;
+ tv.tv_usec = 0;
+
+ FD_ZERO(&rfds);
+ FD_SET(*sock, &rfds);
+ if (select(*sock + 1, NULL, &rfds, NULL, &tv) == -1) {
+/// *Error = strerror(errno);
+ close (*sock);
+ *sock = -1;
+ return -1;
+ }
+ }
}
return (bytes_written);
}
+
+/*
+ * client_getln() ... Get a LF-terminated line of text from the client.
+ * (This is implemented in terms of client_read() and could be
+ * justifiably moved out of sysdep.c)
+ */
+int sock_getln_err(int *sock, char *buf, int bufsize, int *rc, int nSec)
+{
+ int i, retval;
+ CitContext *CCC = MyContext();
+ const char *pCh;
+
+ FlushStrBuf(CCC->sMigrateBuf);
+ *rc = retval = CtdlSockGetLine(sock, CCC->sMigrateBuf, nSec);
+
+ i = StrLength(CCC->sMigrateBuf);
+ pCh = ChrPtr(CCC->sMigrateBuf);
+
+ memcpy(buf, pCh, i + 1);
+
+ FlushStrBuf(CCC->sMigrateBuf);
+ if (retval < 0) {
+ safestrncpy(&buf[i], "000", bufsize - i);
+ i += 3;
+ }
+ return i;
+}
+
/*
* Multiline version of sock_gets() ... this is a convenience function for
* client side protocol implementations. It only returns the first line of
* a multiline response, discarding the rest.
*/
-int ml_sock_gets(int *sock, char *buf)
+int ml_sock_gets(int *sock, char *buf, int nSec)
{
+ int rc = 0;
char bigbuf[1024];
int g;
- g = sock_getln(sock, buf, SIZ);
+ g = sock_getln_err(sock, buf, SIZ, &rc, nSec);
+ if (rc < 0)
+ return rc;
if (g < 4)
return (g);
if (buf[3] != '-')
return (g);
do {
- g = sock_getln(sock, bigbuf, SIZ);
+ g = sock_getln_err(sock, bigbuf, SIZ, &rc, nSec);
+ if (rc < 0)
+ return rc;
if (g < 0)
return (g);
} while ((g >= 4) && (bigbuf[3] == '-'));
projects / citadel.git / blobdiff