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

Offload some bytes off the cc2x3x stack for the sensinode & cc2530dk udp server example

Browse source
This commit is contained in:
George Oikonomou 2012-04-26 17:19:03 +01:00
parent 4147c7e58d
commit 52d0117086
2 changed files with 52 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
examples/cc2530dk/udp-ipv6/server.c
View file

@ -50,14 +50,14 @@ static struct uip_udp_conn *server_conn;
static char buf[MAX_PAYLOAD_LEN]; static char buf[MAX_PAYLOAD_LEN];
static uint16_t len; static uint16_t len;
#if UIP_CONF_ROUTER
static uip_ipaddr_t ipaddr;
#endif
#define SERVER_REPLY 1 #define SERVER_REPLY 1
/* Should we act as RPL root? */ /* Should we act as RPL root? */
#define SERVER_RPL_ROOT 1 #define SERVER_RPL_ROOT 1
#if SERVER_RPL_ROOT
static uip_ipaddr_t ipaddr;
#endif
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
PROCESS(udp_server_process, "UDP server process"); PROCESS(udp_server_process, "UDP server process");
AUTOSTART_PROCESSES(&udp_server_process); AUTOSTART_PROCESSES(&udp_server_process);
@ -121,22 +121,12 @@ print_local_addresses(void)
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
PROCESS_THREAD(udp_server_process, ev, data) #if SERVER_RPL_ROOT
void
create_dag()
{ {
#if BUTTON_SENSOR_ON
static struct sensors_sensor *b1;
#endif
#if SERVER_RPL_ROOT
rpl_dag_t *dag; rpl_dag_t *dag;
#endif
PROCESS_BEGIN();
putstring("Starting UDP server\n");
#if BUTTON_SENSOR_ON
putstring("Button 1: Print RIME stats\n");
#endif
#if SERVER_RPL_ROOT
uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0); uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr); uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF); uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
@ -151,7 +141,25 @@ PROCESS_THREAD(udp_server_process, ev, data)
PRINT6ADDR(&dag->dag_id); PRINT6ADDR(&dag->dag_id);
PRINTF("\n"); PRINTF("\n");
} }
}
#endif /* SERVER_RPL_ROOT */ #endif /* SERVER_RPL_ROOT */
/*---------------------------------------------------------------------------*/
PROCESS_THREAD(udp_server_process, ev, data)
{
#if BUTTON_SENSOR_ON
static struct sensors_sensor *b1;
#endif
PROCESS_BEGIN();
putstring("Starting UDP server\n");
#if BUTTON_SENSOR_ON
putstring("Button 1: Print RIME stats\n");
#endif
#if SERVER_RPL_ROOT
create_dag();
#endif
server_conn = udp_new(NULL, UIP_HTONS(0), NULL); server_conn = udp_new(NULL, UIP_HTONS(0), NULL);
udp_bind(server_conn, UIP_HTONS(3000)); udp_bind(server_conn, UIP_HTONS(3000));

46
examples/sensinode/udp-ipv6/server.c
View file

@ -55,14 +55,14 @@ static struct uip_udp_conn *server_conn;
static char buf[MAX_PAYLOAD_LEN]; static char buf[MAX_PAYLOAD_LEN];
static uint16_t len; static uint16_t len;
#if UIP_CONF_ROUTER
static uip_ipaddr_t ipaddr;
#endif
#define SERVER_REPLY 1 #define SERVER_REPLY 1
/* Should we act as RPL root? */ /* Should we act as RPL root? */
#define SERVER_RPL_ROOT 1 #define SERVER_RPL_ROOT 1
#if SERVER_RPL_ROOT
static uip_ipaddr_t ipaddr;
#endif
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
extern const struct sensors_sensor adc_sensor; extern const struct sensors_sensor adc_sensor;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -133,24 +133,12 @@ print_local_addresses(void)
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
PROCESS_THREAD(udp_server_process, ev, data) #if SERVER_RPL_ROOT
void
create_dag()
{ {
#if (CONTIKI_TARGET_SENSINODE && BUTTON_SENSOR_ON)
static struct sensors_sensor *b1;
static struct sensors_sensor *b2;
#endif
#if SERVER_RPL_ROOT
rpl_dag_t *dag; rpl_dag_t *dag;
#endif
PROCESS_BEGIN();
putstring("Starting UDP server\n");
#if (CONTIKI_TARGET_SENSINODE && BUTTON_SENSOR_ON)
putstring("Button 1: Print RIME stats\n");
putstring("Button 2: Reboot\n");
#endif
#if SERVER_RPL_ROOT
uip_ip6addr(&ipaddr, 0x2001, 0x630, 0x301, 0x6453, 0, 0, 0, 0); uip_ip6addr(&ipaddr, 0x2001, 0x630, 0x301, 0x6453, 0, 0, 0, 0);
uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr); uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF); uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
@ -165,7 +153,27 @@ PROCESS_THREAD(udp_server_process, ev, data)
PRINT6ADDR(&dag->dag_id); PRINT6ADDR(&dag->dag_id);
PRINTF("\n"); PRINTF("\n");
} }
}
#endif /* SERVER_RPL_ROOT */ #endif /* SERVER_RPL_ROOT */
/*---------------------------------------------------------------------------*/
PROCESS_THREAD(udp_server_process, ev, data)
{
#if (CONTIKI_TARGET_SENSINODE && BUTTON_SENSOR_ON)
static struct sensors_sensor *b1;
static struct sensors_sensor *b2;
#endif
PROCESS_BEGIN();
putstring("Starting UDP server\n");
#if (CONTIKI_TARGET_SENSINODE && BUTTON_SENSOR_ON)
putstring("Button 1: Print RIME stats\n");
putstring("Button 2: Reboot\n");
#endif
#if SERVER_RPL_ROOT
create_dag();
#endif
server_conn = udp_new(NULL, UIP_HTONS(0), NULL); server_conn = udp_new(NULL, UIP_HTONS(0), NULL);
udp_bind(server_conn, UIP_HTONS(3000)); udp_bind(server_conn, UIP_HTONS(3000));