Changeset 16563

Timestamp:

06/01/13 22:08:31 (12 years ago)

Author:

tbretz

Message:

Turned the login in the loop to ensure no access if no data (can this happen at all?) and fixed a typo (unsigned short is uint16_t not uint32_t)

File:

• trunk/Mars/mcore/checksum.h (modified) (3 diffs)

trunk/Mars/mcore/checksum.h

@@ -1 +1 @@
 #ifndef MARS_checksum
 #define MARS_checksum
-
-#include <arpa/inet.h>
 
 namespace std
@@ -67 +65 @@
         }
 
-        const uint32_t *sbuf = reinterpret_cast<const uint32_t*>(buf);
+        const uint16_t *sbuf = reinterpret_cast<const uint16_t *>(buf);
 
         uint32_t *hilo  = reinterpret_cast<uint32_t*>(&buffer);
@@ -84 +82 @@
         while (1)
         {
+            if (sbuf==end)
+                break;
+
             hilo[0] += ntohs(*sbuf++);
+
             if (sbuf==end)
                 break;
 
             hilo[1] += ntohs(*sbuf++);
-            if (sbuf==end)
-                break;
         }