Index: trunk/FACT++/src/EventBuilderWrapper.h
===================================================================
--- trunk/FACT++/src/EventBuilderWrapper.h	(revision 10842)
+++ trunk/FACT++/src/EventBuilderWrapper.h	(revision 10843)
@@ -58,7 +58,7 @@
     }
 
-    void Update(ostringstream &out, int severity)
+    void Update(const char *msg, int severity)
     {
-        fMsg.Update(out, severity);
+        fMsg.Update(msg, severity);
     }
 
@@ -87,5 +87,5 @@
         }
 
-        fMsg.Info("Starting EventBuilder");
+        fMsg.Message("Starting EventBuilder thread");
 
         g_maxBoards = addr.size();
@@ -97,6 +97,12 @@
         for (vector<string>::const_iterator it=addr.begin(); it!=addr.end(); it++)
         {
-            g_ip[i++].addr[99] = 0;
-            strncpy(g_ip[i++].addr, it->c_str(), 99);
+            g_ip[i].port = 5000;
+
+            memset(g_ip[i].addr, 0, 100);
+            strncpy(g_ip[i].addr, it->c_str(), 99);
+
+            strcpy(g_ip[i].addr, "127.0.0.1");
+
+            i++;
         }
 
@@ -105,5 +111,5 @@
     void Abort()
     {
-        fMsg.Message("Signal abort to EventBuilder...");
+        fMsg.Message("Signal abort to EventBuilder thread...");
         g_runStat = kAbort;
     }
@@ -111,5 +117,5 @@
     void Exit()
     {
-        fMsg.Message("Signal exit to EventBuilder...");
+        fMsg.Message("Signal exit to EventBuilder thread...");
         g_runStat = kExit;
     }
@@ -159,6 +165,7 @@
 EventBuilderWrapper *EventBuilderWrapper::This = 0;
 
-extern "C" {
-
+// ----------- Event builder callbacks implementation ---------------
+extern "C"
+{
     int runOpen(uint32_t irun, RUN_HEAD *runhd, size_t len)
     {
@@ -175,4 +182,9 @@
         return EventBuilderWrapper::This->runClose(fileId, runth, len);
     }
+
+    void message(int severity, const char *msg)
+    {
+        EventBuilderWrapper::This->Update(msg, severity);
+    }
 }