Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
afb-daemon: Add /tmp has fallback for uploads
[src/app-framework-binder.git]
/
src
/
afb-socket.c
diff --git
a/src/afb-socket.c
b/src/afb-socket.c
index
ee3cfbe
..
cf788de
100644
(file)
--- a/
src/afb-socket.c
+++ b/
src/afb-socket.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2015-201
8
"IoT.bzh"
+ * Copyright (C) 2015-201
9
"IoT.bzh"
* Author José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Author José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-31,7
+31,8
@@
#include "afb-fdev.h"
#include "afb-socket.h"
#include "afb-fdev.h"
#include "afb-socket.h"
-#include "afb-systemd.h"
+
+#include "systemd.h"
#include "fdev.h"
#include "verbose.h"
#include "fdev.h"
#include "verbose.h"
@@
-158,7
+159,7
@@
static int open_unix(const char *spec, int server)
*
* @return the file descriptor number of the socket or -1 in case of error
*/
*
* @return the file descriptor number of the socket or -1 in case of error
*/
-static int open_tcp(const char *spec, int server)
+static int open_tcp(const char *spec, int server
, int reuseaddr
)
{
int rc, fd;
const char *service, *host, *tail;
{
int rc, fd;
const char *service, *host, *tail;
@@
-195,6
+196,10
@@
static int open_tcp(const char *spec, int server)
fd = socket(iai->ai_family, iai->ai_socktype, iai->ai_protocol);
if (fd >= 0) {
if (server) {
fd = socket(iai->ai_family, iai->ai_socktype, iai->ai_protocol);
if (fd >= 0) {
if (server) {
+ if (reuseaddr) {
+ rc = 1;
+ setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &rc, sizeof rc);
+ }
rc = bind(fd, iai->ai_addr, iai->ai_addrlen);
} else {
rc = connect(fd, iai->ai_addr, iai->ai_addrlen);
rc = bind(fd, iai->ai_addr, iai->ai_addrlen);
} else {
rc = connect(fd, iai->ai_addr, iai->ai_addrlen);
@@
-224,7
+229,7
@@
static int open_systemd(const char *spec)
errno = EAFNOSUPPORT;
return -1;
#else
errno = EAFNOSUPPORT;
return -1;
#else
- return
afb_
systemd_fds_for(spec);
+ return systemd_fds_for(spec);
#endif
}
#endif
}
@@
-267,7
+272,7
@@
static struct entry *get_entry(const char *uri, int *offset)
*/
static int open_uri(const char *uri, int server)
{
*/
static int open_uri(const char *uri, int server)
{
- int fd,
rc,
offset;
+ int fd, offset;
struct entry *e;
const char *api;
struct entry *e;
const char *api;
@@
-286,7
+291,7
@@
static int open_uri(const char *uri, int server)
fd = open_unix(uri, server);
break;
case Type_Inet:
fd = open_unix(uri, server);
break;
case Type_Inet:
- fd = open_tcp(uri, server);
+ fd = open_tcp(uri, server
, !e->noreuseaddr
);
break;
case Type_Systemd:
if (server)
break;
case Type_Systemd:
if (server)
@@
-308,10
+313,6
@@
static int open_uri(const char *uri, int server)
fcntl(fd, F_SETFD, FD_CLOEXEC);
fcntl(fd, F_SETFL, O_NONBLOCK);
if (server) {
fcntl(fd, F_SETFD, FD_CLOEXEC);
fcntl(fd, F_SETFL, O_NONBLOCK);
if (server) {
- if (!e->noreuseaddr) {
- rc = 1;
- setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &rc, sizeof rc);
- }
if (!e->nolisten)
listen(fd, BACKLOG);
}
if (!e->nolisten)
listen(fd, BACKLOG);
}