[Olsr-dev] ignore UNSPEC_LINK neighbor in lookup_mpr_status(...), too

[Henning Rogge]

Am Thursday 30 April 2009 16:28:45 schrieb Peter Tarjan:
> Hi,
>
> > Yep, that would be a typical "bad network design case", where a node with
> > two nodes hear a single other node.
>
> I think so, because I found out another piece of code where
> UNSPEC_LINK neighbor information should be ignored (and so it won't
> override the information to be considered). I have not yet run a
> thorough test, but it should do the trick.
>
> --- a/src/process_package.c	2009-04-30 16:18:29.728697453 +0200
> +++ b/src/process_package.c	2009-04-30 16:19:22.196697688 +0200
> @@ -309,9 +309,9 @@
>    struct hello_neighbor *neighbors;
>
>    for (neighbors = message->neighbors; neighbors; neighbors =
> neighbors->next) {
> -    if (olsr_cnf->ip_version ==
> +    if ((olsr_cnf->ip_version ==
>          AF_INET ? ip4equal(&neighbors->address.v4,
> &in_if->ip_addr.v4) : ip6equal(&neighbors->address.v6,
> -
>             &in_if->int6_addr.sin6_addr)) {
> +
>             &in_if->int6_addr.sin6_addr)) && neighbors->link !=
> UNSPEC_LINK) {
>
>        if (neighbors->link == SYM_LINK && neighbors->status == MPR_NEIGH) {
>          return true;
>
>
> --
> Peter
Pushed to repositories... thank you again ! :)

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/20090504/6e582dea/attachment.sig>