deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Avoid alignment problems by copying the crc from the header field into a local variable

Browse source
This commit is contained in:
adamdunkels 2009-04-06 23:29:31 +00:00
parent 5e456aea7d
commit 5d8d7844bb
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/shell/shell-rime-netcmd.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: shell-rime-netcmd.c,v 1.7 2009/04/06 21:17:34 adamdunkels Exp $ * $Id: shell-rime-netcmd.c,v 1.8 2009/04/06 23:29:31 adamdunkels Exp $
*/ */
/** /**
@ -143,6 +143,7 @@ static void
recv_trickle(struct trickle_conn *c) recv_trickle(struct trickle_conn *c)
{ {
struct trickle_msg *msg; struct trickle_msg *msg;
uint16_t crc;
int len; int len;
msg = packetbuf_dataptr(); msg = packetbuf_dataptr();
@ -156,8 +157,9 @@ recv_trickle(struct trickle_conn *c)
/* Make sure that the incoming command is null-terminated. */ /* Make sure that the incoming command is null-terminated. */
msg->netcmd[len] = 0; msg->netcmd[len] = 0;
memcpy(&crc, &msg->crc, sizeof(crc));
if(msg->crc == crc16_data(msg->netcmd, len, 0)) {
if(crc == crc16_data(msg->netcmd, len, 0)) {
/* Start the server process with the incoming command. */ /* Start the server process with the incoming command. */
process_start(&shell_netcmd_server_process, msg->netcmd); process_start(&shell_netcmd_server_process, msg->netcmd);
} }