license issues

[svn/Prometheus-QoS/.git] / prometheus.c

diff --git a/prometheus.c b/prometheus.c
index a63c5a0e2b2b27d288aa84d1804b627ff70632dc..a22397c3cd438443eb9c22838bf0e1fc6e6ccb71 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -20,9 +20,11 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
    General Public License for more details.\r
 \r
-   You should have received a copy of the GNU General Public License \r
-   along with the Linux kernel source code; if not, write to \r
-   Michael Polak, Svojsikova 7, 169 00 Praha 6 Czech Republic */\r
+   You should have received a copy of the GNU General Public License
+   along with Prometheus Qos; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA \r
+   \r
+   GNU General Public License is located in file COPYING */
 \r
 #define STRLEN 256\r
 #define FIRSTGROUPID 1024\r
@@ -31,7 +33,7 @@
 \r
 #include "cll1.h"\r
 \r
-const char *version="0.8.0";\r
+const char *version="0.7.7-1"; /*0.7.9 will be last development, 0.8.0 first stable */\r
 \r
 /* ======= Help screen is hopefuly self-documenting part of code :-) ======= */\r
 \r
@@ -57,12 +59,12 @@ int filter_type=1;                      /*1 mark, 2 classify*/
 char *mark="MARK";\r
 char *mark_iptables="MARK --set-mark ";\r
 int dry_run=0;                         /* preview - use puts() instead of system() */\r
-char *config="/etc/prometheus.conf";   /* main configuration file */\r
-char *hosts="/etc/hosts";              /* line bandwidth definition file */\r
+char *config="/etc/prometheus/prometheus.conf";   /* main configuration file */\r
+char *hosts="/etc/prometheus/hosts";              /* line bandwidth definition file */\r
 char *tc="/sbin/tc";                   /* requires tc with HTB support */\r
-char *iptables="/usr/sbin/iptables";       /* requires iptables utility */\r
-char *iptablessave="/usr/sbin/iptables-save"; /* new */\r
-char *iptablesrestore="/usr/sbin/iptables-restore";  /* new */\r
+char *iptables="/sbin/iptables";       /* requires iptables utility */\r
+char *iptablessave="/sbin/iptables-save"; /* new */\r
+char *iptablesrestore="/sbin/iptables-restore";  /* new */\r
 char *iptablesfile="/var/spool/prometheus.iptables";  /* new; file for iptables-restore*/\r
 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]";\r
 FILE *iptables_file=NULL;\r
@@ -72,7 +74,7 @@ char *cmdlog="/var/log/prometheus";    /* command log filename */
 char *credit="/var/run/prometheus.credit";  /* credit log file */\r
 int enable_credit=1;                   /* enable credit file */\r
 int use_credit=0;                      /* use credit file (if enabled)*/\r
-char *log_dir="/var/www/html/logs/";   /* log directory pathname */\r
+char *log_dir="/var/www/logs/";   /* log directory pathname */\r
 char *log_url="logs/";                 /* log directory URL prefix */\r
 char *title="Hall of Fame - Greatest Suckers"; /* hall of fame title */\r
 int hall_of_fame=1;                           /* enable hall of fame */\r
@@ -486,7 +488,7 @@ void get_traffic_statistics(void)
            else\r
             sscanf(ptr,"%Lu",&traffic); traffic+=(1<<19); traffic>>=20;\r
            break;\r
-   case 3: if(strncmp(ptr,"post_",5) && strncmp(ptr,"forw_",5) || commonflag)\r
+   case 3: if((strncmp(ptr,"post_",5) && strncmp(ptr,"forw_",5)) || commonflag)\r
             accept=eq(ptr,mark);\r
             /*if (filter_type==1) accept=eq(ptr,"MARK"); else accept=eq(ptr,"CLASSIFY");*/\r
            break;\r