#endif
#include <sys/types.h>
-#ifdef HAVE_UNISTD_H
#include <unistd.h>
-#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
/* ----------------- */
static int ipc_get_session(struct ipc_header *ipc, server_child *children)
{
- u_int32_t boottime;
- u_int32_t idlen;
+ uint32_t boottime;
+ uint32_t idlen;
char *clientid, *p;
EC_ZERO_LOG( setnonblock(fd, 1) );
unlink(name);
address.sun_family = AF_UNIX;
- address_length = sizeof(address.sun_family) + sprintf(address.sun_path, name);
+ address_length = sizeof(address.sun_family) + sprintf(address.sun_path, "%s", name);
EC_ZERO_LOG( bind(fd, (struct sockaddr *)&address, address_length) );
EC_ZERO_LOG( listen(fd, 1024) );
pid_t pid = getpid();
EC_NEG1_LOG( fd = socket(PF_UNIX, SOCK_STREAM, 0) );
- EC_ZERO_LOG( setnonblock(fd, 1) );
address.sun_family = AF_UNIX;
- address_length = sizeof(address.sun_family) + sprintf(address.sun_path, name);
+ address_length = sizeof(address.sun_family) + sprintf(address.sun_path, "%s", name);
EC_ZERO_LOG( connect(fd, (struct sockaddr *)&address, address_length) ); /* 1 */
LOG(log_debug, logtype_afpd, "ipc_client_uds: connected to master");
+ EC_ZERO_LOG( setnonblock(fd, 1) );
+
if (writet(fd, &pid, sizeof(pid_t), 0, 1) != sizeof(pid_t)) {
LOG(log_error, logtype_afpd, "ipc_client_uds: writet: %s", strerror(errno));
EC_FAIL;
close(obj->ipc_fd);
obj->ipc_fd = -1;
- srandom(getpid());
- sleep((random() % 5) + 5); /* give it enough time to start */
+ sleep((getpid() % 5) + 15); /* give it enough time to start */
while (retrycount++ < 10) {
if ((obj->ipc_fd = ipc_client_uds(_PATH_AFP_IPC)) == -1) {
/*!
* Read a IPC message from a child
*
+ * This is using an fd with non-blocking IO, so EAGAIN is not an error
+ *
* @args children (rw) pointer to our structure with all childs
* @args fd (r) IPC socket with child
*
char buf[IPC_MAXMSGSIZE], *p;
if ((ret = read(fd, buf, IPC_HEADERLEN)) != IPC_HEADERLEN) {
- if (ret != 0)
+ if (ret != 0) {
+ if (errno == EAGAIN)
+ return 0;
LOG(log_error, logtype_afpd, "Reading IPC header failed (%i of %u bytes read): %s",
ret, IPC_HEADERLEN, strerror(errno));
+ }
return -1;
}
return 0;
}
-