#include "options.h"
#include "command_queue.h"
+#include "client_list.h"
#include "daemon.h"
#include "sysexec.h"
return fd;
}
-int send_command(int ttyusb_fd, cmd_t* cmd)
+int send_command(int door_fd, cmd_t* cmd)
{
if(!cmd)
return -1;
int ret;
do {
- ret = write(ttyusb_fd, &c, 1);
+ ret = write(door_fd, &c, 1);
+ } while(!ret || (ret == -1 && errno == EINTR));
+
+ if(ret > 0) {
+ cmd->sent = 1;
+ return 0;
}
- while(!ret);
+
+ return ret;
+}
+
+int send_response(int fd, const char* response)
+{
+ if(!response)
+ return -1;
+
+ int len = strlen(response);
+ int offset = 0;
+ int ret;
+ for(;;) {
+ ret = write(fd, &response[offset], strlen(response));
+ if(ret < 0) {
+ if(errno != EINTR)
+ return ret;
+
+ ret = 0;
+ }
+
+ offset += ret;
+ if(offset+1 >= len)
+ break;
+ }
+ do {
+ ret = write(fd, "\n", 1);
+ } while(!ret || (ret == -1 && errno == EINTR));
if(ret > 0)
return 0;
return ret;
}
-int handle_command(const char* cmd, int fd, cmd_t** cmd_q)
+int handle_command(const char* cmd, int fd, cmd_t** cmd_q, client_t* client_lst)
{
if(!cmd_q || !cmd)
return -1;
cmd_id = STATUS;
else if(!strncmp(cmd, "log", 3))
cmd_id = LOG;
+ else if(!strncmp(cmd, "listen", 6)) {
+ client_t* listener = client_find(client_lst, fd);
+ if(listener) {
+ log_printf(DEBUG, "adding status listener %d", fd);
+ listener->status_listener = 1;
+ }
+ else
+ log_printf(ERROR, "unable to add status listener %d", fd);
+
+ return 0;
+ }
else {
log_printf(WARNING, "unknown command '%s'", cmd);
return 1;
return 0;
}
-int process_cmd(int fd, cmd_t **cmd_q)
+int process_cmd(int fd, cmd_t **cmd_q, client_t* client_lst)
{
+ log_printf(DEBUG, "processing command from %d", fd);
+
static char buffer[100];
int ret = 0;
- do {
+ do { // TODO: replace this whith a actually working readline
memset(buffer, 0, 100);
ret = recv(fd, buffer, sizeof(buffer), 0);
if(!ret)
char* saveptr;
char* tok = strtok_r(buffer, "\n\r", &saveptr);
do {
- ret = handle_command(tok, fd, cmd_q);
+ ret = handle_command(tok, fd, cmd_q, client_lst);
if(ret < 0)
return ret;
} while(tok = strtok_r(NULL, "\n\r", &saveptr));
} while (ret == -1 && errno == EINTR);
- log_printf(DEBUG, "processing command from %d", fd);
-
return 0;
}
-int process_ttyusb(int ttyusb_fd, cmd_t **cmd_q)
+int process_door(int door_fd, cmd_t **cmd_q, client_t* client_lst)
{
+ log_printf(DEBUG, "processing data from door (fd=%d)", door_fd);
+
static char buffer[100];
int ret = 0;
- do {
+ do { // TODO: replace this whith a actually working readline
memset(buffer, 0, 100);
- ret = read(ttyusb_fd, buffer, sizeof(buffer));
+ ret = read(door_fd, buffer, sizeof(buffer));
if(!ret)
return 2;
- } while (ret == -1 && errno == EINTR);
+ char* saveptr;
+ char* tok = strtok_r(buffer, "\n\r", &saveptr);
+ do {
+ if(!cmd_q || !(*cmd_q))
+ break;
+ ret = send_response((*cmd_q)->fd, tok);
+ if(ret < 0)
+ return ret;
- log_printf(INFO, "processing data from ttyusb (fd=%d)", ttyusb_fd);
+ cmd_pop(cmd_q);
+ } while(tok = strtok_r(NULL, "\n\r", &saveptr));
+ } while (ret == -1 && errno == EINTR);
return 0;
}
-int main_loop(int ttyusb_fd, int cmd_listen_fd)
+int main_loop(int door_fd, int cmd_listen_fd)
{
log_printf(INFO, "entering main loop");
fd_set readfds, tmpfds;
FD_ZERO(&readfds);
- FD_SET(ttyusb_fd, &readfds);
+ FD_SET(door_fd, &readfds);
FD_SET(cmd_listen_fd, &readfds);
- int max_fd = ttyusb_fd > cmd_listen_fd ? ttyusb_fd : cmd_listen_fd;
+ int max_fd = door_fd > cmd_listen_fd ? door_fd : cmd_listen_fd;
cmd_t* cmd_q = NULL;
+ client_t* client_lst = NULL;
+
+ int sig_fd = signal_init();
+ if(sig_fd < 0)
+ return -1;
+ FD_SET(sig_fd, &readfds);
+ max_fd = (max_fd < sig_fd) ? sig_fd : max_fd;
- signal_init();
int return_value = 0;
while(!return_value) {
memcpy(&tmpfds, &readfds, sizeof(tmpfds));
return_value = -1;
break;
}
- if(!ret)
+ if(!ret || ret == -1)
continue;
- if(signal_exit) {
+ if(signal_handle()) {
return_value = 1;
break;
}
- if(FD_ISSET(ttyusb_fd, &tmpfds)) {
- return_value = process_ttyusb(ttyusb_fd, &cmd_q);
+ if(FD_ISSET(door_fd, &tmpfds)) {
+ return_value = process_door(door_fd, &cmd_q, client_lst);
if(return_value)
break;
-
- FD_CLR(ttyusb_fd, &tmpfds);
}
if(FD_ISSET(cmd_listen_fd, &tmpfds)) {
log_printf(DEBUG, "new command connection (fd=%d)", new_fd);
FD_SET(new_fd, &readfds);
max_fd = (max_fd < new_fd) ? new_fd : max_fd;
- FD_CLR(cmd_listen_fd, &tmpfds);
+ client_add(&client_lst, new_fd);
}
- int fd;
- for(fd = 0; fd <= max_fd; fd++) {
- if(FD_ISSET(fd, &tmpfds)) {
- return_value = process_cmd(fd, &cmd_q);
+ client_t* lst = client_lst;
+ while(lst) {
+ if(FD_ISSET(lst->fd, &tmpfds)) {
+ return_value = process_cmd(lst->fd, &cmd_q, client_lst);
if(return_value == 1) {
- log_printf(DEBUG, "removing closed command connection (fd=%d)", fd);
- close(fd);
- FD_CLR(fd, &readfds);
+ log_printf(DEBUG, "removing closed command connection (fd=%d)", lst->fd);
+ client_t* deletee = lst;
+ lst = lst->next;
+ FD_CLR(deletee->fd, &readfds);
+ client_remove(&client_lst, deletee->fd);
return_value = 0;
+ continue;
}
if(return_value)
break;
- if(cmd_q && !cmd_q->sent)
- send_command(ttyusb_fd, cmd_q);
}
+ lst = lst->next;
}
+
+ if(cmd_q && !cmd_q->sent)
+ send_command(door_fd, cmd_q);
}
cmd_clear(&cmd_q);
+ client_clear(&client_lst);
+ signal_stop();
return return_value;
}
fclose(pid_file);
}
- int ttyusb_fd = open(opt.ttyusb_dev_, O_RDWR);
- if(ttyusb_fd < 0) {
- log_printf(ERROR, "unable to open %s: %s", opt.ttyusb_dev_, strerror(errno));
+ int door_fd = open(opt.door_dev_, O_RDWR);
+ if(door_fd < 0) {
+ log_printf(ERROR, "unable to open %s: %s", opt.door_dev_, strerror(errno));
options_clear(&opt);
log_close();
exit(-1);
int cmd_listen_fd = init_command_socket(opt.command_sock_);
if(cmd_listen_fd < 0) {
- close(ttyusb_fd);
+ close(door_fd);
options_clear(&opt);
log_close();
exit(-1);
}
- ret = main_loop(ttyusb_fd, cmd_listen_fd);
+ ret = main_loop(door_fd, cmd_listen_fd);
close(cmd_listen_fd);
- close(ttyusb_fd);
+ close(door_fd);
if(!ret)
log_printf(NOTICE, "normal shutdown");
else if(ret < 0)
log_printf(NOTICE, "shutdown after error");
else if(ret == 2)
- log_printf(ERROR, "shutdown after %s read error", opt.ttyusb_dev_);
+ log_printf(ERROR, "shutdown after %s read error", opt.door_dev_);
else
log_printf(NOTICE, "shutdown after signal");
projects / svn42.git / blobdiff