From: hadaq <hadaq>
Date: Tue, 22 Jun 2010 17:55:32 +0000 (+0000)
Subject: bug fix tcp server
X-Git-Tag: v6.0~255
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=0dd36e7e9dfcf2aebd0fd86aa85538079242db73;p=trbnettools.git

bug fix tcp server
---

diff --git a/libtrbnet/trbcmd.c b/libtrbnet/trbcmd.c
index 965b56f..cffd35a 100644
--- a/libtrbnet/trbcmd.c
+++ b/libtrbnet/trbcmd.c
@@ -24,7 +24,6 @@
 
 #include <sys/types.h>
 #include <sys/ipc.h>
-#include <sys/sem.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <netinet/in.h>
@@ -35,7 +34,7 @@
 
 static int hexMode = HEXMODE;
 
-static const char trbcmd_version[] = "$Revision: 2.51 $";
+static const char trbcmd_version[] = "$Revision: 2.52 $";
 
 #define BACKLOG 10
 static uint16_t tcp_port = 55555;
@@ -1269,7 +1268,7 @@ int main(int argc, char **argv)
 
   if (strcmp(argv[argc - 1], "tcp") != 0) {
     /* Run normal TRBCMD */
-    init_ports();
+    if (init_ports() == -1) exit(EXIT_FAILURE);
 
     if (start(argc, argv) == 0) {
       exit(EXIT_SUCCESS);
@@ -1350,7 +1349,7 @@ int main(int argc, char **argv)
     my_addr.sin_port = htons(tcp_port);
     my_addr.sin_addr.s_addr = INADDR_ANY;
     memset(&(my_addr.sin_zero), 0, 8);
-
+    
     if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int))
         == -1) {
       perror("setsockopt() error!");
@@ -1416,6 +1415,8 @@ int main(int argc, char **argv)
         stdout = clientout;
         stderr = clientout;
         
+        if (init_ports() == -1) exit(EXIT_FAILURE);
+        
         while (1) {
           msgLen = recv(myFd, (void *)command, 256, 0);
           if (msgLen == -1) {