jeste drobny bugfix a hotovo

git-svn-id: https://dev.arachne.cz/repos/prometheus/trunk@61 251d49ef-1d17-4917-a970-b30cf55b089b

diff --git a/prometheus.c b/prometheus.c
index 19f06e822ea1782c56d54c0082d6e7e365c7a9c9..c7887a0e5b099f1326f2229f802a48222b879fb1 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -563,6 +563,10 @@ void run_restore(void)
 {\r
  char *restor, *str;\r
  string(restor,STRLEN);\r
 {\r
  char *restor, *str;\r
  string(restor,STRLEN);\r

+\r
+ /*-----------------------------------------------------------------*/\r
+ printf("Running %s <%s ...\n",iptablesrestore,iptablesfile);\r
+ /*-----------------------------------------------------------------*/\r

  \r
  save_line("COMMIT");\r
  fclose(iptables_file);\r
  \r
  save_line("COMMIT");\r
  fclose(iptables_file);\r


@@ -1075,7 +1079,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
      }\r
      else\r
      {\r
      }\r
      else\r
      {\r

-      if( keyword->data_prio && !ip->fixedprio &&\r
+      if( ip->keyword->data_prio && !ip->fixedprio &&\r

           ip->traffic>ip->credit+\r
            (ip->min*ip->keyword->data_prio+(ip->keyword->fixed_prio<<20)) )\r
       {\r
           ip->traffic>ip->credit+\r
            (ip->min*ip->keyword->data_prio+(ip->keyword->fixed_prio<<20)) )\r
       {\r


@@ -1459,6 +1463,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 \r
  printf("Total IP count: %d\n", i);\r
 \r
 \r
  printf("Total IP count: %d\n", i);\r
 \r

+ /*-----------------------------------------------------------------*/\r
+ puts("Generating free bandwith classes ...");\r
+ /*-----------------------------------------------------------------*/\r
+\r

  /* ---------------------------------------- tc - free bandwith shared class */\r
  sprintf(str,"%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio 2",tc,lan,parent,free_min,free_max,burst);\r
  safe_run(str);\r
  /* ---------------------------------------- tc - free bandwith shared class */\r
  sprintf(str,"%s class add dev %s parent 1:%d classid 1:3 htb rate %dkbit ceil %dkbit burst %dk prio 2",tc,lan,parent,free_min,free_max,burst);\r
  safe_run(str);\r


@@ -1481,7 +1489,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
 \r
  sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3",tc,wan);\r
  safe_run(str);\r
 \r
  sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle 3 fw flowid 1:3",tc,wan);\r
  safe_run(str);\r

- \r
+\r

  run_restore();\r
  \r
  if (log_file) fclose(log_file);\r
  run_restore();\r
  \r
  if (log_file) fclose(log_file);\r