From: xchaos <xchaos@251d49ef-1d17-4917-a970-b30cf55b089b>
Date: Tue, 12 Aug 2014 18:15:33 +0000 (+0000)
Subject: versioning
X-Git-Url: https://git.harvie.cz/?a=commitdiff_plain;h=f71cfa3b3f9d842ff69cc94e8c546583f61ad19e;p=svn%2FPrometheus-QoS%2F.git

versioning



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

diff --git a/prometheus.c b/prometheus.c
index 252c083..49fa5e2 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-2013 Michael Polak, Arachne Aerospace     */
+/* Copyright(C) 2005-2014 Michael Polak, Arachne Aerospace     */
 /* iptables-restore support Copyright(C) 2007-2008 ludva       */
 /* Credit: CZFree.Net,Martin Devera,Netdave,Aquarius,Gandalf  */
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-/* Modified by: xChaos, 20131126
+/* Modified by: xChaos, 20140812
                  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.8.5-a";
+const char *version = "0.8.5-b";
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 /* Versions: 0.8.3 is development release, 0.8.4 will be "stable"  */
@@ -40,7 +40,7 @@ const char *version = "0.8.5-a";
 /* Warning: unofficial Github mirror is not supported by author!  */
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
-const char *stats_html_signature = "<span class=\"small\">Statistics generated by Prometheus QoS version %s<br />GPL+Copyright(C)2005-2013 Michael Polak, <a target=\"_blank\" href=\"http://www.arachne.cz/\">Arachne Labs</a></span>\n";
+const char *stats_html_signature = "<span class=\"small\">Statistics generated by Prometheus QoS version %s<br />GPL+Copyright(C)2005-2014 Michael Polak, <a target=\"_blank\" href=\"http://www.arachne.cz/\">Arachne Labs</a></span>\n";
 
 #define STRLEN 512
 #undef DEBUG
@@ -999,8 +999,7 @@ Credit: CZFree.Net, Martin Devera, Netdave, Aquarius, Gandalf\n\n",version);
      {
       if(    ip->keyword->data_prio 
           && !ip->fixedprio 
-          && (   ip->traffic>ip->credit
-               + (ip->min*ip->keyword->data_prio+(ip->keyword->fixed_prio<<20))) )
+          && (   ip->traffic >   ip->credit + (ip->min*ip->keyword->data_prio+(ip->keyword->fixed_prio<<20))) )
       {
        ip->prio=priority_sequence--;
        if(ip->prio<highest_priority+1)