From 20a88f4765cc45d8533e6b9032f15c3e3f6b6566 Mon Sep 17 00:00:00 2001 From: Henning Rogge Date: Wed, 24 Jun 2009 18:30:09 +0200 Subject: [PATCH 1/1] Block tc-redundancy 0/1. They don't work in 0.5.6 and require a difficult change in the dijkstra-code. The next stable version will have tc-redundancy again, feel free to contact us on olsr-user/dev list for details. --- src/cfgparser/olsrd_conf.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/cfgparser/olsrd_conf.c b/src/cfgparser/olsrd_conf.c index 883b168e..420b57db 100644 --- a/src/cfgparser/olsrd_conf.c +++ b/src/cfgparser/olsrd_conf.c @@ -232,10 +232,14 @@ olsrd_sanity_check_cnf(struct olsrd_config *cnf) } /* TC redundancy */ - - if ( //cnf->tc_redundancy < MIN_TC_REDUNDANCY || - cnf->tc_redundancy > MAX_TC_REDUNDANCY) { - fprintf(stderr, "TC redundancy %d is not allowed\n", cnf->tc_redundancy); + if (cnf->tc_redundancy != 2) { + fprintf(stderr, "Sorry, tc-redundancy 0/1 are not working on 0.5.6. " + "It was discovered late in the stable tree development and cannot " + "be solved without a difficult change in the dijkstra code. " + "Feel free to contact the olsr-user mailinglist " + "(http://www.olsr.org/?q=mailing-lists) to learn more " + "about the problem. The next version of OLSR will have working " + "tc-redundancy again.\n"); return -1; } -- 2.20.1