From d6e78c19ad928f0a5143f43a64f4b0d8613f8e24 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 1 Nov 2016 11:09:28 +0100 Subject: [PATCH 1/7] changing send, rc timeout --- slsReceiverSoftware/include/genericSocket.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/slsReceiverSoftware/include/genericSocket.h b/slsReceiverSoftware/include/genericSocket.h index 0fad365fe..0292d6c23 100644 --- a/slsReceiverSoftware/include/genericSocket.h +++ b/slsReceiverSoftware/include/genericSocket.h @@ -473,13 +473,13 @@ enum communicationProtocol{ //cout << "socketdescriptor "<< socketDescriptor << endl; struct timeval tout; tout.tv_sec = 0; - tout.tv_usec = 0; + tout.tv_usec = 500;//0; if(::setsockopt(socketDescriptor, SOL_SOCKET, SO_RCVTIMEO, &tout, sizeof(struct timeval)) <0) { cerr << "Error in setsockopt SO_RCVTIMEO "<< 0 << endl; } - tout.tv_sec = ts; - tout.tv_usec = 0; + tout.tv_sec = 0;//ts; + tout.tv_usec = 500;//0; if(::setsockopt(socketDescriptor, SOL_SOCKET, SO_SNDTIMEO, &tout, sizeof(struct timeval)) < 0) { cerr << "Error in setsockopt SO_SNDTIMEO " << ts << endl; From 0c257dbcddf18a82eb47e79c67e716d0666afade Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 1 Nov 2016 12:04:08 +0100 Subject: [PATCH 2/7] something --- slsReceiverSoftware/include/genericSocket.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/slsReceiverSoftware/include/genericSocket.h b/slsReceiverSoftware/include/genericSocket.h index 0292d6c23..36f7b5bbc 100644 --- a/slsReceiverSoftware/include/genericSocket.h +++ b/slsReceiverSoftware/include/genericSocket.h @@ -404,10 +404,12 @@ enum communicationProtocol{ cerr << "Can not create socket "<0){ nsending = (length>packet_size) ? packet_size:length; + cout<<"going to read from " << serverAddress.sin_port << endl; nsent = read(file_des,(char*)buf+total_sent,nsending); + cout <<"read**" <0){ nsending = (length>packet_size) ? packet_size:length; + cout<<"going to send to " << serverAddress.sin_port << endl; nsent = write(file_des,(char*)buf+total_sent,nsending); + cout<<"sent**" < Date: Tue, 1 Nov 2016 12:06:08 +0100 Subject: [PATCH 3/7] something --- slsReceiverSoftware/include/genericSocket.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slsReceiverSoftware/include/genericSocket.h b/slsReceiverSoftware/include/genericSocket.h index 36f7b5bbc..aa3a29639 100644 --- a/slsReceiverSoftware/include/genericSocket.h +++ b/slsReceiverSoftware/include/genericSocket.h @@ -448,7 +448,7 @@ enum communicationProtocol{ close(file_des); } else { - while(!shutdown(socketDescriptor, SHUT_RDWR)); + //while(!shutdown(socketDescriptor, SHUT_RDWR)); close(socketDescriptor); socketDescriptor=-1; } From 8bb0249d5bf3f5ae78da73b58aaa5029c7958981 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 1 Nov 2016 13:09:16 +0100 Subject: [PATCH 4/7] reverted timeouts --- slsReceiverSoftware/include/genericSocket.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slsReceiverSoftware/include/genericSocket.h b/slsReceiverSoftware/include/genericSocket.h index aa3a29639..77b8ba2f6 100644 --- a/slsReceiverSoftware/include/genericSocket.h +++ b/slsReceiverSoftware/include/genericSocket.h @@ -480,8 +480,8 @@ enum communicationProtocol{ { cerr << "Error in setsockopt SO_RCVTIMEO "<< 0 << endl; } - tout.tv_sec = 0;//ts; - tout.tv_usec = 500;//0; + tout.tv_sec = ts; + tout.tv_usec = 0; if(::setsockopt(socketDescriptor, SOL_SOCKET, SO_SNDTIMEO, &tout, sizeof(struct timeval)) < 0) { cerr << "Error in setsockopt SO_SNDTIMEO " << ts << endl; From 5de9ade51d32cc3ba40fb89dbb0cfc736a4b9f31 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 1 Nov 2016 14:04:37 +0100 Subject: [PATCH 5/7] some changes --- slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp index 1a477e7cd..231fad345 100644 --- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp +++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp @@ -911,14 +911,15 @@ int slsReceiverTCPIPInterface::stop_receiver(){ int slsReceiverTCPIPInterface::get_status(){ ret=OK; - enum runStatus retval = ERROR; + int retval=-1; + enum runStatus s=ERROR; // execute action if the arguments correctly arrived #ifdef SLS_RECEIVER_UDP_FUNCTIONS if (receiverBase == NULL){ strcpy(mess,SET_RECEIVER_ERR_MESSAGE); ret=FAIL; - }else retval=receiverBase->getStatus(); + }else s=receiverBase->getStatus(); #endif if(ret==OK && socket->differentClients){ @@ -932,6 +933,7 @@ int slsReceiverTCPIPInterface::get_status(){ cprintf(RED, "%s\n", mess); socket->SendDataOnly(mess,sizeof(mess)); } + retval = (runStatus(s)) socket->SendDataOnly(&retval,sizeof(retval)); //return ok/fail return ret; From e0aee67dcd3035772fcd803d2c279f509f6700d0 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 1 Nov 2016 14:06:45 +0100 Subject: [PATCH 6/7] some changes --- slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp index 231fad345..94ab9461f 100644 --- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp +++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp @@ -933,7 +933,7 @@ int slsReceiverTCPIPInterface::get_status(){ cprintf(RED, "%s\n", mess); socket->SendDataOnly(mess,sizeof(mess)); } - retval = (runStatus(s)) + retval = (runStatus(s)); socket->SendDataOnly(&retval,sizeof(retval)); //return ok/fail return ret; From b9ac75330c80b31341e8ead641a4ed970b2ca795 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Tue, 1 Nov 2016 16:36:32 +0100 Subject: [PATCH 7/7] removed all prints in generic --- slsReceiverSoftware/include/genericSocket.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/slsReceiverSoftware/include/genericSocket.h b/slsReceiverSoftware/include/genericSocket.h index 77b8ba2f6..d1e17575b 100644 --- a/slsReceiverSoftware/include/genericSocket.h +++ b/slsReceiverSoftware/include/genericSocket.h @@ -404,12 +404,10 @@ enum communicationProtocol{ cerr << "Can not create socket "<0){ nsending = (length>packet_size) ? packet_size:length; - cout<<"going to read from " << serverAddress.sin_port << endl; nsent = read(file_des,(char*)buf+total_sent,nsending); - cout <<"read**" <0){ nsending = (length>packet_size) ? packet_size:length; - cout<<"going to send to " << serverAddress.sin_port << endl; nsent = write(file_des,(char*)buf+total_sent,nsending); - cout<<"sent**" <