Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-11-20 10:35:34 +00:00
Code Issues Projects Releases Wiki Activity

The collect view functions now take the node's routing metric, not the parent's routing metric.

Browse Source
This commit is contained in:
adamdunkels 2010-10-24 21:04:39 +00:00
parent 959af3b803
commit 7f95059703
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/shell/shell-collect-view.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-collect-view.c,v 1.1 2010/10/20 15:21:43 adamdunkels Exp $ * $Id: shell-collect-view.c,v 1.2 2010/10/24 21:04:39 adamdunkels Exp $
*/ */
/** /**
@ -54,7 +54,7 @@ PROCESS_THREAD(collect_view_data_process, ev, data)
{ {
struct collect_view_data_msg msg; struct collect_view_data_msg msg;
struct collect_neighbor *n; struct collect_neighbor *n;
uint16_t parent_etx, parent_rtmetric; uint16_t parent_etx;
uint16_t num_neighbors; uint16_t num_neighbors;
uint16_t beacon_interval; uint16_t beacon_interval;
@ -64,16 +64,14 @@ PROCESS_THREAD(collect_view_data_process, ev, data)
&shell_collect_conn.parent); &shell_collect_conn.parent);
if(n != NULL) { if(n != NULL) {
parent_etx = collect_neighbor_link_estimate(n); parent_etx = collect_neighbor_link_estimate(n);
parent_rtmetric = n->rtmetric;
} else { } else {
parent_etx = 0; parent_etx = 0;
parent_rtmetric = 0;
} }
num_neighbors = collect_neighbor_list_num(&shell_collect_conn.neighbor_list); num_neighbors = collect_neighbor_list_num(&shell_collect_conn.neighbor_list);
beacon_interval = broadcast_announcement_beacon_interval() / CLOCK_SECOND; beacon_interval = broadcast_announcement_beacon_interval() / CLOCK_SECOND;
collect_view_construct_message(&msg, &shell_collect_conn.parent, collect_view_construct_message(&msg, &shell_collect_conn.parent,
parent_etx, parent_rtmetric, parent_etx, shell_collect_conn.rtmetric,
num_neighbors, beacon_interval); num_neighbors, beacon_interval);
shell_output(&collect_view_data_command, &msg, sizeof(msg), "", 0); shell_output(&collect_view_data_command, &msg, sizeof(msg), "", 0);