diff --git a/UDPclient.depend b/UDPclient.depend index 026b5de..76cf40b 100644 --- a/UDPclient.depend +++ b/UDPclient.depend @@ -29,7 +29,7 @@ -1396204130 source:/home/chch/HengLongUDPclient/main.c +1396399727 source:/home/chch/HengLongUDPclient/main.c @@ -176,7 +176,7 @@ 1395878369 source:/home/chch/HengLongUDPclient/checkvideo.c "checkvideo.h" -1396204073 source:/home/chch/HengLongUDPclient/checkkillswitch.c +1396205007 source:/home/chch/HengLongUDPclient/checkkillswitch.c "checkkillswitch.h" 1396202748 /home/chch/HengLongUDPclient/checkkillswitch.h diff --git a/bin/Debug/UDPclient b/bin/Debug/UDPclient index f2ca4dc..bc4f90a 100755 Binary files a/bin/Debug/UDPclient and b/bin/Debug/UDPclient differ diff --git a/bin/Release/UDPclient b/bin/Release/UDPclient index e4306a6..802f78d 100755 Binary files a/bin/Release/UDPclient and b/bin/Release/UDPclient differ diff --git a/checkkillswitch.c b/checkkillswitch.c index 7d1e37c..113406c 100644 --- a/checkkillswitch.c +++ b/checkkillswitch.c @@ -52,7 +52,7 @@ int checkkillswitch(char* ip, uint16_t port, char* url) { char rb[1024]; int n; - if(0==ip[0]) return 0; + if(0==ip[0]) return 1; getPage(ip, port, url, rb, sizeof(rb)); n = strstr(rb, "true"); if(NULL != n) return 1; diff --git a/main.c b/main.c index 972d69d..11ac457 100644 --- a/main.c +++ b/main.c @@ -541,7 +541,7 @@ int main(int argc, char* argv[]) n_send = sendto(sockfd, &senddata, sizeof(senddata), 0, (struct sockaddr *)&servaddr, sizeof(servaddr)); printf("SEND FRAME -- FRM_NBR: %5d, BYTES send: %3d, SEND_FRM: %#x, CLINBR: %d, CLISEL: %d, SERVOFF: %d\n", frame_nbr, n_send, frame, senddata.clinbr, senddata.clisel, senddata.servoff); - if(pthread_kill(keybthread, 0)) break; + if(keyboard_thread_args.filename[0]) if(pthread_kill(keybthread, 0)) break; } return 0; diff --git a/obj/Debug/checkkillswitch.o b/obj/Debug/checkkillswitch.o index 66681d4..7df0507 100644 Binary files a/obj/Debug/checkkillswitch.o and b/obj/Debug/checkkillswitch.o differ diff --git a/obj/Debug/main.o b/obj/Debug/main.o index 1269ab6..1189207 100644 Binary files a/obj/Debug/main.o and b/obj/Debug/main.o differ diff --git a/obj/Release/checkkillswitch.o b/obj/Release/checkkillswitch.o index eb28eff..eddff93 100644 Binary files a/obj/Release/checkkillswitch.o and b/obj/Release/checkkillswitch.o differ diff --git a/obj/Release/main.o b/obj/Release/main.o index 9d4a8f8..5949939 100644 Binary files a/obj/Release/main.o and b/obj/Release/main.o differ