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

Made the simple UDP examples simpler

Browse source
This commit is contained in:
Adam Dunkels 2011-08-29 21:51:09 +02:00
parent 2ae835ef65
commit 823f28e87c
2 changed files with 25 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
examples/ipv6/simple-udp-rpl/broadcast-example.c
View file

@ -13,7 +13,7 @@
#define UDP_PORT 1234 #define UDP_PORT 1234
#define SEND_INTERVAL (10 * CLOCK_SECOND) #define SEND_INTERVAL (20 * CLOCK_SECOND)
#define SEND_TIME (random_rand() % (SEND_INTERVAL)) #define SEND_TIME (random_rand() % (SEND_INTERVAL))
static struct simple_udp_connection broadcast_connection; static struct simple_udp_connection broadcast_connection;
@ -39,6 +39,7 @@ PROCESS_THREAD(broadcast_example_process, ev, data)
{ {
static struct etimer periodic_timer; static struct etimer periodic_timer;
static struct etimer send_timer; static struct etimer send_timer;
uip_ipaddr_t addr;
PROCESS_BEGIN(); PROCESS_BEGIN();
@ -48,18 +49,14 @@ PROCESS_THREAD(broadcast_example_process, ev, data)
etimer_set(&periodic_timer, SEND_INTERVAL); etimer_set(&periodic_timer, SEND_INTERVAL);
while(1) { while(1) {
PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&periodic_timer));
etimer_reset(&periodic_timer);
etimer_set(&send_timer, SEND_TIME);
PROCESS_YIELD_UNTIL(ev == PROCESS_EVENT_TIMER); PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&send_timer));
if(data == &periodic_timer) { printf("Sending broadcast\n");
etimer_reset(&periodic_timer); uip_create_linklocal_allnodes_mcast(&addr);
etimer_set(&send_timer, SEND_TIME); simple_udp_sendto(&broadcast_connection, "Test", 4, &addr);
}
if(data == &send_timer) {
uip_ipaddr_t addr;
printf("Sending broadcast\n");
uip_create_linklocal_allnodes_mcast(&addr);
simple_udp_sendto(&broadcast_connection, "hej\n", 4, &addr);
}
} }
PROCESS_END(); PROCESS_END();

34
examples/ipv6/simple-udp-rpl/unicast-sender.c
View file

@ -65,6 +65,7 @@ PROCESS_THREAD(unicast_sender_process, ev, data)
{ {
static struct etimer periodic_timer; static struct etimer periodic_timer;
static struct etimer send_timer; static struct etimer send_timer;
uip_ipaddr_t *addr;
PROCESS_BEGIN(); PROCESS_BEGIN();
@ -78,25 +79,22 @@ PROCESS_THREAD(unicast_sender_process, ev, data)
etimer_set(&periodic_timer, SEND_INTERVAL); etimer_set(&periodic_timer, SEND_INTERVAL);
while(1) { while(1) {
PROCESS_YIELD_UNTIL(ev == PROCESS_EVENT_TIMER); PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&periodic_timer));
if(data == &periodic_timer) { etimer_reset(&periodic_timer);
etimer_reset(&periodic_timer); etimer_set(&send_timer, SEND_TIME);
etimer_set(&send_timer, SEND_TIME);
}
if(data == &send_timer) {
uip_ipaddr_t *addr;
addr = servreg_hack_lookup(SERVICE_ID);
if(addr != NULL) {
char buf[20];
printf("Sending unicast to "); PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&send_timer));
uip_debug_ipaddr_print(addr); addr = servreg_hack_lookup(SERVICE_ID);
printf("\n"); if(addr != NULL) {
sprintf(buf, "From %d", node_id); char buf[20];
simple_udp_sendto(&unicast_connection, buf, strlen(buf) + 1, addr);
} else { printf("Sending unicast to ");
printf("Service %d not found\n", SERVICE_ID); uip_debug_ipaddr_print(addr);
} printf("\n");
sprintf(buf, "From %d", node_id);
simple_udp_sendto(&unicast_connection, buf, strlen(buf) + 1, addr);
} else {
printf("Service %d not found\n", SERVICE_ID);
} }
} }