projects
/
svn42.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7612b7e
)
status listeners now always get Status: messages
author
Christian Pointner
<equinox@realraum.at>
Wed, 13 May 2009 01:16:31 +0000
(
01:16
+0000)
committer
Christian Pointner
<equinox@realraum.at>
Wed, 13 May 2009 01:16:31 +0000
(
01:16
+0000)
door_daemon/door_daemon.c
patch
|
blob
|
history
diff --git
a/door_daemon/door_daemon.c
b/door_daemon/door_daemon.c
index
f8a3982
..
ea3e0d6
100644
(file)
--- a/
door_daemon/door_daemon.c
+++ b/
door_daemon/door_daemon.c
@@
-228,15
+228,18
@@
int process_door(int door_fd, cmd_t **cmd_q, client_t* client_lst)
char* saveptr;
char* tok = strtok_r(buffer, "\n\r", &saveptr);
do {
char* saveptr;
char* tok = strtok_r(buffer, "\n\r", &saveptr);
do {
- if(!cmd_q || !(*cmd_q))
- break;
+ log_printf(NOTICE, "door-firmware: %s", tok);
- send_response((*cmd_q)->fd, tok);
+ int cmd_fd = -1;
+ if(cmd_q && (*cmd_q)) {
+ cmd_fd = (*cmd_q)->fd;
+ send_response(cmd_fd, tok);
+ }
if(!strncmp(tok, "Status:", 7)) {
client_t* client;
for(client = client_lst; client; client = client->next)
if(!strncmp(tok, "Status:", 7)) {
client_t* client;
for(client = client_lst; client; client = client->next)
- if(client->status_listener && client->fd != (*cmd_q)->fd)
+ if(client->status_listener && client->fd != cmd_fd)
send_response(client->fd, tok);
}
send_response(client->fd, tok);
}