[Olsr-dev] another

[Henning Rogge]

Am Tuesday 28 April 2009 19:51:31 schrieb Peter Tarjan:
> Hi,
At first, thank you for all your code review... some parts of OLSR really need 
someone who did not write them for checking...

> I think I've found another little thing to fix in olsrd-0-5-6-r4 when
> tested with two machines having two olsr network interfaces each.
> In function check_link_status(...) an UNSPEC_LINK neighbor information
> can override an ASYM_LINK, just their order in the HELLOLQ packet
> matters.
>
> Please consider applying my patch to eliminate this problem:
>
> --- a/src/link_set.c	2009-04-28 17:42:14.952198152 +0000
> +++ b/src/link_set.c	2009-04-28 17:42:09.896197962 +0000
> @@ -749,7 +749,9 @@
>       * Note: If a neigh has 2 cards we can reach, the neigh
>       * will send a Hello with the same IP mentined twice
>       */
> -    if (ipequal(&neighbors->address, &in_if->ip_addr)) {
> +
> +    if (ipequal(&neighbors->address, &in_if->ip_addr) &&
> +        neighbors->link != UNSPEC_LINK) {
>        ret = neighbors->link;
>        if (SYM_LINK == ret) {
>          break;
Yep, that would be a typical "bad network design case", where a node with two 
nodes hear a single other node.

Just pushed the fix into 0.5.6 and development branch.

Henning

*************************************************
Diplom Informatiker Henning Rogge
Forschungsgesellschaft für
Angewandte Naturwissenschaften e. V. (FGAN) 
Neuenahrer Str. 20, 53343 Wachtberg, Germany
Tel.: 0049 (0)228 9435-961
Fax: 0049 (0)228 9435-685
E-Mail: (spam-protected)
Web: www.fgan.de
************************************************
Sitz der Gesellschaft: Bonn
Registergericht: Amtsgericht Bonn VR 2530
Vorstand: Prof. Dr. rer. nat. Maurus Tacke (komm. Vors.), Prof. Dr.-Ing. 
Joachim Ender (Stellv.)

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.olsr.org/pipermail/olsr-dev/attachments/20090429/d5bad993/attachment.sig>