eddy/SBIG_340
1
0
Fork 0
mirror of https://github.com/eddyem/SBIG_340.git synced 2026-02-01 04:45:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix bug in socket.c

Browse Source
This commit is contained in:
eddyem 2017-04-17 17:02:13 +03:00
parent 91f3b192cd
commit b24eaf360b
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main.c
View File

@ -55,7 +55,17 @@ int main(int argc, char **argv){
imstorage *img = NULL;
imsubframe *F = NULL;
// daemonize @ start
#if defined DAEMON || defined CLIENT
#ifndef EBUG
if(!G->once){
green("Daemonize\n");
if(daemon(1, 0)){
ERR("daemon()");
}
}
#endif
#endif
#ifndef CLIENT
if(G->splist){
list_speeds();
@ -88,7 +98,7 @@ int main(int argc, char **argv){
img->timestamp = G->timestamp;
#endif
#ifndef DAEMON
img->imname = G->outpfname;
img->imname = strdup(G->outpfname);
img->exposetime = time(NULL);
if(!chk_storeimg(img, G->imstoretype, G->imformat)) return 1;
#endif

20
socket.c
View File

@ -224,7 +224,7 @@ void *handle_socket(void *asock){
int sock = *((int*)asock);
int webquery = 0; // whether query is web or regular
char buff[BUFLEN];
ssize_t readed;
ssize_t _read;
while(1){
if(!waittoread(sock)){ // no data incoming
pthread_mutex_lock(&mutex);
@ -241,14 +241,14 @@ void *handle_socket(void *asock){
pthread_mutex_unlock(&mutex);
continue;
}
if(!(readed = read(sock, buff, BUFLEN))) continue;
DBG("Got %zd bytes", readed);
if(readed < 0){ // error or disconnect
DBG("Nothing to read from fd %d (ret: %zd)", sock, readed);
_read = read(sock, buff, BUFLEN);
if(_read < 0){ // error or disconnect
DBG("Nothing to read from fd %d (ret: %zd)", sock, _read);
break;
}
DBG("Got %zd bytes", _read);
// add trailing zero to be on the safe side
buff[readed] = 0;
buff[_read] = 0;
// now we should check what do user want
char *got, *found = buff;
if((got = stringscan(buff, "GET")) || (got = stringscan(buff, "POST"))){ // web query
@ -334,8 +334,8 @@ static void daemon_(imstorage *img, int sock){
pthread_mutex_lock(&mutex);
if(copyima(img)){
++imctr;
if(img->imtype != IMTYPE_DARK)
save_histo(NULL, img); // calculate next optimal exposition
if(img->imtype != IMTYPE_DARK)
save_histo(NULL, img); // calculate next optimal exposition
}
pthread_mutex_unlock(&mutex);
}
@ -426,10 +426,6 @@ void daemonize(imstorage *img, char *hostname, char *port){
FNAME();
#ifndef EBUG
if(!img->once){
green("Daemonize\n");
if(daemon(1, 0)){
ERR("daemon()");
}
while(1){ // guard for dead processes
pid_t childpid = fork();
if(childpid){