From: hadaq <hadaq>
Date: Sat, 7 Jan 2012 23:31:26 +0000 (+0000)
Subject: tcp support deprecated, remnoved it. Added new option -e
X-Git-Tag: v6.0~95
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=b564ab71f7db0714baf8b646360d6a45b82b7b09;p=trbnettools.git

tcp support deprecated, remnoved it. Added new option -e
---

diff --git a/libtrbnet/trbnet.c b/libtrbnet/trbnet.c
index 35fe471..e312251 100644
--- a/libtrbnet/trbnet.c
+++ b/libtrbnet/trbnet.c
@@ -1,4 +1,4 @@
-const char trbnet_version[] = "$Revision: 4.14 $  Local";
+const char trbnet_version[] = "$Revision: 4.15 $  Local";
 
 #include <stdlib.h>
 #include <signal.h>
@@ -1210,10 +1210,10 @@ static int lockPorts(int masterLock)
 
   /* Wait for semaphore and lock it */
   if (semop(semid, &sops, 1) == -1) {
-    trb_errno = TRB_SEMAPHORE;
-
     /* Unblock signals */
     sigprocmask(SIG_SETMASK, &blockSetOld, NULL);
+    
+    trb_errno = TRB_SEMAPHORE;
     return -1;
   }
 #ifdef ETRAX
@@ -1233,7 +1233,6 @@ static int unlockPorts(int masterLock)
     1,              /* sem_op: increment semaphore by 1, i.e. unlock it  */
     SEM_UNDO        /* sem_flg: remove lock if process gets killed       */
   };
-  int ret = 0;
 
   if ((master_lock == 1) && (masterLock == 0)) {
     return 0;
@@ -1244,24 +1243,21 @@ static int unlockPorts(int masterLock)
   /* Release semaphore */
   if (semop(semid, &sops, 1) == -1) {
     trb_errno = TRB_SEMAPHORE;
-    ret = -1;
     return -1;
   }
 
   /* Unblock Signals */
   if (sigprocmask(SIG_SETMASK, &blockSetOld, NULL) == -1) {
     trb_errno = TRB_SEMAPHORE;
-    ret = -1;
+    return -1;
   }
 
-  return ret;
+  return 0;
 }
 
 
 static int init_semaphore()
 {
-  trb_errno = TRB_NONE;
-
   /* Set signal mask to block ALL signals */
   sigfillset(&blockSet);
   sigemptyset(&blockSetOld);
@@ -1312,6 +1308,8 @@ int init_ports()
   int memfd;
   uint32_t *mem = NULL;
 
+  trb_errno = TRB_NONE;
+
   /* Init semaphore and signal handling */
   if (init_semaphore() == -1) return -1;
 
@@ -1386,6 +1384,8 @@ void close_ports()
 
 int init_ports()
 {
+  trb_errno = TRB_NONE;
+  
   if (trb_debug > 0) {
     fprintf(stderr, "init_ports: called\n");
   }