projects
/
umurmur.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e0f4658
)
Fix byte order confusion which broke on big endian platforms
author
fatbob313
<martin@fatbob.nu>
Tue, 23 Mar 2010 21:14:11 +0000
(21:14 +0000)
committer
fatbob313
<martin@fatbob.nu>
Tue, 23 Mar 2010 21:14:11 +0000
(21:14 +0000)
src/messages.c
patch
|
blob
|
history
diff --git
a/src/messages.c
b/src/messages.c
index 7b99ce0c9e477ccc57bb20f23efcff4ae38d6f35..5931edd9e77d71044f3837f0975f80cc47f487dd 100644
(file)
--- a/
src/messages.c
+++ b/
src/messages.c
@@
-44,17
+44,14
@@
static message_t *Msg_create_nopayload(messageType_t messageType);
static void Msg_addPreamble(uint8_t *buffer, uint16_t type, uint32_t len)
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)
}
static void Msg_getPreamble(uint8_t *buffer, int *type, int *len)
@@
-62,10
+59,10
@@
static void Msg_getPreamble(uint8_t *buffer, int *type, int *len)
uint16_t msgType;
uint32_t msgLen;
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)
}
#define MAX_MSGSIZE (BUFSIZE - PREAMBLE_SIZE)