X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=prometheus.c;h=1b510293460791b215ac569c658910a9fc85840e;hb=3430e838dc632523c571a995d75ace44de1b06b6;hp=a3619dbea84844729b7b71daaf41b16f3906e8e6;hpb=33c2a33ddc91ec1dbacce09a12d96207a5e6df22;p=svn%2FPrometheus-QoS%2F.git diff --git a/prometheus.c b/prometheus.c index a3619db..1b51029 100644 --- a/prometheus.c +++ b/prometheus.c @@ -2,12 +2,12 @@ /* Prometheus QoS - you can "steal fire" from your ISP */ /* "fair-per-IP" quality of service (QoS) utility */ /* requires Linux 2.4.x or 2.6.x with HTB support */ -/* Copyright(C) 2005-2017 Michael Polak, Arachne Aerospace */ +/* Copyright(C) 2005-2019 Michael Polak, Arachne Aerospace */ /* iptables-restore support Copyright(C) 2007-2008 ludva */ /* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -/* Modified by: xChaos, 20171012 +/* Modified by: xChaos, 20190127 ludva, 20080415 Prometheus QoS is free software; you can redistribute it and/or @@ -29,7 +29,7 @@ #include "cll1-0.6.2.h" #include "ipstruct.h" -const char *version = "0.9.0-a"; +const char *version = "0.9.1"; /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* Versions: 0.9.0 is development release, 1.0 will be "stable" */ @@ -61,6 +61,7 @@ char *hosts = "/etc/prometheus/hosts"; /* per-IP bandwidth definition char *macrosfile = "/etc/prometheus/prometheus.macros"; /* rewrite rules for most common tariffs */ char *upstreamfile = "/etc/prometheus/upstream.interfaces"; /* list of interfaces to manage */ char *downstreamfile = "/etc/prometheus/downstream.interfaces"; /* list of interfaces to manage */ +char *qosfreefile = "/etc/prometheus/qosfree.interfaces"; /* list of interfaces to manage */ char *iptablesfile = "/var/spool/prometheus.iptables"; /* temporary file for iptables-restore*/ char *ip6tablesfile = "/var/spool/prometheus.ip6tables"; /* temporary file for ip6tables-restore*/ char *credit = "/var/lib/misc/prometheus.credit"; /* credit log file */ @@ -86,6 +87,7 @@ char *final_chain = "DROP"; /* REJECT would be better, but it is impossible char *mark = "MARK"; char *mark_iptables = "MARK --set-mark "; int dry_run = FALSE; /* preview - use puts() instead of system() */ +int mix_new_hosts = FALSE; /* execute only commands not already in log of iptables */ char *iptablespreamble = "*mangle\n:PREROUTING ACCEPT [0:0]\n:POSTROUTING ACCEPT [0:0]\n:INPUT ACCEPT [0:0]\n:OUTPUT ACCEPT [0:0]\n:FORWARD ACCEPT [0:0]"; char *ip6preamble = "-A FORWARD -p ipv6-icmp -j ACCEPT\n-A POSTROUTING -p ipv6-icmp -j ACCEPT\n-A FORWARD -s fe80::/10 -j ACCEPT\n-A FORWARD -d ff00::/8 -j ACCEPT\n-A POSTROUTING -s fe80::/10 -j ACCEPT\n-A POSTROUTING -d ff00::/8 -j ACCEPT"; FILE *iptables_file = NULL; @@ -125,12 +127,12 @@ int ip_count = 0; FILE *log_file = NULL; char *kwd = "via-prometheus"; /* /etc/hosts comment, eg. #qos-64-128 */ -const int highest_priority = 0; /* highest HTB priority (HTB built-in value is 0) */ -const int lowest_priority = 7; /* lowest HTB priority /include/uapi/linux/pkt_sched.h: #define TC_HTB_NUMPRIO 8 */ -const int idxtable_treshold1 = 24; /* this is no longer configurable */ -const int idxtable_treshold2 = 12; /* this is no longer configurable */ -const int idxtable_bitmask1 = 3; /* this is no longer configurable */ -const int idxtable_bitmask2 = 3; /* this is no longer configurable */ +const int highest_priority = 0; /* highest HTB priority (HTB built-in value is 0) */ +const int lowest_priority = 7; /* lowest HTB priority /include/uapi/linux/pkt_sched.h: #define TC_HTB_NUMPRIO 8 */ +const int idxtable_treshold1 = 24; /* this is no longer configurable */ +const int idxtable_treshold2 = 12; /* this is no longer configurable */ +const int idxtable_bitmask1 = 3; /* this is no longer configurable */ +const int idxtable_bitmask2 = 3; /* this is no longer configurable */ struct IP *ips = NULL, *networks = NULL, *ip, *sharedip; struct Group *groups = NULL, *group; @@ -138,6 +140,8 @@ struct Keyword *keyword, *defaultkeyword=NULL, *keywords = NULL; struct Macro *macro, *macros = NULL; struct Index *idxs = NULL, *idx, *metaindex; struct Interface *interfaces = NULL, *interface; +struct QosFreeInterface *qosfreeinterfaces = NULL, *qosfreeinterface; +struct Textfile *previous_commands = NULL, *previous_iptables = NULL, *previous_ip6tables = NULL, *textline; #define FREE_CLASS 3 #define OVERLIMIT_CLASS 4 @@ -182,7 +186,6 @@ const char *tr_odd_even(void) } } - /* ====== iptables indexes are used to reduce complexity to log8(N) ===== */ char *index_id(char *ip, int bitmask); @@ -290,7 +293,8 @@ void get_config(char *config_filename) option("hosts",hosts); option("downstream-interfaces-list-filename",downstreamfile); option("upstream-interfaces-list-filename",upstreamfile); - option("macros-filename",upstreamfile); + option("qos-free-interfaces-list-filename",qosfreefile); + option("macros-filename",macrosfile); option("ip6-prefix",ip6prefix); option("medium",medium); ioption("hall-of-fame-enable",hall_of_fame); @@ -375,7 +379,23 @@ void safe_run(char *cmd) } else { - system(cmd); + int skip_cmd = FALSE; + if(mix_new_hosts) + for_each(textline, previous_commands) + if(eq(textline->str, cmd)) + { + skip_cmd = TRUE; + break; + } + + if(!skip_cmd) + { + if(mix_new_hosts) + { + printf("Executing command: %s\n", cmd); + } + system(cmd); + } } if(log_file) { @@ -384,17 +404,35 @@ void safe_run(char *cmd) } void iptables_save_line(char *line, int ipv6) -{ +{ if(ipv6) { + if(mix_new_hosts) + for_each(textline, previous_ip6tables) + if(eq(textline->str, line)) + return; + fprintf(ip6tables_file,"%s\n",line); } else { + if(mix_new_hosts) + for_each(textline, previous_iptables) + if(eq(textline->str, line)) + return; + fprintf(iptables_file,"%s\n",line); } + if(mix_new_hosts) + { + printf("Adding iptables/ip6tables rule: %s\n", line); + } } +#define IPv4 FALSE +#define IPv6 TRUE + + void run_iptables_restore(void) { char *restor; @@ -404,7 +442,7 @@ void run_iptables_restore(void) printf("Running %s <%s ...\n", iptablesrestore, iptablesfile); /*-----------------------------------------------------------------*/ - iptables_save_line("COMMIT", FALSE); + iptables_save_line("COMMIT", IPv4); fclose(iptables_file); if(dry_run) { @@ -423,7 +461,7 @@ void run_iptables_restore(void) /*-----------------------------------------------------------------*/ printf("Running %s <%s ...\n", ip6tablesrestore, ip6tablesfile); /*-----------------------------------------------------------------*/ - iptables_save_line("COMMIT", TRUE); + iptables_save_line("COMMIT", IPv6); fclose(ip6tables_file); if(dry_run) { @@ -462,7 +500,7 @@ program int just_preview = FALSE; /* preview - generate just stats */ int start_shaping = FALSE; /* apply FUP - requires classmap file */ int stop_shaping = FALSE; /* lift FUP - requires classmap file */ - int reduce_ceil = 0; /* allow only rate+(ceil-rate)/2, /4, etc. */ + int reduce_ceil = 0; /* allow only rate+(ceil-rate)/2, /4, etc. */ int just_logs = FALSE; /* just parse logs */ int run = FALSE; int total = 0; @@ -471,7 +509,7 @@ program printf("\n\ Prometheus QoS - \"fair-per-IP\" Quality of Service setup utility.\n\ -Version %s - Copyright (C)2005-2017 Michael Polak, Arachne Labs\n\ +Version %s - Copyright (C)2005-2019 Michael Polak, Arachne Labs\n\ iptables-restore & burst tunning & classify modification by Ludva\n\ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); @@ -480,20 +518,21 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); { argument("-c") { nextargument(config); } argument("-h") { nextargument(althosts);} - argument("-d") { run=TRUE; dry_run=TRUE; } - argument("-f") { run=TRUE; just_flush=TRUE; } - argument("-9") { run=TRUE; just_flush=9; } - argument("-p") { run=TRUE; just_preview=TRUE; } - argument("-q") { run=TRUE; just_preview=TRUE; stop_shaping=TRUE; } - argument("-2") { run=TRUE; just_preview=TRUE; reduce_ceil=2; } - argument("-4") { run=TRUE; just_preview=TRUE; reduce_ceil=4; } - argument("-s") { run=TRUE; just_preview=TRUE; start_shaping=TRUE; } - argument("-r") { run=TRUE; } - argument("-n") { run=TRUE; nodelay=TRUE; } - argument("-a") { run=TRUE; just_networks=TRUE; } - argument("-l") { just_logs=TRUE; } - argument("-m") { just_logs=TRUE; } - argument("-y") { just_logs=TRUE; } + argument("-d") { run = TRUE; dry_run = TRUE; } + argument("-f") { run = TRUE; just_flush = TRUE; } + argument("-9") { run = TRUE; just_flush = 9; } + argument("-p") { run = TRUE; just_preview = TRUE; } + argument("-q") { run = TRUE; just_preview = TRUE; stop_shaping = TRUE; } + argument("-2") { run = TRUE; just_preview = TRUE; reduce_ceil = 2; } + argument("-4") { run = TRUE; just_preview = TRUE; reduce_ceil = 4; } + argument("-s") { run = TRUE; just_preview = TRUE; start_shaping = TRUE; } + argument("-x") { run = TRUE; just_preview = TRUE; mix_new_hosts = TRUE; } + argument("-r") { run = TRUE; } + argument("-n") { run = TRUE; nodelay = TRUE; } + argument("-a") { run = TRUE; just_networks = TRUE; } + argument("-l") { just_logs = TRUE; } + argument("-m") { just_logs = TRUE; } + argument("-y") { just_logs = TRUE; } argument("-?") { help(); exit(0); } argument("--help") { help(); exit(0); } argument("-v") { exit(0); } @@ -540,7 +579,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); /*-----------------------------------------------------------------*/ printf("Parsing downstream interfaces list %s ...\n", downstreamfile); /*-----------------------------------------------------------------*/ - parse(upstreamfile) + parse(downstreamfile) { ptr = parse_datafile_line(_); if(ptr) @@ -558,11 +597,10 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); interface->chain = "POSTROUTING"; interface->idxprefix = "post"; push(interface, interfaces); - printf("Upstream interface %s: medium %s capacity %ld kbps\n", interface->name, medium, interface->speed); + printf("Downstream interface %s: medium %s capacity %ld kbps\n", interface->name, medium, interface->speed); } } done; /* ugly macro end */ - if(just_logs) { @@ -580,7 +618,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); hosts = althosts; } - if(just_flush<9) + if(!mix_new_hosts && just_flush<9) { /*-----------------------------------------------------------------*/ puts("Parsing iptables verbose output ..."); @@ -601,6 +639,12 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); string(str, STRLEN); string(limit_pkts, STRLEN); + /*-----------------------------------------------------------------*/ + printf("Parsing qos free interfaces file %s ...\n", qosfreefile); + /*-----------------------------------------------------------------*/ + load(qosfreeinterface, qosfreeinterfaces, + qosfreefile, QosFreeInterface, name); + /*-----------------------------------------------------------------*/ printf("Parsing macro definition file %s ...\n", macrosfile); /*-----------------------------------------------------------------*/ @@ -618,8 +662,6 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); } done; /* ugly macro end */ - - /*-----------------------------------------------------------------*/ printf("Parsing class defintion file %s ...\n", hosts); /*-----------------------------------------------------------------*/ @@ -633,6 +675,33 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); } */ + if(mix_new_hosts) + { + char *new_filename; + /*-----------------------------------------------------------------*/ + printf("Loading log of previously executed commands %s ...\n", cmdlog); + /*-----------------------------------------------------------------*/ + load(textline, previous_commands, cmdlog, Textfile, str); + /*-----------------------------------------------------------------*/ + printf("Loading log of iptables-restore commands %s ...\n", iptablesfile); + /*-----------------------------------------------------------------*/ + load(textline, previous_iptables, iptablesfile, Textfile, str); + /*-----------------------------------------------------------------*/ + printf("Loading log of ip6tables-restore commands %s ...\n", ip6tablesfile); + /*-----------------------------------------------------------------*/ + load(textline, previous_ip6tables, ip6tablesfile, Textfile, str); + + string(new_filename, strlen(iptablesfile)+2); + strcpy(new_filename, iptablesfile); + strcat(new_filename, "-x"); + iptablesfile = new_filename; + + string(new_filename, strlen(ip6tablesfile)+2); + strcpy(new_filename, ip6tablesfile); + strcat(new_filename, "-x"); + ip6tablesfile = new_filename; + } + /*-----------------------------------------------------------------*/ puts("Resolving shared connections ..."); /*-----------------------------------------------------------------*/ @@ -673,7 +742,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); } } - if(enable_credit && just_flush<9) + if(!mix_new_hosts && enable_credit && just_flush<9) { /*-----------------------------------------------------------------*/ printf("Parsing credit file %s ...\n", credit); @@ -693,7 +762,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); } - if(!just_preview) + if(!mix_new_hosts && !just_preview) { /*-----------------------------------------------------------------*/ puts("Initializing iptables and tc classes ..."); @@ -705,7 +774,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); perror(iptablesfile); exit(-1); } - iptables_save_line(iptablespreamble, FALSE); + iptables_save_line(iptablespreamble, IPv4); if(ip6prefix) { @@ -715,8 +784,8 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); perror(ip6tablesfile); exit(-1); } - iptables_save_line(iptablespreamble, TRUE); - iptables_save_line(ip6preamble, TRUE); + iptables_save_line(iptablespreamble, IPv6); + iptables_save_line(ip6preamble, IPv6); } run_iptables_restore(); @@ -735,23 +804,33 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); } iptables_file=fopen(iptablesfile,"w"); - iptables_save_line(iptablespreamble, FALSE); + iptables_save_line(iptablespreamble, IPv4); if(ip6prefix) { ip6tables_file=fopen(ip6tablesfile,"w"); - iptables_save_line(iptablespreamble, TRUE); - iptables_save_line(ip6preamble, TRUE); + iptables_save_line(iptablespreamble, IPv6); + iptables_save_line(ip6preamble, IPv6); } if(qos_free_zone && *qos_free_zone!='0') /* this is currently supported only for IPv4 */ { for_each(interface, interfaces) { - sprintf(str,"-A %s -s %s -o %s -j ACCEPT", interface->chain, qos_free_zone, interface->name); - iptables_save_line(str, FALSE); + sprintf(str,"-A %s -%c %s -o %s -j ACCEPT", interface->chain, (interface->is_upstream?'d':'s'), qos_free_zone, interface->name); + iptables_save_line(str, IPv4); } } + for_each(qosfreeinterface, qosfreeinterfaces) + { + sprintf(str,"-A FORWARD -i %s -j ACCEPT", qosfreeinterface->name); + iptables_save_line(str, IPv4); + iptables_save_line(str, IPv6); + sprintf(str,"-A POSTROUTING -o %s -j ACCEPT", qosfreeinterface->name); + iptables_save_line(str, IPv4); + iptables_save_line(str, IPv6); + } + if(ip_count > idxtable_treshold1 && !just_flush) { int idxcount=0, bitmask=32-idxtable_bitmask1; @@ -760,12 +839,12 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); printf("Detected %d addresses - indexing iptables rules to improve performance...\n",ip_count); /*-----------------------------------------------------------------*/ - iptables_save_line(":post_common - [0:0]", FALSE); - iptables_save_line(":forw_common - [0:0]", FALSE); + iptables_save_line(":post_common - [0:0]", IPv4); + iptables_save_line(":forw_common - [0:0]", IPv4); if(ip6prefix) { - iptables_save_line(":post_common - [0:0]", TRUE); - iptables_save_line(":forw_common - [0:0]", TRUE); + iptables_save_line(":post_common - [0:0]", IPv6); + iptables_save_line(":forw_common - [0:0]", IPv6); } for_each(ip,ips) if(ip->addr && *(ip->addr) && !eq(ip->addr,"0.0.0.0/0")) @@ -868,10 +947,12 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); buf = interface->chain; } - sprintf(str,"-A %s -d %s/%d -o %s -j %s_%s", buf, subnet, idx->bitmask, interface->name, interface->idxprefix, idx->id); + sprintf(str, "-A %s -%c %s/%d -o %s -j %s_%s", + buf, (interface->is_upstream?'s':'d'), subnet, idx->bitmask, interface->name, interface->idxprefix, idx->id); iptables_save_line(str, idx->ipv6); - sprintf(str,"-A %s -d %s/%d -o %s -j %s_common", buf, subnet, idx->bitmask, interface->name, interface->idxprefix); + sprintf(str, "-A %s -%c %s/%d -o %s -j %s_common", + buf, (interface->is_upstream?'s':'d'), subnet, idx->bitmask, interface->name, interface->idxprefix); iptables_save_line(str, idx->ipv6); } } @@ -880,11 +961,11 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); for_each(interface, interfaces) { sprintf(str,"-A %s -o %s -j %s_common", interface->chain, interface->name, interface->idxprefix); - iptables_save_line(str, FALSE); + iptables_save_line(str, IPv4); if(ip6prefix) { sprintf(str,"-A %s -o %s -j %s_common", interface->chain, interface->name, interface->idxprefix); - iptables_save_line(str, TRUE); + iptables_save_line(str, IPv6); } } } @@ -901,7 +982,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); exit(0); } - if(!just_preview) + if(!mix_new_hosts && !just_preview) { if(!dry_run && !nodelay && qos_free_delay) { @@ -925,10 +1006,13 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); } } - /*-----------------------------------------------------------------*/ - puts("Locating heavy downloaders and generating root classes ..."); - /*-----------------------------------------------------------------*/ - sort(ip,ips,desc_order_by,traffic); + if(mix_new_hosts) + { + /*-----------------------------------------------------------------*/ + puts("Locating heavy downloaders and generating root classes ..."); + /*-----------------------------------------------------------------*/ + sort(ip,ips,desc_order_by,traffic); + } /*-----------------------------------------------------------------*/ for_each(interface, interfaces) @@ -1163,7 +1247,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); json_traffic=json_preview; } - if(!dry_run && !just_flush) + if(!mix_new_hosts && !dry_run && !just_flush) { /*-----------------------------------------------------------------*/ printf("Writing json traffic overview %s ... ", json_traffic); @@ -1194,8 +1278,8 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); printf("Statistics preview generated (-%c switch) - now exiting ...\n", swchar); exit(0); - } - + } + i=0; #ifdef DEBUG printf("%-22s %-15s mark\n","name","ip"); @@ -1257,24 +1341,29 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); #endif /* ------------------------------------------------ iptables classify */ - sprintf(str, "-A %s -d %s/%d -o %s -j %s%d", - chain, ip->addr, ip->mask, + sprintf(str, "-A %s -%c %s/%d -o %s -j %s%d", + chain, (interface->is_upstream?'s':'d'), ip->addr, ip->mask, interface->name, mark_iptables, ip->mark); iptables_save_line(str, ip->v6); - sprintf(str, "-A %s -d %s/%d -o %s %s-j ACCEPT", - chain, ip->addr, ip->mask, interface->name, limit_pkts); - iptables_save_line(str, ip->v6); - - /* classify overlimit packets to separate overlimit class */ - sprintf(str, "-A %s -d %s/%d -o %s -j %s%d", - chain, ip->addr, ip->mask, - interface->name, mark_iptables, OVERLIMIT_CLASS); + sprintf(str, "-A %s -%c %s/%d -o %s %s-j ACCEPT", + chain, (interface->is_upstream?'s':'d'),ip->addr, ip->mask, + interface->name, limit_pkts); iptables_save_line(str, ip->v6); - sprintf(str, "-A %s -d %s/%d -o %s -j ACCEPT", - chain, ip->addr, ip->mask, interface->name); - iptables_save_line(str, ip->v6); + if(*limit_pkts) /* non-empty string?*/ + { + /* classify overlimit packets to separate overlimit class */ + sprintf(str, "-A %s -%c %s/%d -o %s -j %s%d", + chain, (interface->is_upstream?'s':'d'), ip->addr, ip->mask, + interface->name, mark_iptables, OVERLIMIT_CLASS); + iptables_save_line(str, ip->v6); + + sprintf(str, "-A %s -%c %s/%d -o %s -j ACCEPT", + chain, (interface->is_upstream?'s':'d'), ip->addr, ip->mask, + interface->name); + iptables_save_line(str, ip->v6); + } if(ip->min) { @@ -1341,15 +1430,15 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); sprintf(str, "-A %s -o %s -j %s%d", chain, interface->name, mark_iptables, FREE_CLASS); - iptables_save_line(str, FALSE); /* only for IPv4 */ + iptables_save_line(str, IPv4); /* only for IPv4 */ } sprintf(str,"-A %s -o %s -j %s", chain, interface->name, final_chain); - iptables_save_line(str, FALSE); + iptables_save_line(str, IPv4); if(ip6prefix) { sprintf(str,"-A %s -o %s -j %s", chain, interface->name, final_chain); - iptables_save_line(str, TRUE); + iptables_save_line(str, IPv6); } if(free_min) /* allocate free bandwith if it is not zero... */ @@ -1369,14 +1458,13 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version); /* tc handle 1 fw flowid */ sprintf(str,"%s filter add dev %s parent 1:0 protocol ip handle %d fw flowid 1:%d", tc, interface->name, FREE_CLASS, FREE_CLASS); safe_run(str); - - /*-----------------------------------------------------------------*/ - puts("Generating bandwith class for overlimit packets..."); - /*-----------------------------------------------------------------*/ - sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d", - tc, interface->name, parent, OVERLIMIT_CLASS, overlimit_min, overlimit_max, burst, lowest_priority); - safe_run(str); } + /*-----------------------------------------------------------------*/ + puts("Generating bandwith class for overlimit packets..."); + /*-----------------------------------------------------------------*/ + sprintf(str, "%s class add dev %s parent 1:%d classid 1:%d htb rate %dkbit ceil %dkbit burst %dk prio %d", + tc, interface->name, parent, OVERLIMIT_CLASS, overlimit_min, overlimit_max, burst, lowest_priority); + safe_run(str); } printf("Total IP count: %d\n", i); run_iptables_restore();