fixed bug which modified DAQOPSERVER and TRB3_SERVER environment variables after...

diff --git a/libtrbnet/trb3sim.c b/libtrbnet/trb3sim.c
index 76c69404d0d4036c8ba62e0b0685f52cb1d30861..4cc5f9a78be3352ced0f9d9381e112ab55c60991 100644 (file)
--- a/libtrbnet/trb3sim.c
+++ b/libtrbnet/trb3sim.c
@@ -56,7 +56,8 @@ int init_ports()
     .ai_canonname = NULL,
     .ai_next      = NULL
   };
-  const char* trb3_port = NULL;
+  char trb3Server[256] = "";
+  const char *trb3_port = NULL;
   char* tmp = NULL;
   int status = -1;
 
@@ -80,14 +81,15 @@ int init_ports()
   /* Get TRB3 IP-Address */
   tmp = getenv("TRB3_SERVER");
   if (tmp != NULL) {
-    char* separator =  NULL;
-    if ((separator = rindex(tmp, ':')) != NULL) {
+    char *separator =  NULL;
+       strncpy(trb3Server, tmp, 256);
+    if ((separator = rindex(trb3Server, ':')) != NULL) {
       *separator = '\0';
       trb3_port = separator + 1;
     } else {
       trb3_port = TRB3_UDP_PORT_NEW;
     }
-    strncpy(trb3_server, tmp, NI_MAXHOST);
+    strncpy(trb3_server, trb3Server, NI_MAXHOST);
   } else {
     /* Choose default name and port */
     trb3_port = TRB3_UDP_PORT_OLD;

diff --git a/libtrbnet/trbnet.c b/libtrbnet/trbnet.c
index 9faad35daa17441ceae2fdc279b967426e101b02..9477d432580fbfe6e8349a625f6da870aced2e4c 100644 (file)
--- a/libtrbnet/trbnet.c
+++ b/libtrbnet/trbnet.c
@@ -1758,8 +1758,9 @@ int init_ports()
     .ai_canonname = NULL,
     .ai_next      = NULL
   };
-  const char* trb3_port = NULL;
-  char* tmp = NULL;
+  char trb3Server[256] = "";
+  const char *trb3_port = NULL;
+  const char *tmp = NULL;
   int status = -1;
   
   trb_errno = TRB_NONE;
@@ -1781,14 +1782,15 @@ int init_ports()
   /* Get TRB3 IP-Address */
   tmp = getenv("TRB3_SERVER");
   if (tmp != NULL) {
-    char* separator =  NULL;
-    if ((separator = rindex(tmp, ':')) != NULL) {
+    char *separator =  NULL;
+    strncpy(trb3Server, tmp, 256);
+    if ((separator = rindex(trb3Server, ':')) != NULL) {
       *separator = '\0';
       trb3_port = separator + 1;
     } else {
       trb3_port = TRB3_UDP_PORT_NEW;
     }
-    strncpy(trb3_server, tmp, NI_MAXHOST);
+    strncpy(trb3_server, trb3Server, NI_MAXHOST);
   } else {
     /* Choose default name and port */
     trb3_port = TRB3_UDP_PORT_OLD;

diff --git a/trbnetd/server/Makefile b/trbnetd/server/Makefile
index a67084ace58b7c4a897de935e281824ea68a627f..c747f1152096e897dde40949787cec464f7389c1 100644 (file)
--- a/trbnetd/server/Makefile
+++ b/trbnetd/server/Makefile
@@ -103,7 +103,7 @@ depend:
 
 install: $(TARGETS)
        mkdir -p $(DESTDIR)/bin
-       install -m 775 $(TARGETS) $(DESTDIR)/bin/
+       install -m 775 $(TARGETS) $(DESTDIR)/binlocal/
 
 # ------------ Dependencies --------------------------------------------
 

diff --git a/trbnetd/trbnetrpc.c b/trbnetd/trbnetrpc.c
index 9f605fbbd91a55a7790581d490db77ab041aa2da..ad1107f38fbdb7cc21bacf27f153c5e77bf64c48 100644 (file)
--- a/trbnetd/trbnetrpc.c
+++ b/trbnetd/trbnetrpc.c
@@ -30,16 +30,18 @@ int trb_connect(const char *server)
   uint32_t server_rpc_prog_id = TRBNETRPCPROG;
 
   if (server == NULL) {
-    char *tmp;
+    char daqopServer[256] = "";
+    const char *tmp;
     tmp = getenv("DAQOPSERVER");
     if (tmp != NULL) {
       uint32_t id = 0;
       char* separator =  NULL;
-      if ((separator = rindex(tmp, ':')) != NULL) {
+      strncpy(daqopServer, tmp, 256);
+      if ((separator = rindex(daqopServer, ':')) != NULL) {
         *separator = '\0';
         id = strtoul(separator + 1, NULL, 0);
       }
-      strncpy(trb_server, tmp, 128);
+      strncpy(trb_server, daqopServer, 128);
       server_rpc_prog_id = ((server_rpc_prog_id & 0xffff00ff) | (id << 8));
     } else {
       sprintf(trb_server, "etraxp023");