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

simplified cooja communication stacks initialization + added uipv6 stack

Browse source
This commit is contained in:
fros4943 2009-04-01 13:50:12 +00:00
parent 6a99a82516
commit 3665422d8d
3 changed files with 163 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
platform/cooja/init-net-rime.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2007, Swedish Institute of Computer Science * Copyright (c) 2009, Swedish Institute of Computer Science
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -28,27 +28,37 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: init-net-rime.c,v 1.6 2008/12/01 13:20:51 fros4943 Exp $ * @(#)$Id: init-net-rime.c,v 1.7 2009/04/01 13:50:12 fros4943 Exp $
*/ */
#include "contiki.h" #include "contiki.h"
#include <stdio.h>
#include <string.h>
#include "net/rime.h" #include "net/rime.h"
#include "dev/radio.h"
#include "dev/cooja-radio.h"
#include "net/mac/nullmac.h" #include "net/mac/nullmac.h"
#include "node-id.h" #include "node-id.h"
#include "dev/cooja-radio.h"
void void
init_net(void) init_net(void)
{ {
int i;
rimeaddr_t rimeaddr; rimeaddr_t rimeaddr;
/* Init Rime */
ctimer_init(); ctimer_init();
nullmac_init(&cooja_driver);
rime_init(&nullmac_driver);
rimeaddr.u8[0] = node_id & 0xff; rimeaddr.u8[0] = node_id & 0xff;
rimeaddr.u8[1] = node_id >> 8; rimeaddr.u8[1] = node_id >> 8;
rimeaddr_set_node_addr(&rimeaddr); rimeaddr_set_node_addr(&rimeaddr);
printf("Rime started with address: ");
for(i = 0; i < sizeof(rimeaddr_node_addr.u8) - 1; i++) {
printf("%d.", rimeaddr_node_addr.u8[i]);
}
printf("%d\n", rimeaddr_node_addr.u8[i]);
/* Rime <-> nullMAC <-> COOJA's packet radio */
nullmac_init(&cooja_radio);
rime_init(&nullmac_driver);
} }

62
platform/cooja/init-net-uip.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2007, Swedish Institute of Computer Science. * Copyright (c) 2009, Swedish Institute of Computer Science.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -28,30 +28,70 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: init-net-uip.c,v 1.2 2007/05/21 14:52:15 fros4943 Exp $ * $Id: init-net-uip.c,v 1.3 2009/04/01 13:50:12 fros4943 Exp $
*/ */
#include "contiki.h" #include "contiki.h"
#include <stdio.h>
#include <string.h>
#include "net/rime.h"
#include "net/uip.h" #include "net/uip.h"
#include "net/uip-fw.h" #include "net/uip-fw.h"
#include "net/uip-fw-drv.h" #include "net/uip-fw-drv.h"
#include "net/radio-uip.h"
#include "node-id.h"
#include "dev/cooja-radio.h" #include "dev/cooja-radio.h"
/* Default network interface */ #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
static struct uip_fw_netif radioif =
{UIP_FW_NETIF(0,0,0,0, 0,0,0,0, radio_uip_send)};
/*---------------------------------------------------------------------------*/
static u8_t
sender(void)
{
return cooja_radio.send((char*)UIP_IP_BUF, uip_len);
}
/*---------------------------------------------------------------------------*/
static void
receiver(const struct radio_driver *d)
{
uip_len = d->read((char*)UIP_IP_BUF, UIP_BUFSIZE - UIP_LLH_LEN);
tcpip_input();
}
/*---------------------------------------------------------------------------*/
/* Only using a single network interface */
static struct uip_fw_netif default_if = {UIP_FW_NETIF(0,0,0,0, 0,0,0,0, sender)};
/*---------------------------------------------------------------------------*/
void void
init_net(void) init_net(void)
{ {
uip_init(); int i;
uip_fw_init(); uip_ipaddr_t hostaddr, netmask;
rimeaddr_t rimeaddr;
/* Init Rime */
ctimer_init();
rimeaddr.u8[0] = node_id & 0xff;
rimeaddr.u8[1] = node_id >> 8;
rimeaddr_set_node_addr(&rimeaddr);
printf("Rime started with address: ");
for(i = 0; i < sizeof(rimeaddr_node_addr.u8) - 1; i++) {
printf("%d.", rimeaddr_node_addr.u8[i]);
}
printf("%d\n", rimeaddr_node_addr.u8[i]);
/* Init uIPv4 */
process_start(&tcpip_process, NULL); process_start(&tcpip_process, NULL);
process_start(&uip_fw_process, NULL); process_start(&uip_fw_process, NULL);
uip_init();
uip_ipaddr(&hostaddr, 172, 16, rimeaddr_node_addr.u8[1], rimeaddr_node_addr.u8[0]);
uip_ipaddr(&netmask, 255,255,0,0);
uip_sethostaddr(&hostaddr);
uip_setnetmask(&netmask);
uip_fw_default(&default_if);
printf("uIP started with IP address: %d.%d.%d.%d\n", uip_ipaddr_to_quad(&hostaddr));
uip_fw_default(&radioif); /* uIPv4 <-> COOJA's packet radio */
tcpip_set_outputfunc(sender);
radio_uip_init(&cooja_driver); cooja_radio.set_receive_function(receiver);
} }

92
platform/cooja/init-net-uipv6.c Normal file
View file

@ -0,0 +1,92 @@
/*
* Copyright (c) 2009, Swedish Institute of Computer Science.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* This file is part of the Contiki operating system.
*
* $Id: init-net-uipv6.c,v 1.1 2009/04/01 13:50:12 fros4943 Exp $
*/
#include "contiki.h"
#include <stdio.h>
#include <string.h>
#include "net/rime.h"
#include "net/uip-netif.h"
#include "node-id.h"
#include "dev/cooja-radio.h"
#define PRINT6ADDR(addr) printf("%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", ((u8_t *)addr)[0], ((u8_t *)addr)[1], ((u8_t *)addr)[2], ((u8_t *)addr)[3], ((u8_t *)addr)[4], ((u8_t *)addr)[5], ((u8_t *)addr)[6], ((u8_t *)addr)[7], ((u8_t *)addr)[8], ((u8_t *)addr)[9], ((u8_t *)addr)[10], ((u8_t *)addr)[11], ((u8_t *)addr)[12], ((u8_t *)addr)[13], ((u8_t *)addr)[14], ((u8_t *)addr)[15])
#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
/*---------------------------------------------------------------------------*/
static u8_t
sender(uip_lladdr_t * dst_mac)
{
return cooja_radio.send((char*)UIP_IP_BUF, uip_len);
}
/*---------------------------------------------------------------------------*/
static void
receiver(const struct radio_driver *d)
{
uip_len = d->read((char*)UIP_IP_BUF, UIP_BUFSIZE - UIP_LLH_LEN);
tcpip_input();
}
/*---------------------------------------------------------------------------*/
void
init_net(void)
{
int i;
uint8_t addr[sizeof(uip_lladdr.addr)];
rimeaddr_t rimeaddr;
/* Init Rime */
ctimer_init();
rimeaddr.u8[0] = node_id & 0xff;
rimeaddr.u8[1] = node_id >> 8;
rimeaddr_set_node_addr(&rimeaddr);
printf("Rime started with address: ");
for(i = 0; i < sizeof(rimeaddr_node_addr.u8) - 1; i++) {
printf("%d.", rimeaddr_node_addr.u8[i]);
}
printf("%d\n", rimeaddr_node_addr.u8[i]);
/* Init uIPv6 */
for (i=0; i < sizeof(uip_lladdr.addr); i++) {
addr[i] = node_id & 0xff;
}
memcpy(&uip_lladdr.addr, addr, sizeof(uip_lladdr.addr));
process_start(&tcpip_process, NULL);
printf("IPv6 started with address: ");
PRINT6ADDR(&uip_netif_physical_if.addresses[0].ipaddr);
printf("\n");
/* uIPv6 <-> COOJA's packet radio */
tcpip_set_outputfunc(sender);
cooja_radio.set_receive_function(receiver);
}