Diff: SnCommAfarTCP.cpp

Revision:

7:079617408fec

Parent:

6:6f002d202f59

Child:

8:95a325df1f6b

--- a/SnCommAfarTCP.cpp	Fri Aug 03 23:50:57 2012 +0000
+++ b/SnCommAfarTCP.cpp	Sat Aug 04 01:48:55 2012 +0000
@@ -1,4 +1,4 @@
-/*
+
 #include "SnCommAfarTCP.h"
 
 #include "EthernetInterface.h"
@@ -135,7 +135,8 @@
         const int hlen = ReceiveAll(confBuf, SnHeaderFrame::SizeOf(), timeOut);
         if (hlen>0 && static_cast<uint32_t>(hlen)==SnHeaderFrame::SizeOf()) {
             uint8_t mcode=0; uint32_t mlen=0;
-            SnHeaderFrame::ReadFrom(confBuf, mcode, mlen);
+            const char* b = confBuf;
+            SnHeaderFrame::ReadFrom(b, mcode, mlen);
             printf("mcode=%02x, mlen=%u\r\n", mcode, mlen);
             if (mcode!=SnHeaderFrame::kConfigCode) {
                 res = SnCommWin::kUnexpectedRec;
@@ -143,7 +144,8 @@
                 // get config
                 const int clen = ReceiveAll(confBuf, mlen, timeOut);
                 if (clen>0 && static_cast<uint32_t>(clen)==mlen) {
-                    conf.ReadFrom(confBuf);
+                    b = confBuf;
+                    conf.ReadFrom(b);
                     res = SnCommWin::kOkWithMsg;
                 } else {
                     res = SnCommWin::kUnexpectedRec;
@@ -248,11 +250,12 @@
     // send number of events to expect
     bool ok = false;
     char* b = genBuf;
-    SnHeaderFrame::WriteTo(genBuf, SnHeaderFrame::kFileNevtsCode, nevts);
+    SnHeaderFrame::WriteTo(b, SnHeaderFrame::kFileNevtsCode, nevts);
     int msiz;
     int mlen = SendAll(genBuf, SnHeaderFrame::SizeOf(), timeout_clock);
     if (mlen==SnHeaderFrame::SizeOf()) {
         // send the file header
+        b = genBuf;
         SnHeaderFrame::WriteTo(b, SnHeaderFrame::kFileHeadrCode, SnSDUtils::SizeOfFileHeader());
         SnSDUtils::WriteFileHeader(b, macadr, run, seq, v1, v2);
         msiz = SnHeaderFrame::SizeOf()+SnSDUtils::SizeOfFileHeader();
@@ -300,4 +303,3 @@
     
     return ok ? SnCommWin::kOkMsgSent : SnCommWin::kFailPartSent;
 }
-*/
\ No newline at end of file