Changeset 8862 for trunk/MagicSoft/Cosy/tcpip

Timestamp:

02/13/08 19:44:39 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/tcpip

Files:

• MCeCoCom.h (modified) (1 diff)
• MDriveCom.h (modified) (1 diff)
• MTcpIpIO.cc (modified) (11 diffs)
• MTcpIpIO.h (modified) (1 diff)

trunk/MagicSoft/Cosy/tcpip/MCeCoCom.h

@@ -48 +48 @@
 
 public:
-    MCeCoCom(MLog *out)
-        : MTcpIpIO("ceco", 7304, 7404), fOut(out), fStatus(0), fComStat(kNoCmdReceived),
+    MCeCoCom(const char *addr, MLog *out)
+        : MTcpIpIO(addr, 7304, 7404), fOut(out), fStatus(0), fComStat(kNoCmdReceived),
         fHumidity(0), fTemperature(0), fWindSpeed(0), fSolarRadiation(-1),
         fAlarmCounter(0)

trunk/MagicSoft/Cosy/tcpip/MDriveCom.h

@@ -41 +41 @@
     };
 
-    MDriveCom(MsgQueue *q, MLog *out) : MCeCoCom(out), fQueue(q) {}
+    MDriveCom(MsgQueue *q, const char *addr, MLog *out) : MCeCoCom(addr, out), fQueue(q) {}
 
     bool SendReport(UInt_t stat, RaDec rd, ZdAz so, ZdAz is, ZdAz er);

trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.cc

@@ -8 +8 @@
 #include "MLog.h"
 #include "MLogManip.h"
+
+#include "MString.h"
 
 #undef DEBUG
@@ -55 +57 @@
 }
 
+TString MTcpIpO::GetSocketAddress(const TSocket &s)
+{
+    if (!s.IsValid())
+        return "n/a";
+
+    const TInetAddress &a = s.GetInetAddress();
+    if (!a.IsValid())
+        return "undefined";
+
+    return MString::Format("%s:%d", a.GetHostAddress(), a.GetPort());
+}
+
+TString MTcpIpO::GetSocketAddress() const
+{
+    return GetSocketAddress(*fTxSocket);
+}
+
 bool MTcpIpO::SendFrame(TSocket &tx, const char *msg, int len)
 {
     if (!tx.IsValid())
     {
-        //cout << "*!* Transmit socket invalid!" << endl;
+        //gLog << warn << "WARNING - No transmission to " << GetSocketAddress(tx) << " possible." << endl;
         return false;
     }
@@ -66 +85 @@
     if (l<0)
     {
-        cout << "ERROR - Sending Message" << endl;
+        gLog << err << "ERROR - Sending TCP/IP frame to " << GetSocketAddress(tx) << endl;
         return false;
     }
@@ -72 +91 @@
     if (l!=len)
     {
-        cout << "Send wrong number (" << l << ") of Bytes." << endl;
+        gLog << err << "ERROR - Sent wrong number (" << l << ") of bytes to " << GetSocketAddress(tx) << endl;
         return false;
     }
@@ -86 +105 @@
 {
     //    R__LOCKGUARD2(myMutex);
-
+#ifdef DEBUG
     cout << "Connecting to " << addr << ":" << port << endl;
+#endif
 
     // FIXME: Set tx-socket to nonblocking?
     TSocket tx(addr, port);
-    //    return SendFrame(tx, msg, len);
-
+    return SendFrame(tx, msg, len);
+/*
     if (!tx.IsValid())
     {
-        //cout << "*!* Transmit socket invalid!" << endl;
-        return false;
-    }
-
-    cout << "Sending to " << addr << ":" << port << endl;
+        gLog << warn << "WARNING - No transmission to " << addr << ":" << port << " possible." << endl;
+        return false;
+    }
+
+    gLog << dbg << "Sending to " << addr << ":" << port << endl;
 
     const Int_t l = tx.SendRaw(msg, len, kDontBlock);
     if (l<0)
     {
-        cout << "ERROR - Sending Message" << endl;
+        gLog << err << "ERROR - Sending TCP/IP frame to " << addr << ":" << port << endl;
         return false;
     }
@@ -110 +130 @@
     if (l!=len)
     {
-        cout << "Send wrong number (" << l << ") of Bytes." << endl;
+        gLog << err << "ERROR - Sent wrong number (" << l << ") of bytes to " << addr << ":" << port << endl;
         return false;
     }
@@ -119 +139 @@
 
     return true;
+    */
 }
 
@@ -188 +209 @@
     gLog << inf << "- Starting receiver on port " << fPortRx << "..." << endl;
 
+//    if (fPortRx==7404)
+//    {
+//        gLog << err << "CeCo communication skipped." << endl;
+//        return 0;
+//    }
+
     TServerSocket *fServSock=NULL;
     TSocket       *fRxSocket=NULL;
@@ -197 +224 @@
         if (!fServSock->IsValid())
         {
-            cout << "ServerSocket on port " << fPortRx << " invalid: ";
+            gLog << err << "ServerSocket on port " << fPortRx << " invalid: ";
             switch (fServSock->GetErrorCode())
             {
-            case  0: cout << "No error." << endl; break;
-            case -1: cout << "low level socket() call failed." << endl; break;
-            case -2: cout << "low level bind() call failed." << endl; break;
-            case -3: cout << "low level listen() call failed." << endl; break;
-            default: cout << "Unknown." << endl; break;
+            case  0: gLog << "No error." << endl; break;
+            case -1: gLog << "low level socket() call failed." << endl; break;
+            case -2: gLog << "low level bind() call failed." << endl; break;
+            case -3: gLog << "low level listen() call failed." << endl; break;
+            default: gLog << "Unknown." << endl; break;
             }
             delete fServSock;
@@ -214 +241 @@
         fServSock->SetOption(kNoBlock, 1);
 
-        cout << "Waiting for connection on port " << fPortRx << "..." << endl;
+        gLog << all << "Waiting for connection on port " << fPortRx << "..." << endl;
 //        while (!HasStopFlag() && (Long_t)fRxSocket<=0)
         while (!IsThreadCanceled() && (Long_t)fRxSocket<=0)
@@ -247 +274 @@
         }
 
-        cout << "Connection established on port " << fPortRx << "." << endl;
+        gLog << all << "Connection established on port " << fPortRx << "." << endl;
 
         fRxSocket->SetOption(kNoBlock, 1);

trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.h

@@ -40 +40 @@
     ~MTcpIpO();
 
-    static bool SendFrame(TSocket &tx, const char *msg, int len);
-    static bool SendFrame(const char *addr, int port, const char *msg, int len);
+    static TString GetSocketAddress(const TSocket &s);
+    static bool    SendFrame(TSocket &tx, const char *msg, int len);
+    static bool    SendFrame(const char *addr, int port, const char *msg, int len);
 
-    bool Send(const char *msg, int len);
+    TString GetSocketAddress() const;
+    bool    Send(const char *msg, int len);
 };