projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updates to ctdlsalearn to handle the new admin socket
[citadel.git]
/
ctdlsalearn
/
src
/
sockets.c
diff --git
a/ctdlsalearn/src/sockets.c
b/ctdlsalearn/src/sockets.c
index 05465467ac759aca052ef41efcbd5d967d6f29c3..9b21f4f9fb1b08e21a51c57eec01cbf97e461c95 100644
(file)
--- a/
ctdlsalearn/src/sockets.c
+++ b/
ctdlsalearn/src/sockets.c
@@
-21,6
+21,8
@@
#define INADDR_NONE 0xffffffff
#endif
#define INADDR_NONE 0xffffffff
#endif
+extern int verbose;
+
int uds_connectsock(char *sockpath)
{
struct sockaddr_un addr;
int uds_connectsock(char *sockpath)
{
struct sockaddr_un addr;
@@
-32,12
+34,12
@@
int uds_connectsock(char *sockpath)
s = socket(AF_UNIX, SOCK_STREAM, 0);
if (s < 0) {
s = socket(AF_UNIX, SOCK_STREAM, 0);
if (s < 0) {
- fprintf(stderr, "Can't create socket[%s]: %s\n", sockpath, strerror(errno));
+
if (verbose)
fprintf(stderr, "Can't create socket[%s]: %s\n", sockpath, strerror(errno));
return(-1);
}
if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
return(-1);
}
if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- fprintf(stderr, "Can't connect [%s]: %s\n", sockpath, strerror(errno));
+
if (verbose)
fprintf(stderr, "Can't connect [%s]: %s\n", sockpath, strerror(errno));
close(s);
return(-1);
}
close(s);
return(-1);
}
@@
-68,14
+70,13
@@
int sock_read_to(int sock, char *buf, int bytes, int timeout, int keep_reading_u
retval = select(sock+1, &rfds, NULL, NULL, &tv);
if (FD_ISSET(sock, &rfds) == 0) { /* timed out */
retval = select(sock+1, &rfds, NULL, NULL, &tv);
if (FD_ISSET(sock, &rfds) == 0) { /* timed out */
- fprintf(stderr, "sock_read() timed out.\n");
+
if (verbose)
fprintf(stderr, "sock_read() timed out.\n");
return(-1);
}
rlen = read(sock, &buf[len], bytes-len);
if (rlen<1) {
return(-1);
}
rlen = read(sock, &buf[len], bytes-len);
if (rlen<1) {
- fprintf(stderr, "sock_read() failed: %s\n",
- strerror(errno));
+ if (verbose) fprintf(stderr, "sock_read() failed: %s\n", strerror(errno));
return(-1);
}
len = len + rlen;
return(-1);
}
len = len + rlen;