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

removed bad memcpy:s

Browse source
This commit is contained in:
fros4943 2007-10-23 12:16:13 +00:00
parent 77b61f278b
commit 7512df3f7b
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
platform/cooja/net/radio-uip-uaodv.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: radio-uip-uaodv.c,v 1.6 2007/10/22 13:08:13 fros4943 Exp $ * @(#)$Id: radio-uip-uaodv.c,v 1.7 2007/10/23 12:16:13 fros4943 Exp $
*/ */
#include "radio-uip-uaodv.h" #include "radio-uip-uaodv.h"
@ -42,17 +42,6 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
/*
{ // DEBUG OUTPUT - DEBUG OUTPUT - DEBUG OUTPUT - DEBUG OUTPUT - DEBUG OUTPUT - DEBUG OUTPUT
uip_ipaddr_t *DEST = &packet->finaldest;
printf("%d.%d.%d.%d: XXXXX radio_uip_uaodv.c bad dest due to no ack %d.%d.%d.%d\n",
uip_ipaddr1(&uip_hostaddr), uip_ipaddr2(&uip_hostaddr), uip_ipaddr3(&uip_hostaddr), uip_ipaddr4(&uip_hostaddr),
uip_ipaddr1(DEST), uip_ipaddr2(DEST), uip_ipaddr3(DEST), uip_ipaddr4(DEST));
fflush(stdout);
} // DEBUG OUTPUT - DEBUG OUTPUT - DEBUG OUTPUT - DEBUG OUTPUT - DEBUG OUTPUT - DEBUG OUTPUT
*/
/* Packet buffer size and retransmission settings */ /* Packet buffer size and retransmission settings */
#define MAX_BUFFERED_PACKETS 10 #define MAX_BUFFERED_PACKETS 10
#define MAX_RETRANSMISSIONS_RREP 16 #define MAX_RETRANSMISSIONS_RREP 16
@ -369,7 +358,9 @@ radio_uip_handle_ack(u8_t *buf, int len)
int int
radio_uip_uaodv_add_header(u8_t *buf, int len, uip_ipaddr_t *addr) radio_uip_uaodv_add_header(u8_t *buf, int len, uip_ipaddr_t *addr)
{ {
memcpy(&buf[FWD_PACKET_LENGTH], buf, len); u8_t tempbuf[len];
memcpy(tempbuf, buf, len);
memcpy(&buf[FWD_PACKET_LENGTH], tempbuf, len);
memcpy(buf, FWD_ID, FWD_ID_LENGTH); memcpy(buf, FWD_ID, FWD_ID_LENGTH);
memcpy(&buf[FWD_NEXT_IP], (char*)addr, 4); memcpy(&buf[FWD_NEXT_IP], (char*)addr, 4);
return FWD_PACKET_LENGTH + len; return FWD_PACKET_LENGTH + len;
@ -378,8 +369,10 @@ radio_uip_uaodv_add_header(u8_t *buf, int len, uip_ipaddr_t *addr)
int int
radio_uip_uaodv_remove_header(u8_t *buf, int len) radio_uip_uaodv_remove_header(u8_t *buf, int len)
{ {
memcpy(buf, &buf[FWD_PACKET_LENGTH], len); u8_t tempbuf[len];
return len - FWD_PACKET_LENGTH; /* TODO XXX Why doesn't this work!? */ memcpy(tempbuf, &buf[FWD_PACKET_LENGTH], len);
memcpy(buf, tempbuf, len);
return len - FWD_PACKET_LENGTH;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void