chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clients: unify how we invoke getopt_long()
[elogind.git]
/
src
/
core
/
socket.c
diff --git
a/src/core/socket.c
b/src/core/socket.c
index ae92408560a793f21276a8728aa4bad14a1d17ad..887ea00fb2710d7ca18a57d46cbc1de6e1c32c60 100644
(file)
--- a/
src/core/socket.c
+++ b/
src/core/socket.c
@@
-74,7
+74,7
@@
static void socket_init(Unit *u) {
assert(u->load_state == UNIT_STUB);
s->backlog = SOMAXCONN;
assert(u->load_state == UNIT_STUB);
s->backlog = SOMAXCONN;
- s->timeout_usec =
DEFAULT_TIMEOUT_USEC
;
+ s->timeout_usec =
u->manager->default_timeout_start_usec
;
s->directory_mode = 0755;
s->socket_mode = 0666;
s->directory_mode = 0755;
s->socket_mode = 0666;
@@
-110,7
+110,7
@@
void socket_free_ports(Socket *s) {
assert(s);
while ((p = s->ports)) {
assert(s);
while ((p = s->ports)) {
- LIST_REMOVE(
SocketPort,
port, s->ports, p);
+ LIST_REMOVE(port, s->ports, p);
if (p->fd >= 0) {
unit_unwatch_fd(UNIT(s), &p->fd_watch);
if (p->fd >= 0) {
unit_unwatch_fd(UNIT(s), &p->fd_watch);