packages/qmp-quagga/patches/121-quagga-bmx6.patch

   1 --- a/lib/log.c
   2 +++ b/lib/log.c
   3 @@ -941,6 +941,8 @@ proto_redistnum(int afi, const char *s)
   4         return ZEBRA_ROUTE_OLSR;
   5        else if (strncmp (s, "bat", 3) == 0)
   6         return ZEBRA_ROUTE_BATMAN;
   7 +      else if (strncmp (s, "bmx", 3) == 0)
   8 +       return ZEBRA_ROUTE_BMX6;
   9        else if (strncmp (s, "bab", 3) == 0)
  10         return ZEBRA_ROUTE_BABEL;
  11      }
  12 @@ -966,6 +968,8 @@ proto_redistnum(int afi, const char *s)
  13         return ZEBRA_ROUTE_OLSR;
  14        else if (strncmp (s, "bat", 3) == 0)
  15         return ZEBRA_ROUTE_BATMAN;
  16 +      else if (strncmp (s, "bmx", 3) == 0)
  17 +       return ZEBRA_ROUTE_BMX6;
  18        else if (strncmp (s, "bab", 3) == 0)
  19         return ZEBRA_ROUTE_BABEL;
  20      }
  21 --- a/lib/route_types.txt
  22 +++ b/lib/route_types.txt
  23 @@ -54,6 +54,7 @@ ZEBRA_ROUTE_BGP,        bgp,       bgpd,
  24  ZEBRA_ROUTE_HSLS,       hsls,      hslsd,  'H', 1, 1, "HSLS"
  25  ZEBRA_ROUTE_OLSR,       olsr,      olsrd,  'o', 1, 1, "OLSR"
  26  ZEBRA_ROUTE_BATMAN,     batman,    batmand,'b', 1, 1, "BATMAN"
  27 +ZEBRA_ROUTE_BMX6,       bmx6,      bmx6,   'x', 1, 1, "BMX6"
  28  ZEBRA_ROUTE_BABEL,      babel,     babeld, 'A', 1, 1, "Babel"
  29
  30  ## help strings
  31 @@ -70,4 +71,5 @@ ZEBRA_ROUTE_BGP,    "Border Gateway Prot
  32  ZEBRA_ROUTE_HSLS,   "Hazy-Sighted Link State Protocol (HSLS)"
  33  ZEBRA_ROUTE_OLSR,   "Optimized Link State Routing (OLSR)"
  34  ZEBRA_ROUTE_BATMAN, "Better Approach to Mobile Ad-Hoc Networking (BATMAN)"
  35 +ZEBRA_ROUTE_BMX6,   "BMX6 networking protocol"
  36  ZEBRA_ROUTE_BABEL,  "Babel routing protocol (Babel)"
  37 --- a/ripd/rip_zebra.c
  38 +++ b/ripd/rip_zebra.c
  39 @@ -211,6 +211,7 @@ static struct {
  40    {ZEBRA_ROUTE_HSLS,    1, "hsls"},
  41    {ZEBRA_ROUTE_OLSR,    2, "olsr"},
  42    {ZEBRA_ROUTE_BATMAN,  3, "batman"},
  43 +  {ZEBRA_ROUTE_BMX6,    3, "bmx6"},
  44    {ZEBRA_ROUTE_BABEL,   3, "babel"},
  45    {0, 0, NULL}
  46  };
  47 --- a/ripngd/ripng_zebra.c
  48 +++ b/ripngd/ripng_zebra.c
  49 @@ -221,6 +221,7 @@ static struct {
  50    {ZEBRA_ROUTE_HSLS,    1, "hsls"},
  51    {ZEBRA_ROUTE_OLSR,    2, "olsr"},
  52    {ZEBRA_ROUTE_BATMAN,  3, "batman"},
  53 +  {ZEBRA_ROUTE_BMX6,    3, "bmx6"},
  54    {ZEBRA_ROUTE_BABEL,   3, "babel"},
  55    {0, 0, NULL}
  56  };
  57 --- a/zebra/zebra_rib.c
  58 +++ b/zebra/zebra_rib.c
  59 @@ -70,6 +70,7 @@ static const struct
  60    [ZEBRA_ROUTE_HSLS]    = {ZEBRA_ROUTE_HSLS,      0},
  61    [ZEBRA_ROUTE_OLSR]    = {ZEBRA_ROUTE_OLSR,      0},
  62    [ZEBRA_ROUTE_BATMAN]  = {ZEBRA_ROUTE_BATMAN,    0},
  63 +  [ZEBRA_ROUTE_BMX6]    = {ZEBRA_ROUTE_BMX6,      0},
  64    [ZEBRA_ROUTE_BABEL]   = {ZEBRA_ROUTE_BABEL,    95},
  65    /* no entry/default: 150 */
  66  };
  67 @@ -1265,6 +1266,7 @@ static const u_char meta_queue_map[ZEBRA
  68    [ZEBRA_ROUTE_HSLS]    = 4,
  69    [ZEBRA_ROUTE_OLSR]    = 4,
  70    [ZEBRA_ROUTE_BATMAN]  = 4,
  71 +  [ZEBRA_ROUTE_BMX6]    = 4,
  72    [ZEBRA_ROUTE_BABEL]   = 2,
  73  };
  74
  75 --- a/zebra/zebra_snmp.c
  76 +++ b/zebra/zebra_snmp.c
  77 @@ -257,6 +257,8 @@ proto_trans(int type)
  78        return 1; /* other */
  79      case ZEBRA_ROUTE_BATMAN:
  80        return 1; /* other */
  81 +    case ZEBRA_ROUTE_BMX6:
  82 +      return 1; /* other */
  83      default:
  84        return 1; /* other */
  85      }
  86 --- a/zebra/zebra_vty.c
  87 +++ b/zebra/zebra_vty.c
  88 @@ -561,7 +561,8 @@ vty_show_ip_route_detail (struct vty *vt
  89           || rib->type == ZEBRA_ROUTE_BGP
  90           || rib->type == ZEBRA_ROUTE_HSLS
  91           || rib->type == ZEBRA_ROUTE_OLSR
  92 -         || rib->type == ZEBRA_ROUTE_BATMAN)
  93 +         || rib->type == ZEBRA_ROUTE_BATMAN
  94 +         || rib->type == ZEBRA_ROUTE_BMX6)
  95         {
  96           time_t uptime;
  97           struct tm *tm;
  98 @@ -783,7 +784,8 @@ vty_show_ip_route (struct vty *vty, stru
  99           || rib->type == ZEBRA_ROUTE_BGP
 100           || rib->type == ZEBRA_ROUTE_HSLS
 101           || rib->type == ZEBRA_ROUTE_OLSR
 102 -         || rib->type == ZEBRA_ROUTE_BATMAN)
 103 +         || rib->type == ZEBRA_ROUTE_BATMAN
 104 +         || rib->type == ZEBRA_ROUTE_BMX6)
 105         {
 106           time_t uptime;
 107           struct tm *tm;
 108 @@ -1545,7 +1547,8 @@ vty_show_ipv6_route_detail (struct vty *
 109           || rib->type == ZEBRA_ROUTE_BGP
 110           || rib->type == ZEBRA_ROUTE_HSLS
 111           || rib->type == ZEBRA_ROUTE_OLSR
 112 -         || rib->type == ZEBRA_ROUTE_BATMAN)
 113 +         || rib->type == ZEBRA_ROUTE_BATMAN
 114 +         || rib->type == ZEBRA_ROUTE_BMX6)
 115         {
 116           time_t uptime;
 117           struct tm *tm;
 118 @@ -1728,7 +1731,8 @@ vty_show_ipv6_route (struct vty *vty, st
 119           || rib->type == ZEBRA_ROUTE_BGP
 120           || rib->type == ZEBRA_ROUTE_HSLS
 121           || rib->type == ZEBRA_ROUTE_OLSR
 122 -         || rib->type == ZEBRA_ROUTE_BATMAN)
 123 +         || rib->type == ZEBRA_ROUTE_BATMAN
 124 +         || rib->type == ZEBRA_ROUTE_BMX6)
 125         {
 126           time_t uptime;
 127           struct tm *tm;