chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge disorder.macros branch.
[disorder]
/
server
/
state.c
diff --git
a/server/state.c
b/server/state.c
index d6b66992a9b6b60d698480a7023564dd1022edd0..f88067b80eb8dd7b094fc62793d22bf28d64f6e2 100644
(file)
--- a/
server/state.c
+++ b/
server/state.c
@@
-1,6
+1,6
@@
/*
* This file is part of DisOrder.
/*
* This file is part of DisOrder.
- * Copyright (C) 2004, 2005 Richard Kettlewell
+ * Copyright (C) 2004, 2005
, 2007, 2008
Richard Kettlewell
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-54,10
+54,11
@@
static struct addrinfo *current_listen_addrinfo;
static int current_listen_fd;
void quit(ev_source *ev) {
static int current_listen_fd;
void quit(ev_source *ev) {
+ info("shutting down...");
quitting(ev);
trackdb_close();
trackdb_deinit();
quitting(ev);
trackdb_close();
trackdb_deinit();
- info("
termina
ting");
+ info("
exi
ting");
exit(0);
}
exit(0);
}
@@
-68,14
+69,10
@@
static void reset_socket(ev_source *ev) {
char *name;
static const struct addrinfo pref = {
char *name;
static const struct addrinfo pref = {
- AI_PASSIVE,
- PF_INET,
- SOCK_STREAM,
- IPPROTO_TCP,
- 0,
- 0,
- 0,
- 0
+ .ai_flags = AI_PASSIVE,
+ .ai_family = PF_INET,
+ .ai_socktype = SOCK_STREAM,
+ .ai_protocol = IPPROTO_TCP,
};
/* unix first */
};
/* unix first */
@@
-157,7
+154,7
@@
int reconfigure(ev_source *ev, int reload) {
/* We only allow for upgrade at startup */
trackdb_open(TRACKDB_CAN_UPGRADE);
if(need_another_rescan)
/* We only allow for upgrade at startup */
trackdb_open(TRACKDB_CAN_UPGRADE);
if(need_another_rescan)
- trackdb_rescan(ev);
+ trackdb_rescan(ev
, 1/*check*/, 0, 0
);
if(!ret) {
queue_read();
recent_read();
if(!ret) {
queue_read();
recent_read();