ipv6/dibbler/patches/110-remove_mp_alg.patch

   1 Index: dibbler-0.6.0-RC1/Port-linux/iproute.c
   2 ===================================================================
   3 --- dibbler-0.6.0-RC1.orig/Port-linux/iproute.c 2007-10-21 09:25:04.698543780 +0200
   4 +++ dibbler-0.6.0-RC1/Port-linux/iproute.c      2007-10-21 09:25:30.572018227 +0200
   5 @@ -28,7 +28,6 @@
   6  #include <netinet/ip.h>
   7  #include <arpa/inet.h>
   8  #include <linux/in_route.h>
   9 -#include <linux/ip_mp_alg.h>
  10
  11  #include "rt_names.h"
  12  #include "utils.h"
  13 @@ -95,14 +94,6 @@
  14         inet_prefix msrc;
  15  } filter;
  16
  17 -static char *mp_alg_names[IP_MP_ALG_MAX+1] = {
  18 -       [IP_MP_ALG_NONE] = "none",
  19 -       [IP_MP_ALG_RR] = "rr",
  20 -       [IP_MP_ALG_DRR] = "drr",
  21 -       [IP_MP_ALG_RANDOM] = "random",
  22 -       [IP_MP_ALG_WRANDOM] = "wrandom"
  23 -};
  24 -
  25  static int flush_update(void)
  26  {
  27         if (rtnl_send(&rth, filter.flushb, filter.flushp) < 0) {
  28 @@ -335,14 +326,6 @@
  29                 fprintf(fp, "tos %s ", rtnl_dsfield_n2a(r->rtm_tos, b1, sizeof(b1)));
  30         }
  31
  32 -       if (tb[RTA_MP_ALGO]) {
  33 -               __u32 mp_alg = *(__u32*) RTA_DATA(tb[RTA_MP_ALGO]);
  34 -               if (mp_alg > IP_MP_ALG_NONE) {
  35 -                       fprintf(fp, "mpath %s ",
  36 -                           mp_alg < IP_MP_ALG_MAX ? mp_alg_names[mp_alg] : "unknown");
  37 -               }
  38 -       }
  39 -
  40         if (tb[RTA_GATEWAY] && filter.rvia.bitlen != host_len) {
  41                 fprintf(fp, "via %s ",
  42                         format_host(r->rtm_family,
  43 @@ -846,18 +829,6 @@
  44                            strcmp(*argv, "oif") == 0) {
  45                         NEXT_ARG();
  46                         d = *argv;
  47 -               } else if (strcmp(*argv, "mpath") == 0 ||
  48 -                          strcmp(*argv, "mp") == 0) {
  49 -                       int i;
  50 -                       __u32 mp_alg = IP_MP_ALG_NONE;
  51 -
  52 -                       NEXT_ARG();
  53 -                       for (i = 1; i < ARRAY_SIZE(mp_alg_names); i++)
  54 -                               if (strcmp(*argv, mp_alg_names[i]) == 0)
  55 -                                       mp_alg = i;
  56 -                       if (mp_alg == IP_MP_ALG_NONE)
  57 -                               invarg("\"mpath\" value is invalid\n", *argv);
  58 -                       addattr_l(&req.n, sizeof(req), RTA_MP_ALGO, &mp_alg, sizeof(mp_alg));
  59                 } else {
  60                         int type;
  61                         inet_prefix dst;