projects
/
svn42.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
further removed stale directories
[svn42.git]
/
door_daemon
/
command_queue.c
diff --git
a/door_daemon/command_queue.c
b/door_daemon/command_queue.c
index
7ba22c7
..
0351f5c
100644
(file)
--- a/
door_daemon/command_queue.c
+++ b/
door_daemon/command_queue.c
@@
-6,8
+6,9
@@
* This file is part of door_daemon.
*
* door_daemon is free software: you can redistribute it and/or modify
* This file is part of door_daemon.
*
* door_daemon is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
*
* door_daemon is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* door_daemon is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-59,7
+60,6
@@
int cmd_push(cmd_t** first, int fd, cmd_id_t cmd, const char* param)
new_cmd->sent = 0;
new_cmd->tv_start.tv_sec = 0;
new_cmd->tv_start.tv_usec = 0;
new_cmd->sent = 0;
new_cmd->tv_start.tv_sec = 0;
new_cmd->tv_start.tv_usec = 0;
- gettimeofday(&new_cmd->tv_start, NULL);
new_cmd->next = NULL;
if(!(*first)) {
new_cmd->next = NULL;
if(!(*first)) {
@@
-72,18
+72,23
@@
int cmd_push(cmd_t** first, int fd, cmd_id_t cmd, const char* param)
return 0;
}
return 0;
}
-// timeout between 1 and 2 seconds
-int cmd_has_expired(const cmd_t cmd)
+void cmd_sent(cmd_t* cmd)
+{
+ if(!cmd)
+ return;
+
+ cmd->sent = 1;
+ gettimeofday(&cmd->tv_start, NULL);
+}
+
+int cmd_has_expired(cmd_t cmd)
{
struct timeval now;
{
struct timeval now;
- now.tv_sec = 2;
- now.tv_usec = 0;
+ timerclear(&now);
gettimeofday(&now, NULL);
gettimeofday(&now, NULL);
-
- if(cmd.tv_start.tv_sec + 2 >= now.tv_sec)
- return 1;
-
- return 0;
+ cmd.tv_start.tv_sec++;
+
+ return timercmp(&cmd.tv_start, &now, <);
}
void cmd_pop(cmd_t** first)
}
void cmd_pop(cmd_t** first)