#include "routing_table.h"
#include "mid_set.h"
#include "hna_set.h"
-#include "lq_list.h"
-#include "lq_avl.h"
+#include "common/list.h"
+#include "common/avl.h"
#include "lq_route.h"
#include "net_olsr.h"
+#include "lq_plugin.h"
struct timer_entry *spf_backoff_timer = NULL;
static int
avl_comp_etx (const void *etx1, const void *etx2)
{
-#ifdef USE_FPM
- if (*(const sfpm *)etx1 < *(const sfpm *)etx2) {
+ if (*(const olsr_linkcost *)etx1 < *(const olsr_linkcost *)etx2) {
return -1;
}
- if (*(const sfpm *)etx1 > *(const sfpm *)etx2) {
+ if (*(const olsr_linkcost *)etx1 > *(const olsr_linkcost *)etx2) {
return +1;
}
-#else
- if (*(const float *)etx1 < *(const float *)etx2) {
- return -1;
- }
-
- if (*(const float *)etx1 > *(const float *)etx2) {
- return +1;
- }
-#endif
return 0;
}
{
#if !defined(NODEBUG) && defined(DEBUG)
struct ipaddr_str buf;
+ struct lqtextbuffer lqbuffer;
#endif
- tc->cand_tree_node.key = &tc->path_etx;
- tc->cand_tree_node.data = tc;
+ tc->cand_tree_node.key = &tc->path_cost;
#ifdef DEBUG
- OLSR_PRINTF(1, "SPF: insert candidate %s, cost %s\n",
+ OLSR_PRINTF(2, "SPF: insert candidate %s, cost %s\n",
olsr_ip_to_string(&buf, &tc->addr),
- etxtoa(tc->path_etx));
+ get_linkcost_text(tc->path_cost, OLSR_FALSE, &lqbuffer));
#endif
avl_insert(tree, &tc->cand_tree_node, AVL_DUP);
#ifdef DEBUG
#ifndef NODEBUG
struct ipaddr_str buf;
+ struct lqtextbuffer lqbuffer;
#endif
- OLSR_PRINTF(1, "SPF: delete candidate %s, cost %s\n",
+ OLSR_PRINTF(2, "SPF: delete candidate %s, cost %s\n",
olsr_ip_to_string(&buf, &tc->addr),
- etxtoa(tc->path_etx));
+ get_linkcost_text(tc->path_cost, OLSR_FALSE, &lqbuffer));
#endif
avl_delete(tree, &tc->cand_tree_node);
{
#if !defined(NODEBUG) && defined(DEBUG)
struct ipaddr_str pathbuf, nbuf;
+ struct lqtextbuffer lqbuffer;
#endif
- tc->path_list_node.data = tc;
#ifdef DEBUG
- OLSR_PRINTF(1, "SPF: append path %s, cost %s, via %s\n",
+ OLSR_PRINTF(2, "SPF: append path %s, cost %s, via %s\n",
olsr_ip_to_string(&pathbuf, &tc->addr),
- etxtoa(tc->path_etx),
+ get_linkcost_text(tc->path_cost, OLSR_FALSE, &lqbuffer),
tc->next_hop ? olsr_ip_to_string(
&nbuf, &tc->next_hop->neighbor_iface_addr) : "-");
#endif
{
struct avl_node *node = avl_walk_first(tree);
- return (node ? node->data : NULL);
+ return (node ? cand_tree2tc(node) : NULL);
}
olsr_spf_relax (struct avl_tree *cand_tree, struct tc_entry *tc)
{
struct avl_node *edge_node;
-#ifdef USE_FPM
- fpm new_etx;
-#else
- float new_etx;
-#endif
+ olsr_linkcost new_cost;
#ifdef DEBUG
#ifndef NODEBUG
struct ipaddr_str buf, nbuf;
+ struct lqtextbuffer lqbuffer;
#endif
- OLSR_PRINTF(1, "SPF: exploring node %s, cost %s\n",
+ OLSR_PRINTF(2, "SPF: exploring node %s, cost %s\n",
olsr_ip_to_string(&buf, &tc->addr),
- etxtoa(tc->path_etx));
+ get_linkcost_text(tc->path_cost, OLSR_FALSE, &lqbuffer));
#endif
/*
edge_node = avl_walk_next(edge_node)) {
struct tc_entry *new_tc;
- struct tc_edge_entry *tc_edge = edge_node->data;
+ struct tc_edge_entry *tc_edge = edge_tree2tc_edge(edge_node);
/*
* We are not interested in dead-end or dying edges.
*/
- if (!tc_edge->edge_inv || (tc_edge->flags & OLSR_TC_EDGE_DOWN)) {
+ if (!tc_edge->edge_inv ||
+ ((tc_edge->flags | tc_edge->edge_inv->flags) & OLSR_TC_EDGE_DOWN)) {
#ifdef DEBUG
- OLSR_PRINTF(1, "SPF: ignoring edge %s\n",
+ OLSR_PRINTF(2, "SPF: ignoring edge %s\n",
olsr_ip_to_string(&buf, &tc_edge->T_dest_addr));
+ if (!tc_edge->edge_inv) {
+ OLSR_PRINTF(2, "SPF: no inverse edge\n");
+ }
+
if (tc_edge->flags & OLSR_TC_EDGE_DOWN) {
- OLSR_PRINTF(1, "SPF: edge down\n");
+ OLSR_PRINTF(2, "SPF: edge down\n");
}
if (!tc_edge->edge_inv) {
- OLSR_PRINTF(1, "SPF: no inverse edge\n");
+ OLSR_PRINTF(2, "SPF: no inverse edge\n");
+ } else if (tc_edge->edge_inv->flags & OLSR_TC_EDGE_DOWN){
+ OLSR_PRINTF(2, "SPF: inverse edge down\n");
}
#endif
continue;
* total quality of the path through this vertex
* to the destination of this edge
*/
-#ifdef USE_FPM
- new_etx = INFINITE_ETX <= tc->path_etx || INFINITE_ETX <= tc_edge->etx
- ? INFINITE_ETX : fpmadd(tc->path_etx, tc_edge->etx);
-#else
- new_etx = tc->path_etx + tc_edge->etx;
-#endif
+ new_cost = tc->path_cost + tc_edge->cost;
#ifdef DEBUG
- OLSR_PRINTF(1, "SPF: exploring edge %s, cost %s\n",
+ OLSR_PRINTF(2, "SPF: exploring edge %s, cost %s\n",
olsr_ip_to_string(&buf, &tc_edge->T_dest_addr),
- etxtoa(new_etx));
+ get_linkcost_text(new_cost, OLSR_TRUE, &lqbuffer));
#endif
/*
*/
new_tc = tc_edge->edge_inv->tc;
- if (new_etx < new_tc->path_etx) {
+ if (new_cost < new_tc->path_cost) {
/* if this node has been on the candidate tree delete it */
- if (new_tc->path_etx != INFINITE_ETX) {
+ if (new_tc->path_cost < ROUTE_COST_BROKEN) {
olsr_spf_del_cand_tree(cand_tree, new_tc);
}
/* re-insert on candidate tree with the better metric */
- new_tc->path_etx = new_etx;
+ new_tc->path_cost = new_cost;
olsr_spf_add_cand_tree(cand_tree, new_tc);
/* pull-up the next-hop and bump the hop count */
new_tc->hops = tc->hops + 1;
#ifdef DEBUG
- OLSR_PRINTF(1, "SPF: better path to %s, cost %s -> %s, via %s, hops %u\n",
+ OLSR_PRINTF(2, "SPF: better path to %s, cost %s, via %s, hops %u\n",
olsr_ip_to_string(&buf, &new_tc->addr),
- etxtoa(new_tc->path_etx),
- etxtoa(new_etx),
+ get_linkcost_text(new_cost, OLSR_TRUE, &lqbuffer),
tc->next_hop ? olsr_ip_to_string(
&nbuf, &tc->next_hop->neighbor_iface_addr) : "<none>",
new_tc->hops);
struct avl_tree cand_tree;
struct avl_node *rtp_tree_node;
struct list_node path_list; /* head of the path_list */
- int i, path_count = 0;
struct tc_entry *tc;
struct rt_path *rtp;
struct tc_edge_entry *tc_edge;
struct neighbor_entry *neigh;
struct link_entry *link;
+ int path_count = 0;
/* We are done if our backoff timer is running */
if (!spf_backoff_timer) {
*/
OLSR_FOR_ALL_TC_ENTRIES(tc) {
tc->next_hop = NULL;
- tc->path_etx = INFINITE_ETX;
+ tc->path_cost = ROUTE_COST_BROKEN;
tc->hops = 0;
} OLSR_FOR_ALL_TC_ENTRIES_END(tc);
* zero ourselves and add us to the candidate tree.
*/
olsr_change_myself_tc();
- tc_myself->path_etx = ZERO_ETX;
+ tc_myself->path_cost = ZERO_ROUTE_COST;
olsr_spf_add_cand_tree(&cand_tree, tc_myself);
/*
* add edges to and from our neighbours.
*/
- for (i = 0; i < HASHSIZE; i++)
- for (neigh = neighbortable[i].next; neigh != &neighbortable[i];
- neigh = neigh->next) {
-
- if (neigh->status == SYM) {
-
- tc_edge = olsr_lookup_tc_edge(tc_myself, &neigh->neighbor_main_addr);
- link = get_best_link_to_neighbor(&neigh->neighbor_main_addr);
- if (!link) {
-
- /*
- * If there is no best link to this neighbor
- * and we had an edge before then flush the edge.
- */
- if (tc_edge) {
- olsr_delete_tc_edge_entry(tc_edge);
- }
- continue;
- }
+ OLSR_FOR_ALL_NBR_ENTRIES(neigh) {
- /* find the interface for the link */
- if (link->if_name) {
- link->inter = if_ifwithname(link->if_name);
- } else {
- link->inter = if_ifwithaddr(&link->local_iface_addr);
- }
+ if (neigh->status == SYM) {
+
+ tc_edge = olsr_lookup_tc_edge(tc_myself, &neigh->neighbor_main_addr);
+ link = get_best_link_to_neighbor(&neigh->neighbor_main_addr);
+ if (!link) {
/*
- * Set the next-hops of our neighbors.
+ * If there is no best link to this neighbor
+ * and we had an edge before then flush the edge.
*/
- if (!tc_edge) {
- tc_edge = olsr_add_tc_edge_entry(tc_myself, &neigh->neighbor_main_addr,
- 0, link->vtime,
- link->loss_link_quality2,
- link->neigh_link_quality2);
- } else {
-
- /*
- * Update LQ and timers, such that the edge does not get deleted.
- */
- tc_edge->link_quality = link->loss_link_quality2;
- tc_edge->inverse_link_quality = link->neigh_link_quality2;
- olsr_set_tc_edge_timer(tc_edge, link->vtime*1000);
- olsr_calc_tc_edge_entry_etx(tc_edge);
- }
- if (tc_edge->edge_inv) {
- tc_edge->edge_inv->tc->next_hop = link;
+ if (tc_edge) {
+ olsr_delete_tc_edge_entry(tc_edge);
}
+ continue;
+ }
+
+ /* find the interface for the link */
+ if (link->if_name) {
+ link->inter = if_ifwithname(link->if_name);
+ } else {
+ link->inter = if_ifwithaddr(&link->local_iface_addr);
+ }
+
+ /*
+ * Set the next-hops of our neighbors.
+ */
+ if (!tc_edge) {
+ tc_edge = olsr_add_tc_edge_entry(tc_myself, &neigh->neighbor_main_addr,
+ 0, link->vtime);
+ } else {
+ /*
+ * Update LQ and timers, such that the edge does not get deleted.
+ */
+ olsr_copylq_link_entry_2_tc_edge_entry(tc_edge, link);
+ olsr_set_tc_edge_timer(tc_edge, link->vtime*1000);
+ olsr_calc_tc_edge_entry_etx(tc_edge);
+ }
+ if (tc_edge->edge_inv) {
+ tc_edge->edge_inv->tc->next_hop = link;
}
}
+ } OLSR_FOR_ALL_NBR_ENTRIES_END(neigh);
#ifdef SPF_PROFILING
gettimeofday(&t2, NULL);
*/
for (; !list_is_empty(&path_list); list_remove(path_list.next)) {
- tc = path_list.next->data;
+ tc = pathlist2tc(path_list.next);
link = tc->next_hop;
if (!link) {
#ifndef NODEBUG
struct ipaddr_str buf;
#endif
- OLSR_PRINTF(1, "SPF: %s no next-hop\n", olsr_ip_to_string(&buf, &tc->addr));
+ OLSR_PRINTF(2, "SPF: %s no next-hop\n", olsr_ip_to_string(&buf, &tc->addr));
}
#endif
continue;
rtp_tree_node;
rtp_tree_node = avl_walk_next(rtp_tree_node)) {
- rtp = rtp_tree_node->data;
+ rtp = rtp_prefix_tree2rtp(rtp_tree_node);
if (rtp->rtp_rt) {
Repositories / olsrd.git / blobdiff