Change TDC5 recognition

Now it has own magic value 0x5552 in the begin.
Rest is ignored for the moment

Author: linev

plugins/dogma/dogma/defines.h

@@ -24,6 +24,8 @@
 
 #define DOGMA_MAGIC 0xecc1701d
 
+#define TDC5_MAGIC 0x55520000
+
 #define SWAP_VALUE(v) (((v & 0xFF) << 24) | ((v & 0xFF00) << 8) | ((v & 0xFF0000) >> 8) | ((v & 0xFF000000) >> 24))
 
 namespace dogma {
@@ -47,12 +49,12 @@ namespace dogma {
 
          inline bool IsMagic() const { return (SWAP_VALUE(tuMagic) & 0xffffff00) == (DOGMA_MAGIC & 0xffffff00); }
 
+         inline bool IsMagicTdc5() const { return (SWAP_VALUE(tuMagic) & 0xffff0000) == (TDC5_MAGIC & 0xffff0000); }
+
          inline uint32_t GetMagicType() const { return SWAP_VALUE(tuMagic) & 0xff; }
 
          inline bool IsMagicDefault() const { return GetMagicType() == (DOGMA_MAGIC & 0xff); }
 
-         inline bool IsMagicTdc5() const { return GetMagicType() == 0x1e; }
-
          inline uint32_t GetMagic() const { return SWAP_VALUE(tuMagic); }
 
          inline uint32_t GetAddr() const { return SWAP_VALUE(tuAddr); }
@@ -135,7 +137,7 @@ namespace dogma {
          uint32_t tuMagic = 0;
          uint32_t tuSeqId = 0;
          uint32_t tuTrigTypeNumber = 0;
-         uint32_t tuLenPayload = 0; // paylod len in 4bytes words
+         uint32_t tuLenPayload = 0; // payload len in 4bytes words
 
       public:
 

plugins/dogma/src/UdpTransport.cxx

@@ -180,23 +180,17 @@ bool dogma::UdpAddon::ReadUdp()
 
       std::string errmsg;
 
-      if (!tu->IsMagic()) {
-         fTotalDiscardMagic++;
-         errmsg = "Magic number not match";
-         DOUT0("Magic %08x", tu->GetMagic());
-      } else if (tu->IsMagicDefault()) {
-         msgsize = tu->GetSize(); // size must match with number of received bytes
-         if (res != msgsize)
-            errmsg = dabc::format("Send buffer %u differ from message size %u - ignore it", (unsigned) res, (unsigned) msgsize);
-      } else if (tu->IsMagicTdc5()) {
+      if (tu->IsMagicTdc5()) {
          msgsize = tu->SetTdc5PaketLength(res); // total size will be rounded by 4 bytes boundary
          if ((msgsize < res) || (msgsize > res + 3))
             errmsg = dabc::format("Failure by coding packet len %u in tu size %u - ignore it", (unsigned) res, (unsigned) msgsize);
-
+      } else if (tu->IsMagic() && tu->IsMagicDefault()) {
+         msgsize = tu->GetSize(); // size must match with number of received bytes
+         if (res != msgsize)
+            errmsg = dabc::format("Send buffer %u differ from message size %u - ignore it", (unsigned) res, (unsigned) msgsize);
       } else {
          fTotalDiscardMagic++;
          errmsg = "Magic subtype not match";
-         DOUT0("Magic %08x", tu->GetMagic());
       }
 
       if (!errmsg.empty()) {