- new; esfq support

Changed files:
    iproute2-2.2.4-now-ss001007-esfq.diff -> 1.1

diff --git a/iproute2-2.2.4-now-ss001007-esfq.diff b/iproute2-2.2.4-now-ss001007-esfq.diff
new file mode 100644 (file)
index 0000000..2927161
--- /dev/null
+++ b/iproute2-2.2.4-now-ss001007-esfq.diff
@@ -0,0 +1,184 @@
+diff -urN iproute2.orig/tc/Makefile iproute2/tc/Makefile
+--- iproute2.orig/tc/Makefile  Sun Apr 16 20:42:53 2000
++++ iproute2/tc/Makefile       Tue May 14 23:04:10 2002
+@@ -5,6 +5,7 @@
+ TCMODULES :=
+ TCMODULES += q_fifo.o
+ TCMODULES += q_sfq.o
++TCMODULES += q_esfq.o
+ TCMODULES += q_red.o
+ TCMODULES += q_prio.o
+ TCMODULES += q_tbf.o
+diff -urN iproute2.orig/tc/q_esfq.c iproute2/tc/q_esfq.c
+--- iproute2.orig/tc/q_esfq.c  Thu Jan  1 02:00:00 1970
++++ iproute2/tc/q_esfq.c       Thu May 16 02:13:30 2002
+@@ -0,0 +1,169 @@
++/*
++ * q_esfq.c           ESFQ.
++ *
++ *            This program is free software; you can redistribute it and/or
++ *            modify it under the terms of the GNU General Public License
++ *            as published by the Free Software Foundation; either version
++ *            2 of the License, or (at your option) any later version.
++ *
++ * Authors:   Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
++ *
++ * Changes:   Alexander Atanasov, <alex@ssi.bg>
++ *            Added depth,limit,divisor,hash_kind options.
++ */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <syslog.h>
++#include <fcntl.h>
++#include <math.h> 
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
++#include <string.h>
++
++#include "utils.h"
++#include "tc_util.h"
++
++static void explain(void)
++{
++      fprintf(stderr, "Usage: ... esfq [ perturb SECS ] [ quantum BYTES ] [ depth FLOWS ]\n\t[ divisor HASHBITS ] [ limit PKTS ] [ hash HASHTYPE]\n");
++      fprintf(stderr,"Where: \n");
++      fprintf(stderr,"HASHTYPE := { classic | src | dst }\n");
++}
++
++#define usage() return(-1)
++
++static int esfq_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n)
++{
++      int ok=0;
++      struct tc_sfq_qopt opt;
++
++      memset(&opt, 0, sizeof(opt));
++
++      opt.hash_kind= TCA_SFQ_HASH_CLASSIC;
++      
++      while (argc > 0) {
++              if (strcmp(*argv, "quantum") == 0) {
++                      NEXT_ARG();
++                      if (get_size(&opt.quantum, *argv)) {
++                              fprintf(stderr, "Illegal \"quantum\"\n");
++                              return -1;
++                      }
++                      ok++;
++              } else if (strcmp(*argv, "perturb") == 0) {
++                      NEXT_ARG();
++                      if (get_integer(&opt.perturb_period, *argv, 0)) {
++                              fprintf(stderr, "Illegal \"perturb\"\n");
++                              return -1;
++                      }
++                      ok++;
++              } else if (strcmp(*argv, "depth") == 0) {
++                      NEXT_ARG();
++                      if (get_integer(&opt.flows, *argv, 0)) {
++                              fprintf(stderr, "Illegal \"depth\"\n");
++                              return -1;
++                      }
++                      ok++;
++              } else if (strcmp(*argv, "divisor") == 0) {
++                      NEXT_ARG();
++                      if (get_integer(&opt.divisor, *argv, 0)) {
++                              fprintf(stderr, "Illegal \"divisor\"\n");
++                              return -1;
++                      }
++                      if(opt.divisor >= 15) {
++                              fprintf(stderr, "Illegal \"divisor\" must be < 15\n");
++                              return -1;
++                      }
++                      opt.divisor=pow(2,opt.divisor);
++                      ok++;
++              } else if (strcmp(*argv, "limit") == 0) {
++                      NEXT_ARG();
++                      if (get_integer(&opt.limit, *argv, 0)) {
++                              fprintf(stderr, "Illegal \"limit\"\n");
++                              return -1;
++                      }
++                      ok++;
++              } else if (strcmp(*argv, "hash") == 0) {
++                      NEXT_ARG();
++                      if(strcmp(*argv,"classic") == 0) {
++                              opt.hash_kind= TCA_SFQ_HASH_CLASSIC;
++                      } else 
++                      if(strcmp(*argv,"dst") == 0) {
++                              opt.hash_kind= TCA_SFQ_HASH_DST;
++                      } else
++                      if(strcmp(*argv,"src") == 0) {
++                              opt.hash_kind= TCA_SFQ_HASH_SRC;
++                      } else {
++                              fprintf(stderr, "Illegal \"hash\"\n");
++                              explain();
++                              return -1;
++                      }
++                      ok++;
++              } else if (strcmp(*argv, "help") == 0) {
++                      explain();
++                      return -1;
++              } else {
++                      fprintf(stderr, "What is \"%s\"?\n", *argv);
++                      explain();
++                      return -1;
++              }
++              argc--; argv++;
++      }
++
++      if (ok)
++              addattr_l(n, 1024, TCA_OPTIONS, &opt, sizeof(opt));
++      return 0;
++}
++
++static int esfq_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
++{
++      struct tc_sfq_qopt *qopt;
++      SPRINT_BUF(b1);
++
++      if (opt == NULL)
++              return 0;
++
++      if (RTA_PAYLOAD(opt)  < sizeof(*qopt))
++              return -1;
++      qopt = RTA_DATA(opt);
++      fprintf(f, "quantum %s ", sprint_size(qopt->quantum, b1));
++      if (show_details) {
++              fprintf(f, "limit %up flows %u/%u ",
++                      qopt->limit, qopt->flows, qopt->divisor);
++      }
++      if (qopt->perturb_period)
++              fprintf(f, "perturb %dsec ", qopt->perturb_period);
++
++              fprintf(f,"hash: ");
++      switch(qopt->hash_kind)
++      {
++      case TCA_SFQ_HASH_CLASSIC:
++              fprintf(f,"classic");
++              break;
++      case TCA_SFQ_HASH_DST:
++              fprintf(f,"dst");
++              break;
++      case TCA_SFQ_HASH_SRC:
++              fprintf(f,"src");
++              break;
++      default:
++              fprintf(f,"Unknown");
++      }
++      return 0;
++}
++
++static int esfq_print_xstats(struct qdisc_util *qu, FILE *f, struct rtattr *xstats)
++{
++      return 0;
++}
++
++
++struct qdisc_util esfq_util = {
++      NULL,
++      "esfq",
++      esfq_parse_opt,
++      esfq_print_opt,
++      esfq_print_xstats,
++};