remove merge conflicts
authorHannes Gredler <hannes@gredler.at>
Tue, 29 Apr 2008 06:50:00 +0000 (08:50 +0200)
committerHannes Gredler <hannes@gredler.at>
Tue, 29 Apr 2008 06:50:00 +0000 (08:50 +0200)
lib/httpinfo/src/olsrd_httpinfo.c
lib/txtinfo/src/olsrd_txtinfo.c
src/tc_set.c

index 0fcf419..00dc72f 100644 (file)
@@ -1053,8 +1053,7 @@ static int build_topo_body(char *buf, olsr_u32_t bufsize)
   OLSR_FOR_ALL_TC_ENTRIES(tc) {
       struct tc_edge_entry *tc_edge;
       OLSR_FOR_ALL_TC_EDGE_ENTRIES(tc, tc_edge) {
-       if (tc_edge->edge_inv &&
-        ((tc_edge->flags | tc_edge->edge_inv->flags) & OLSR_TC_EDGE_DOWN)==0)  {
+       if (tc_edge->edge_inv)  {
           size += snprintf(&buf[size], bufsize-size, "<tr>");
           size += build_ipaddr_with_link(&buf[size], bufsize, &tc_edge->T_dest_addr, -1);
           size += build_ipaddr_with_link(&buf[size], bufsize, &tc->addr, -1);
index 762f59c..9252f03 100644 (file)
@@ -400,8 +400,7 @@ static void ipc_print_topology(void)
     OLSR_FOR_ALL_TC_ENTRIES(tc) {
         struct tc_edge_entry *tc_edge;
         OLSR_FOR_ALL_TC_EDGE_ENTRIES(tc, tc_edge) {
-               if (tc_edge->edge_inv &&
-                ((tc_edge->flags | tc_edge->edge_inv->flags) & OLSR_TC_EDGE_DOWN)==0)  {
+               if (tc_edge->edge_inv)  {
             struct ipaddr_str dstbuf, addrbuf;
             struct lqtextbuffer lqbuffer1, lqbuffer2;
             ipc_sendf( "%s\t%s\t%s\t%s\n", 
index b6a4222..a5597d5 100644 (file)
@@ -520,7 +520,7 @@ olsr_delete_tc_edge_entry(struct tc_edge_entry *tc_edge)
  * @param tc the entry to delete edges from
  * @return TRUE if any destinations were deleted, FALSE if not
  */
-static int
+olsr_bool
 olsr_delete_outdated_tc_edges(struct tc_entry *tc)
 {
   struct tc_edge_entry *tc_edge;