Update Protobuf-C to 0.14

[umurmur.git] / src / messages.c

diff --git a/src/messages.c b/src/messages.c
index 06a72eb4fae8c696fb1493594a9b0077b3835c0e..5931edd9e77d71044f3837f0975f80cc47f487dd 100644 (file)
--- a/src/messages.c
+++ b/src/messages.c
@@ -41,21 +41,17 @@
 
 #define PREAMBLE_SIZE 6
 
-static void dumpmsg(uint8_t *data, int size);
 static message_t *Msg_create_nopayload(messageType_t messageType);
 
 static void Msg_addPreamble(uint8_t *buffer, uint16_t type, uint32_t len)
-{
-       type = htons(type);
-       len = htonl(len);
-       
-       buffer[0] = (type) & 0xff;
-       buffer[1] = (type >> 8) & 0xff;
+{      
+       buffer[1] = (type) & 0xff;
+       buffer[0] = (type >> 8) & 0xff;
        
-       buffer[2] = (len) & 0xff;
-       buffer[3] = (len >> 8) & 0xff;
-       buffer[4] = (len >> 16) & 0xff;
-       buffer[5] = (len >> 24) & 0xff; 
+       buffer[5] = (len) & 0xff;
+       buffer[4] = (len >> 8) & 0xff;
+       buffer[3] = (len >> 16) & 0xff;
+       buffer[2] = (len >> 24) & 0xff; 
 }
 
 static void Msg_getPreamble(uint8_t *buffer, int *type, int *len)
@@ -63,10 +59,10 @@ static void Msg_getPreamble(uint8_t *buffer, int *type, int *len)
        uint16_t msgType;
        uint32_t msgLen;
        
-       msgType = buffer[0] | (buffer[1] << 8);
-       msgLen = buffer[2] | (buffer[3] << 8) | (buffer[4] << 16) | (buffer[5] << 24);
-       *type = (int)ntohs(msgType);
-       *len = (int)ntohl(msgLen);
+       msgType = buffer[1] | (buffer[0] << 8);
+       msgLen = buffer[5] | (buffer[4] << 8) | (buffer[3] << 16) | (buffer[2] << 24);
+       *type = (int)msgType;
+       *len = (int)msgLen;
 }
 
 #define MAX_MSGSIZE (BUFSIZE - PREAMBLE_SIZE)
@@ -488,23 +484,6 @@ void Msg_free(message_t *msg)
        free(msg);
 }
 
-void dumpmsg(uint8_t *data, int size)
-{
-       int i, r = 0, offset = 0;
-       char buf[512];
-       
-       while (r * 8 + i < size) {
-               for (i = 0; i < 8 && r * 8 + i < size; i++) {
-                       offset += sprintf(buf + offset, "%x ", data[r * 8 + i]);
-               }
-               sprintf(buf + offset, "\n");
-               printf(buf);
-               offset = 0;
-               r++;
-               i = 0;
-       } 
-}
-
 message_t *Msg_CreateVoiceMsg(uint8_t *data, int size)
 {
        message_t *msg = NULL;