Skip to content

Commit d8450a1

Browse files
committed
Fix style and misleading comments/log in RPL/uIP
1 parent f4c4314 commit d8450a1

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

os/net/ipv6/uip6.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1250,7 +1250,7 @@ uip_process(uint8_t flag)
12501250
goto send;
12511251
}
12521252

1253-
LOG_INFO("Forwarding packet to next hop ");
1253+
LOG_INFO("Forwarding packet to next hop, dest: ");
12541254
LOG_INFO_6ADDR(&UIP_IP_BUF->destipaddr);
12551255
LOG_INFO_("\n");
12561256
UIP_STAT(++uip_stat.ip.forwarded);
@@ -1368,7 +1368,7 @@ uip_process(uint8_t flag)
13681368
goto send;
13691369
}
13701370

1371-
LOG_INFO("Forwarding packet to next hop ");
1371+
LOG_INFO("Forwarding packet to next hop, dest: ");
13721372
LOG_INFO_6ADDR(&UIP_IP_BUF->destipaddr);
13731373
LOG_INFO_("\n");
13741374
UIP_STAT(++uip_stat.ip.forwarded);

os/net/routing/routing.h

+2-4
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ struct routing_driver {
9494
* \param node The source routing node
9595
* \return 1 if the global node address was copied, 0 otherwise
9696
*/
97-
int (* get_sr_node_ipaddr)(uip_ipaddr_t *addr, const uip_sr_node_t *node);
97+
int (* get_sr_node_ipaddr)(uip_ipaddr_t *ipaddr, const uip_sr_node_t *node);
9898
/**
9999
* Leave the network the node is part of
100100
*
@@ -171,9 +171,7 @@ struct routing_driver {
171171
/**
172172
* Called by uIP to notify addition/removal of IPv6 neighbor entries
173173
*
174-
* \param addr The link-layer addrress of the packet destination
175-
* \param status The transmission status (see os/net/mac/mac.h)
176-
* \param numtx The total number of transmission attempts
174+
* \param nbr The neighbor entry
177175
*/
178176
void (* neighbor_state_changed)(uip_ds6_nbr_t *nbr);
179177
/**

os/net/routing/rpl-classic/rpl-dag.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -1423,7 +1423,8 @@ rpl_process_parent_event(rpl_instance_t *instance, rpl_parent_t *p)
14231423
if(RPL_IS_STORING(instance)
14241424
&& uip_ds6_route_is_nexthop(rpl_parent_get_ipaddr(p))
14251425
&& !rpl_parent_is_reachable(p) && instance->mop > RPL_MOP_NON_STORING) {
1426-
LOG_WARN("Unacceptable link %u, removing routes via: ", rpl_get_parent_link_metric(p));
1426+
LOG_WARN("Unacceptable link %u, removing routes via: ",
1427+
rpl_get_parent_link_metric(p));
14271428
LOG_WARN_6ADDR(rpl_parent_get_ipaddr(p));
14281429
LOG_WARN_("\n");
14291430
rpl_remove_routes_by_nexthop(rpl_parent_get_ipaddr(p), p->dag);

os/net/routing/rpl-classic/rpl-mrhof.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
* result, MRHOF will favor good links over short paths. Without this
6666
* feature, a hop with 50% PRR (ETX=2) is equivalent to two perfect
6767
* hops with 100% PRR (ETX=1+1=2). With this feature, the former path
68-
* obtains ETX=2*2=4 and the former ETX=1*1+1*1=2.
68+
* obtains ETX=2*2=4 and the latter ETX=1*1+1*1=2.
6969
*
7070
* While this feature helps achieve extra reliability, it also results
7171
* in added churn. In networks with high congestion or poor links,

0 commit comments

Comments
 (0)