* sockets for the Citadel client; for that you must look in ipc_c_tcp.c
* (which, uncoincidentally, bears a striking similarity to this file).
*
- * Copyright (c) 1987-2010 by the citadel.org team
+ * Copyright (c) 1987-2017 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 open source software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License, version 3.
*
* 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
*/
-#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
-#include <stdio.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
+#include <stdio.h>
#include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-#include "sysdep_decls.h"
-#include "config.h"
-#include "clientsocket.h"
#include "ctdl_module.h"
+#include "clientsocket.h"
int sock_connect(char *host, char *service)
{
rc = getaddrinfo(host, service, &hints, &res);
if (rc != 0) {
- CtdlLogPrintf(CTDL_ERR, "%s: %s\n", host, gai_strerror(rc));
+ syslog(LOG_ERR, "%s: %s", host, gai_strerror(rc));
return(-1);
}
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));
+ syslog(LOG_ERR, "%s: %m", host);
+ freeaddrinfo(res);
return(-1);
}
rc = connect(sock, ai->ai_addr, ai->ai_addrlen);
if (rc >= 0) {
+ freeaddrinfo(res);
return(sock);
}
else {
- CtdlLogPrintf(CTDL_ERR, "connect() failed: %s\n", strerror(errno));
+ syslog(LOG_ERR, "%s: %m", host);
close(sock);
}
}
-
+ freeaddrinfo(res);
return(-1);
}
* 0 Request timed out.
* -1 Connection is broken, or other error.
*/
-int socket_read_blob(int *Socket, StrBuf * Target, int bytes, int timeout)
+int socket_read_blob(int *Socket, StrBuf *Target, int bytes, int timeout)
{
- CitContext *CCC = MyContext();
const char *Error;
int retval = 0;
-
- retval = StrBufReadBLOBBuffered(Target,
- CCC->sReadBuf,
- &CCC->sPos,
- Socket, 1, bytes, O_TERM, &Error);
+ retval = StrBufReadBLOBBuffered(Target, CC->SBuf.Buf, &CC->SBuf.ReadWritePointer, Socket, 1, bytes, O_TERM, &Error);
if (retval < 0) {
- CtdlLogPrintf(CTDL_CRIT,
- "%s failed: %s\n", __FUNCTION__, Error);
+ syslog(LOG_ERR, "clientsocket: socket_read_blob() failed: %s", Error);
}
return retval;
}
-int sock_read_to(int *sock, char *buf, int bytes, int timeout,
- int keep_reading_until_full)
-{
- CitContext *CCC = MyContext();
- int rc;
-
- FlushStrBuf(CCC->MigrateBuf);
- rc = socket_read_blob(sock, CCC->sMigrateBuf, bytes, timeout);
- if (rc < 0) {
- *buf = '\0';
- return rc;
- } else {
- if (StrLength(CCC->MigrateBuf) < bytes)
- bytes = StrLength(CCC->MigrateBuf);
- memcpy(buf, ChrPtr(CCC->MigrateBuf), bytes);
-
- FlushStrBuf(CCC->MigrateBuf);
- return rc;
- }
-}
-
-
-int CtdlSockGetLine(int *sock, StrBuf * Target)
+int CtdlSockGetLine(int *sock, StrBuf *Target, int nSec)
{
CitContext *CCC = MyContext();
const char *Error;
FlushStrBuf(Target);
rc = StrBufTCP_read_buffered_line_fast(Target,
- CCC->sReadBuf,
- &CCC->sPos,
- sock, 5, 1, &Error);
- if ((rc < 0) && (Error != NULL))
- CtdlLogPrintf(CTDL_CRIT,
- "%s failed: %s\n", __FUNCTION__, Error);
+ CCC->SBuf.Buf,
+ &CCC->SBuf.ReadWritePointer,
+ sock, nSec, 1, &Error);
+ if ((rc < 0) && (Error != NULL)) {
+ syslog(LOG_ERR, "clientsocket: CtdlSockGetLine() failed: %s", Error);
+ }
return rc;
}
/*
* 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(int *sock, char *buf, int bufsize)
{
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);
}
-/*
- * sock_read() - input binary data from socket.
- * Returns the number of bytes read, or -1 for error.
- */
-INLINE int sock_read(int *sock, char *buf, int bytes,
- int keep_reading_until_full)
-{
- return sock_read_to(sock, buf, bytes, CLIENT_TIMEOUT,
- keep_reading_until_full);
-}
-
-
/*
* sock_write() - send binary to server.
* Returns the number of bytes written, or -1 for error.
*/
-int sock_write(int *sock, const char *buf, int nbytes)
+int sock_write(int *sock, const char *buf, int nbytes)
+{ return sock_write_timeout(sock, buf, nbytes, 50); }
+int sock_write_timeout(int *sock, const char *buf, int nbytes, int timeout)
{
int nSuccessLess = 0;
int bytes_written = 0;
fd_set rfds;
int fdflags;
int IsNonBlock;
- int timeout = 50;
struct timeval tv;
int selectresolution = 100;
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 (-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) {
+ 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 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);
+ *rc = retval = CtdlSockGetLine(sock, CCC->sMigrateBuf, nSec);
i = StrLength(CCC->sMigrateBuf);
pCh = ChrPtr(CCC->sMigrateBuf);
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_err(sock, buf, SIZ, &rc);
+ g = sock_getln_err(sock, buf, SIZ, &rc, nSec);
if (rc < 0)
return rc;
if (g < 4)
return (g);
do {
- g = sock_getln_err(sock, bigbuf, SIZ, &rc);
+ g = sock_getln_err(sock, bigbuf, SIZ, &rc, nSec);
if (rc < 0)
return rc;
if (g < 0)
projects / citadel.git / blobdiff