projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Log when we're doing a clean keyd shutdown
[onak.git]
/
keyd.c
diff --git
a/keyd.c
b/keyd.c
index eab3b5495b951ecbe52b023829975b9b4e61a294..ebf142c3972ac69b83c33d675d4a3e6942111257 100644
(file)
--- a/
keyd.c
+++ b/
keyd.c
@@
-9,6
+9,7
@@
#include <errno.h>
#include <fcntl.h>
#include <getopt.h>
#include <errno.h>
#include <fcntl.h>
#include <getopt.h>
+#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-125,7
+126,7
@@
int sock_init(const char *sockname)
int sock_do(int fd)
{
int sock_do(int fd)
{
-
int
cmd = KEYD_CMD_UNKNOWN;
+
uint32_t
cmd = KEYD_CMD_UNKNOWN;
ssize_t bytes = 0;
ssize_t count = 0;
int ret = 0;
ssize_t bytes = 0;
ssize_t count = 0;
int ret = 0;
@@
-152,6
+153,8
@@
int sock_do(int fd)
case KEYD_CMD_VERSION:
cmd = KEYD_REPLY_OK;
write(fd, &cmd, sizeof(cmd));
case KEYD_CMD_VERSION:
cmd = KEYD_REPLY_OK;
write(fd, &cmd, sizeof(cmd));
+ cmd = sizeof(keyd_version);
+ write(fd, &cmd, sizeof(cmd));
write(fd, &keyd_version, sizeof(keyd_version));
break;
case KEYD_CMD_GET:
write(fd, &keyd_version, sizeof(keyd_version));
break;
case KEYD_CMD_GET:
@@
-311,6
+314,8
@@
int sock_do(int fd)
}
if (ret == 0) {
keyid = config.dbbackend->getfullkeyid(keyid);
}
if (ret == 0) {
keyid = config.dbbackend->getfullkeyid(keyid);
+ cmd = sizeof(keyid);
+ write(fd, &cmd, sizeof(cmd));
write(fd, &keyid, sizeof(keyid));
}
break;
write(fd, &keyid, sizeof(keyid));
}
break;
@@
-323,9
+328,16
@@
int sock_do(int fd)
write(fd, &bytes, sizeof(bytes));
break;
case KEYD_CMD_CLOSE:
write(fd, &bytes, sizeof(bytes));
break;
case KEYD_CMD_CLOSE:
+ cmd = KEYD_REPLY_OK;
+ write(fd, &cmd, sizeof(cmd));
ret = 1;
break;
case KEYD_CMD_QUIT:
ret = 1;
break;
case KEYD_CMD_QUIT:
+ cmd = KEYD_REPLY_OK;
+ write(fd, &cmd, sizeof(cmd));
+ logthing(LOGTHING_NOTICE,
+ "Exiting due to quit request.");
+ ret = 1;
trytocleanup();
break;
default:
trytocleanup();
break;
default:
@@
-397,7
+409,8
@@
int main(int argc, char *argv[])
}
catchsignals();
}
catchsignals();
-
+ signal(SIGPIPE, SIG_IGN);
+
snprintf(sockname, 1023, "%s/%s", config.db_dir, KEYD_SOCKET);
fd = sock_init(sockname);
snprintf(sockname, 1023, "%s/%s", config.db_dir, KEYD_SOCKET);
fd = sock_init(sockname);