projects
/
apps
/
pfixtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ahem, use non blocking IO. silly me.
[apps/pfixtools.git]
/
daemon.c
diff --git
a/daemon.c
b/daemon.c
index
d3dc00d
..
1d40424
100644
(file)
--- a/
daemon.c
+++ b/
daemon.c
@@
-34,10
+34,29
@@
*/
#include <sys/un.h>
*/
#include <sys/un.h>
+#include <fcntl.h>
#include "common.h"
#include "daemon.h"
#include "common.h"
#include "daemon.h"
+static int setnonblock(int sock)
+{
+ int res = fcntl(sock, F_GETFL);
+
+ if (res < 0) {
+ UNIXERR("fcntl");
+ return -1;
+ }
+
+ if (fcntl(sock, F_SETFL, res | O_NONBLOCK) < 0) {
+ UNIXERR("fcntl");
+ return -1;
+ }
+
+ return 0;
+}
+
+
int tcp_listen(const struct sockaddr *addr, socklen_t len)
{
int sock;
int tcp_listen(const struct sockaddr *addr, socklen_t len)
{
int sock;
@@
-78,6
+97,11
@@
int tcp_listen(const struct sockaddr *addr, socklen_t len)
return -1;
}
return -1;
}
+ if (setnonblock(sock)) {
+ close(sock);
+ return -1;
+ }
+
if (listen(sock, 0) < 0) {
UNIXERR("bind");
close(sock);
if (listen(sock, 0) < 0) {
UNIXERR("bind");
close(sock);
@@
-87,3
+111,19
@@
int tcp_listen(const struct sockaddr *addr, socklen_t len)
return sock;
}
return sock;
}
+int accept_nonblock(int fd)
+{
+ int sock = accept(fd, NULL, 0);
+
+ if (sock < 0) {
+ UNIXERR("accept");
+ return -1;
+ }
+
+ if (setnonblock(sock)) {
+ close(sock);
+ return -1;
+ }
+
+ return sock;
+}