X-Git-Url: https://git.realraum.at/?p=svn42.git;a=blobdiff_plain;f=powersensordaemon%2Fpowersensordaemon.c;h=133533e2391085edd816e5a805d76d67eb1cad09;hp=0c79e94968e573eabe2a4198c7fd61a7b8e35ece;hb=a34e51d757fe52cb19de2937ae1b211894167524;hpb=1e3d3a58756a74fe837636bf7791926494778f4c diff --git a/powersensordaemon/powersensordaemon.c b/powersensordaemon/powersensordaemon.c index 0c79e94..133533e 100644 --- a/powersensordaemon/powersensordaemon.c +++ b/powersensordaemon/powersensordaemon.c @@ -76,29 +76,50 @@ int init_command_socket(const char* path) return fd; } +void clear_fd(int fd) +{ + fd_set fds; + struct timeval tv; + FD_ZERO(&fds); + FD_SET(fd, &fds); + tv.tv_sec = 0; + tv.tv_usec = 50000; + for(;;) { + int ret = select(fd+1, &fds, NULL, NULL, &tv); + if(ret > 0) { + char buffer[100]; + ret = read(fd, buffer, sizeof(buffer)); + } + else + break; + } +} + int send_command(int tty_fd, cmd_t* cmd) { if(!cmd) return -1; - char c; + if(!cmd->param) + return 0; + + unsigned int j,cmd_param_len = strnlen(cmd->param,60); + + char c[cmd_param_len]; switch(cmd->cmd) { case POWER_ON: { - if(!cmd->param) - return 0; - c = toupper(cmd->param[0]); + for (j=0; j< cmd_param_len; j++) + c[j] = toupper(cmd->param[j]); break; } case POWER_OFF: { - if(!cmd->param) - return 0; - c = tolower(cmd->param[0]); + for (j=0; j< cmd_param_len; j++) + c[j] = tolower(cmd->param[j]); break; } case SAMPLE: { - if(!cmd->param) - return 0; - c = cmd->param[0]; + for (j=0; j< cmd_param_len; j++) + c[j] = cmd->param[j]; break; } default: return 0; @@ -106,7 +127,7 @@ int send_command(int tty_fd, cmd_t* cmd) int ret; do { - ret = write(tty_fd, &c, 1); + ret = write(tty_fd, c, cmd_param_len); } while(!ret || (ret == -1 && errno == EINTR)); if(ret > 0) { @@ -192,7 +213,7 @@ int process_cmd(char* cmd, int fd, cmd_t **cmd_q, client_t* client_lst, options_ if(cmd_id == POWER_ON || cmd_id == POWER_OFF) { char* orig_param = param; - param = key_value_storage_find(&opt->powerids_, param); + param = key_value_storage_find(&(opt->powerids_), param); if(!param) { send_response(fd, "Error: invalid power id"); log_printf(WARNING, "invalid power id '%s' in command from %d", orig_param, fd); @@ -201,7 +222,7 @@ int process_cmd(char* cmd, int fd, cmd_t **cmd_q, client_t* client_lst, options_ if(cmd_id == SAMPLE) { char* orig_param = param; - param = key_value_storage_find(&opt->sampledevs_, param); + param = key_value_storage_find(&(opt->sampledevs_), param); if(!param) { send_response(fd, "Error: invalid sample device"); log_printf(WARNING, "invalid sample device '%s' in command from %d", orig_param, fd); @@ -244,16 +265,14 @@ int process_cmd(char* cmd, int fd, cmd_t **cmd_q, client_t* client_lst, options_ if(!param || !strncmp(param, "all", 3)) { listener->request_listener = 1; listener->error_listener = 1; - listener->temp_listener = 1; - listener->photo_listener = 1; + listener->sensor_listener = 1; listener->movement_listener = 1; listener->button_listener = 1; } else if(!strncmp(param, "none", 4)) { listener->request_listener = 0; listener->error_listener = 0; - listener->temp_listener = 0; - listener->photo_listener = 0; + listener->sensor_listener = 0; listener->movement_listener = 0; listener->button_listener = 0; } @@ -261,10 +280,8 @@ int process_cmd(char* cmd, int fd, cmd_t **cmd_q, client_t* client_lst, options_ listener->request_listener = 1; else if(!strncmp(param, "error", 5)) listener->error_listener = 1; - else if(!strncmp(param, "temp", 4)) - listener->temp_listener = 1; - else if(!strncmp(param, "photo", 5)) - listener->photo_listener = 1; + else if(!strncmp(param, "sensor", 6)) + listener->sensor_listener = 1; else if(!strncmp(param, "movement", 8)) listener->movement_listener = 1; else if(!strncmp(param, "button", 6)) @@ -315,8 +332,9 @@ int nonblock_readline(read_buffer_t* buffer, int fd, cmd_t** cmd_q, client_t* cl return ret; } -int process_tty(read_buffer_t* buffer, int tty_fd, cmd_t **cmd_q, client_t* client_lst) +int process_tty(read_buffer_t* buffer, int tty_fd, cmd_t **cmd_q, client_t* client_lst, options_t* opt) { + u_int8_t *response_data; int ret = 0; struct timeval tv; fd_set fds; @@ -348,28 +366,54 @@ int process_tty(read_buffer_t* buffer, int tty_fd, cmd_t **cmd_q, client_t* clie log_printf(NOTICE, "firmware: %s", buffer->buf); + /* modify response if necessary */ + response_data = buffer->buf; + if(!strncmp(buffer->buf, "Sensor ", 7)) { + if (buffer->buf[7] != 0) + { + char *sampledev_key; + if (asprintf(&sampledev_key, "%c",buffer->buf[7])) + { + char const *sampledev_name = key_value_storage_find_first_stringvalue(&(opt->sampledevs_), sampledev_key); + if(sampledev_name) + { + char *rev_lookuped_output; + if (asprintf(&rev_lookuped_output, "%s%s", sampledev_name, &(buffer->buf[8]) )) + response_data = rev_lookuped_output; + } + else + log_printf(WARNING, "unknown sample device key '%s' encountered", sampledev_key); + free(sampledev_key); + } + } + } + int cmd_fd = -1; if(cmd_q && (*cmd_q)) { cmd_fd = (*cmd_q)->fd; - send_response(cmd_fd, buffer->buf); + send_response(cmd_fd, response_data); } if(!strncmp(buffer->buf, "Error:", 6)) { - SEND_TO_LISTENER(error_listener, "error", cmd_fd, buffer->buf); + SEND_TO_LISTENER(error_listener, "error", cmd_fd, response_data); } if(!strncmp(buffer->buf, "movement", 8)) { - SEND_TO_LISTENER(movement_listener, "movement", cmd_fd, buffer->buf); + SEND_TO_LISTENER(movement_listener, "movement", cmd_fd, response_data); } if(!strncmp(buffer->buf, "PanicButton", 11)) { - SEND_TO_LISTENER(button_listener, "panic buttont", cmd_fd, buffer->buf); + SEND_TO_LISTENER(button_listener, "panic button", cmd_fd, response_data); } - if(!strncmp(buffer->buf, "Temp ", 5)) { - SEND_TO_LISTENER(temp_listener, "", cmd_fd, buffer->buf); + if(!strncmp(buffer->buf, "Sensor ", 7)) { + SEND_TO_LISTENER(sensor_listener, "sensor data", cmd_fd, response_data); } + /* free allocated buffer if response was modified */ + if (response_data != buffer->buf) + free(response_data); + cmd_pop(cmd_q); buffer->offset = 0; return 0; @@ -386,17 +430,24 @@ int process_tty(read_buffer_t* buffer, int tty_fd, cmd_t **cmd_q, client_t* clie return ret; } -int main_loop(int tty_fd, int cmd_listen_fd, int autosample_fd, options_t* opt) +int main_loop(int tty_fd, int cmd_listen_fd, autosample_process_t* autosample, options_t* opt) { log_printf(NOTICE, "entering main loop"); fd_set readfds, tmpfds; FD_ZERO(&readfds); + + clear_fd(tty_fd); FD_SET(tty_fd, &readfds); FD_SET(cmd_listen_fd, &readfds); int max_fd = tty_fd > cmd_listen_fd ? tty_fd : cmd_listen_fd; - FD_SET(autosample_fd, &readfds); - max_fd = (max_fd < autosample_fd) ? autosample_fd : max_fd; + + u_int8_t autosample_enabled = 0; + if(autosample->pid_ > 0) { + clear_fd(autosample->write_fd_); + FD_SET(autosample->write_fd_, &readfds); + max_fd = (max_fd < autosample->write_fd_) ? autosample->write_fd_ : max_fd; + } cmd_t* cmd_q = NULL; client_t* client_lst = NULL; @@ -443,7 +494,7 @@ int main_loop(int tty_fd, int cmd_listen_fd, int autosample_fd, options_t* opt) } if(FD_ISSET(tty_fd, &tmpfds)) { - return_value = process_tty(&tty_buffer, tty_fd, &cmd_q, client_lst); + return_value = process_tty(&tty_buffer, tty_fd, &cmd_q, client_lst, opt); if(return_value) break; } @@ -462,11 +513,11 @@ int main_loop(int tty_fd, int cmd_listen_fd, int autosample_fd, options_t* opt) client_add(&client_lst, new_fd); } - if(FD_ISSET(autosample_fd, &tmpfds)) { - return_value = nonblock_readline(&autosample_buffer, autosample_fd, &cmd_q, client_lst, opt); + if(autosample->pid_ > 0 && FD_ISSET(autosample->write_fd_, &tmpfds)) { + return_value = nonblock_readline(&autosample_buffer, autosample->write_fd_, &cmd_q, client_lst, opt); if(return_value == 2) { log_printf(WARNING, "autosample not running, removing pipe to it"); - FD_CLR(autosample_fd, &readfds); + FD_CLR(autosample->write_fd_, &readfds); return_value = 0; continue; } @@ -491,11 +542,31 @@ int main_loop(int tty_fd, int cmd_listen_fd, int autosample_fd, options_t* opt) break; } - lst = lst->next; + if(lst) + lst = lst->next; } if(cmd_q && !cmd_q->sent) send_command(tty_fd, cmd_q); + + if(autosample->pid_ > 0) { + lst = client_lst; + int listener_cnt = 0; + while(lst) { + if(lst->sensor_listener) + listener_cnt++; + lst = lst->next; + } + if((!autosample_enabled && listener_cnt > 0) || + (autosample_enabled && listener_cnt == 0)) { + if(autosample_enabled) autosample_enabled = 0; + else autosample_enabled = 1; + int ret; + do { + ret = write(autosample->read_fd_, &autosample_enabled, 1); + } while(!ret || (ret == -1 && errno == EINTR)); + } + } } cmd_clear(&cmd_q); @@ -540,21 +611,7 @@ int setup_tty(int fd) return ret; } - fd_set fds; - struct timeval tv; - FD_ZERO(&fds); - FD_SET(fd, &fds); - tv.tv_sec = 0; - tv.tv_usec = 50000; - for(;;) { - ret = select(fd+1, &fds, NULL, NULL, &tv); - if(ret > 0) { - char buffer[100]; - ret = read(fd, buffer, sizeof(buffer)); - } - else - break; - } + clear_fd(fd); return 0; } @@ -650,23 +707,14 @@ int main(int argc, char* argv[]) fclose(pid_file); } - int autosample_fd = -1; + autosample_process_t autosample; + autosample.pid_ = -1; + autosample.write_fd_ = -1; + autosample.read_fd_ = -1; if(key_value_storage_length(&opt.autosampledevs_) > 0) { log_printf(NOTICE, "starting autosample process"); - autosample_fd = start_autosample_process(&opt); - if(autosample_fd == -1) { - options_clear(&opt); - log_close(); - exit(1); - } - else if(autosample_fd <= 0) { - if(!autosample_fd) - log_printf(NOTICE, "autosample process normal shutdown"); - else if(autosample_fd == -2) - log_printf(NOTICE, "autosample shutdown after signal"); - else - log_printf(NOTICE, "autosample shutdown after error"); - + int ret = start_autosample_process(&opt, &autosample); + if(ret == -1) { options_clear(&opt); log_close(); exit(1); @@ -690,7 +738,7 @@ int main(int argc, char* argv[]) if(ret) ret = 2; else - ret = main_loop(tty_fd, cmd_listen_fd, autosample_fd, &opt); + ret = main_loop(tty_fd, cmd_listen_fd, &autosample, &opt); } if(ret == 2) { @@ -706,6 +754,8 @@ int main(int argc, char* argv[]) close(cmd_listen_fd); if(tty_fd > 0) close(tty_fd); + if(autosample.pid_ > 0) + kill(autosample.pid_, SIGTERM); if(!ret) log_printf(NOTICE, "normal shutdown");