#include <sys/un.h>
#include <errno.h>
#include <signal.h>
+#include <time.h>
#include <atalk/server_child.h>
#include <atalk/server_ipc.h>
#include <atalk/logger.h>
#include <atalk/util.h>
#include <atalk/errchk.h>
+#include <atalk/paths.h>
+#include <atalk/globals.h>
+#include <atalk/dsi.h>
#define IPC_HEADERLEN 14
#define IPC_MAXMSGSIZE 90
***********************************************************************************/
/*!
- * Listen on UNIX domain socket "name" for IPD from old sesssion
+ * Listen on UNIX domain socket "name" for IPC from old sesssion
*
* @args name (r) file name to use for UNIX domain socket
* @returns socket fd, -1 on error
EC_CLEANUP:
if (ret != 0) {
-
return -1;
}
LOG(log_note, logtype_afpd, "ipc_server_uds: fd: %d", fd);
return fd;
}
+/*!
+ * Connect to UNIX domain socket "name" for IPC with new afpd master
+ *
+ * 1. Connect
+ * 2. send pid, which establishes a child structure for us in the master
+ *
+ * @args name (r) file name to use for UNIX domain socket
+ * @returns socket fd, -1 on error
+ */
+int ipc_client_uds(const char *name)
+{
+ EC_INIT;
+ struct sockaddr_un address;
+ socklen_t address_length;
+ int fd = -1;
+ 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);
+
+ EC_ZERO_LOG( connect(fd, (struct sockaddr *)&address, address_length) ); /* 1 */
+ LOG(log_note, logtype_afpd, "ipc_client_uds: connected to master");
+
+ 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;
+ }
+ LOG(log_note, logtype_afpd, "ipc_client_uds: sent pid");
+
+EC_CLEANUP:
+ if (ret != 0) {
+ return -1;
+ }
+ LOG(log_note, logtype_afpd, "ipc_client_uds: fd: %d", fd);
+ return fd;
+}
+
+int reconnect_ipc(AFPObj *obj)
+{
+ int retrycount = 0;
+
+ LOG(log_note, logtype_afpd, "reconnect_ipc: start");
+
+ close(obj->ipc_fd);
+ obj->ipc_fd = -1;
+
+ srandom(getpid());
+ sleep((random() % 10) + 5); /* give it enough time to start */
+
+ while (retrycount++ < 10) {
+ if ((obj->ipc_fd = ipc_client_uds(_PATH_AFP_IPC)) == -1) {
+ LOG(log_error, logtype_afpd, "reconnect_ipc: cant reconnect to master");
+ sleep(1);
+ continue;
+ }
+ LOG(log_note, logtype_afpd, "reconnect_ipc: succesfull IPC reconnect");
+ return 0;
+ }
+ return -1;
+}
+
/* -----------------
* Ipc format
* command
char block[IPC_MAXMSGSIZE], *p;
pid_t pid;
uid_t uid;
+ ssize_t ret;
+
p = block;
memset ( p, 0 , IPC_MAXMSGSIZE);
LOG(log_debug, logtype_afpd, "ipc_child_write(%s)", ipc_cmd_str[command]);
- return write(fd, block, len+IPC_HEADERLEN );
+ if ((ret = writet(fd, block, len+IPC_HEADERLEN, 0, 1)) != -len+IPC_HEADERLEN) {
+ return -1;
+ }
+
+ return 0;
}