Advertisement
cetex

Untitled

Apr 24th, 2014
144
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.43 KB | None | 0 0
  1. diff -Naur bird-1.3.4/proto/ospf/iface.c bird-1.3.4~loosecheck/proto/ospf/iface.c
  2. --- bird-1.3.4/proto/ospf/iface.c   2011-07-10 09:58:51.000000000 +0000
  3. +++ bird-1.3.4~loosecheck/proto/ospf/iface.c   2014-04-23 20:21:00.788463378 +0000
  4. @@ -534,23 +534,32 @@
  5.  
  6.    /* Check validity of interface type */
  7.    int old_type = ifa->type;
  8. +  int pref_type = ifa->type;
  9.  
  10.  #ifdef OSPFv2
  11.    if ((ifa->type == OSPF_IT_BCAST) && (addr->flags & IA_PEER))
  12. -    ifa->type = OSPF_IT_PTP;
  13. +    /*ifa->type = OSPF_IT_PTP;*/
  14. +    pref_type = OSPF_IT_PTP;
  15.  
  16.    if ((ifa->type == OSPF_IT_NBMA) && (addr->flags & IA_PEER))
  17. -    ifa->type = OSPF_IT_PTMP;
  18. +    /*ifa->type = OSPF_IT_PTMP;*/
  19. +    pref_type = OSPF_IT_PTMP;
  20.  #endif
  21.  
  22.    if ((ifa->type == OSPF_IT_BCAST) && !(iface->flags & IF_MULTICAST))
  23. -    ifa->type = OSPF_IT_NBMA;
  24. +    /*ifa->type = OSPF_IT_NBMA;*/
  25. +    pref_type = OSPF_IT_NBMA;
  26.  
  27.    if ((ifa->type == OSPF_IT_PTP) && !(iface->flags & IF_MULTICAST))
  28. -    ifa->type = OSPF_IT_PTMP;
  29. +    /*ifa->type = OSPF_IT_PTMP;*/
  30. +    pref_type = OSPF_IT_PTMP;
  31.  
  32. -  if (ifa->type != old_type)
  33. +  /*if (ifa->type != old_type)
  34.      log(L_WARN "%s: Cannot use interface %s as %s, forcing %s",
  35. +   p->name, iface->name, ospf_it[old_type], ospf_it[ifa->type]);*/
  36. +
  37. +  if (ifa->type != old_type)
  38. +    log(L_WARN "%s: Probably shouldnt use interface %s as %s, recommended mode is %s",
  39.     p->name, iface->name, ospf_it[old_type], ospf_it[ifa->type]);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement