add mutex locking to multicast sockets

.gitignore

@@ -11,6 +11,8 @@
 *.pcm
 # python pre-compiled modules
 *.pyc
+# core dumps
+core
 
 # lib folder is populated during build
 lib/
@@ -23,3 +25,4 @@ tempinclude/
 main
 NodeDaemon
 RemoteControl
+MCDebug

configfiles/Dummy/ToolChainConfig

@@ -18,8 +18,8 @@ log_interactive 1	# Interactive=cout; 0=false, 1= true
 log_local 1 		# Local = local file log; 0=false, 1= true
 log_local_path ./log 	# file to store logs to if local is active
 log_remote 1   		# Remote= remote logging system "serservice_name Remote_Logging";  0=false, 1= true
-log_address 239.192.1.1 # Remote multicast address to send logs
-log_port 55554 		# port on remote machine to connect to
+log_address 239.192.1.2 # Remote multicast address to send logs
+log_port 5000 		# port on remote machine to connect to
 log_append_time 0       # append seconds since epoch to filename; 0=false, 1= true
 log_split_files 1	# seperate output and error log files (named x.o and x.e)
 
@@ -46,8 +46,8 @@ clt_dlr_socket_timeout 500	#
 inpoll_timeout 50      		# keep these short!
 outpoll_timeout 50  		# keep these short!
 command_timeout 2000		#
-multicast_port 55554		#
-multicast_address 239.192.1.1	#
+mon_port 5000			#
+mon_address 239.192.1.3		#
 
 ##### Tools To Add #####
 Tools_File configfiles/Dummy/ToolsConfig	# list of tools to run and their config files

configfiles/template/ToolChainConfig

@@ -18,8 +18,8 @@ log_interactive 1	 # Interactive=cout; 0=false, 1= true
 log_local 0 		 # Local = local file log; 0=false, 1= true
 log_local_path ./log 	 # file to store logs to if local is active
 log_remote 0   		 # Remote= remote logging system "serservice_name Remote_Logging";  0=false, 1= true
-log_address 239.192.1.1  # Remote multicast address to send logs
-log_port 5001            # port on remote machine to connect to
+log_address 239.192.1.2  # Remote multicast address to send logs
+log_port 5000            # port on remote machine to connect to
 log_append_time 0	 # append seconds since epoch to filename; 0=false, 1= true
 log_split_files 0 	 # seperate output and error log files (named x.o and x.e)
 
@@ -45,8 +45,8 @@ clt_dlr_socket_timeout 500	#
 inpoll_timeout 50      		# keep these short!
 outpoll_timeout 50  		# keep these short!
 command_timeout 2000		#
-multicast_port 55554		#
-multicast_address 239.192.1.1	#
+mon_port 5000		#
+mon_address 239.192.1.3	#
 
 ##### Tools To Add #####
 Tools_File configfiles/ToolsConfig    # list of tools to run and their config files

src/DAQDataModelBase/DAQUtilities.cpp

@@ -119,10 +119,11 @@ int DAQUtilities::UpdateConnections(std::string ServiceName, zmq::socket_t* sock
     if(port=="" && port_name=="") service->Get("remote_port",remote_port);
     else if(port_name!="") service->Get(port_name, remote_port);
     if(remote_port==""){
-     delete service;
-     service=0;
-     continue;	  
+      delete service;
+      service=0;
+      continue;
     }
+    //printf("updateconnections checking if service '%s' is interested in client '%s' on port '%s'\n",ServiceName.c_str(), type.c_str(),remote_port.c_str());
 
     std::string tmp=ip + ":" + remote_port;
 
@@ -162,7 +163,7 @@ DAQThread_args* DAQUtilities::CreateThread(std::string ThreadName,  void (*func)
   }
 
   return args;
-}                    
+}
 
 void *DAQUtilities::String_Thread(void *arg){
 
@@ -189,11 +190,11 @@ void *DAQUtilities::String_Thread(void *arg){
       zmq::poll(&initems[0], 1, 0);
 
       if ((initems[0].revents & ZMQ_POLLIN)){
-	
-	zmq::message_t message;
-	IThread.recv(&message);
-	command=std::string(static_cast<char *>(message.data()));
-  	
+        
+        zmq::message_t message;
+        IThread.recv(&message);
+        command=std::string(static_cast<char *>(message.data()));
+          
       }
 
       args->func_with_string(command);

src/DAQLogging/DAQLogging.cpp

@@ -342,7 +342,6 @@ src/DAQLogging/DAQLogging.{h,cpp} -nw
 
   bzero((char *)&addr, sizeof(addr));
   addr.sin_family = AF_INET;
-  addr.sin_addr.s_addr = htonl(INADDR_ANY);
   addr.sin_port = htons(log_port);
   addrlen = sizeof(addr);