handle SIGPIPE

diff --git a/rigold.c b/rigold.c
index 974a814f348f8d0fdeb9fb2da71eb52c9ba9da18..8f73431b8967a628c9bdf388a0e730dc462c9f03 100644 (file)
--- a/rigold.c
+++ b/rigold.c
@@ -6,6 +6,7 @@
 #include <string.h>
 #include <strings.h>
 #include <unistd.h>
 #include <string.h>
 #include <strings.h>
 #include <unistd.h>

+#include <signal.h>

 
 #include "scope.h"
 #include "commands.h"
 
 #include "scope.h"
 #include "commands.h"


@@ -115,8 +116,14 @@ static void parse_request(int s, struct scope *sc)
        }
 }
 
        }
 }
 

+void sighandler(int sig)
+{
+       printf("Signal %d received\n", sig);
+}
+

 int main(int argc, char **argv) 
 {
 int main(int argc, char **argv) 
 {

+       struct sigaction act;

        int sock, csock;
        int opt;
        socklen_t slen;
        int sock, csock;
        int opt;
        socklen_t slen;


@@ -125,6 +132,18 @@ int main(int argc, char **argv)
        unsigned short port = 8088;
 
        sc = initscope();
        unsigned short port = 8088;
 
        sc = initscope();

+       if (sc == NULL) {
+               printf("Scope not found!\n");
+               exit(EXIT_FAILURE);
+       }
+
+       bzero(&act, sizeof(act));
+       act.sa_handler = sighandler;
+       act.sa_flags = SA_RESTART;
+       if (sigaction(SIGPIPE, &act, NULL) == -1) {
+               perror("sigaction");
+               exit(EXIT_FAILURE);
+       }

 
        if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
                perror("socket");
 
        if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
                perror("socket");

diff --git a/usbtmc.c b/usbtmc.c
index 0249e25712b766dd44c3679b25996c1f0c0084c9..729f6db5028d016c361ce8213662aab73647256d 100644 (file)
--- a/usbtmc.c
+++ b/usbtmc.c
@@ -6,7 +6,7 @@
 
 #include "usbtmc.h"
 
 
 #include "usbtmc.h"
 

-#define USB_TIMEOUT 10000
+#define USB_TIMEOUT 50000

 
 //Helper-routine: Convert a little-endian 4-byte word to an int
 static void int2chars(unsigned char *buff,unsigned int a) {
 
 //Helper-routine: Convert a little-endian 4-byte word to an int
 static void int2chars(unsigned char *buff,unsigned int a) {