Changeset 779

Timestamp:

01/12/10 22:21:32 (2 months ago)

Author:

DmitryChemerik

Message:

Исправлен баг, при определенных условиях влияющий на точность подсчета трафика пользователей

Location:

branches/1.1.x

Files:

• demon.c (modified) (1 diff)
• logtool.c (modified) (1 diff)

branches/1.1.x/demon.c

@@ -328 +328 @@
                           }
                         if(DEBUG!=0)
-                          printf("user %s/%s, ip=%d.%d.%d.%d  traffic: %.0f+%.0f=%.0f  limit:%.0f\n",users[samsuser-1].domain,users[samsuser-1].user,users[samsuser-1].ip[0],users[samsuser-1].ip[1],users[samsuser-1].ip[2],users[samsuser-1].ip[3],size,users[samsuser-1].traffic,size+users[samsuser-1].traffic,users[samsuser-1].quote);
+                           printf("user %s/%s, ip=%d.%d.%d.%d  traffic: %.0f+%.0f=%.0f  limit:%.0f\n",users[samsuser-1].domain,users[samsuser-1].user,users[samsuser-1].ip[0],users[samsuser-1].ip[1],users[samsuser-1].ip[2],users[samsuser-1].ip[3],size,users[samsuser-1].traffic-size,users[samsuser-1].traffic,users[samsuser-1].quote);
 
                         ReplaceURL(STR[6],user,domain);

branches/1.1.x/logtool.c

@@ -123 +123 @@
     }  
 //  if((int)str[10]!=0x2E && (int)str[14]!=0x20 && (int)str[21]!=0x20)
-  if((int)str[10]!=0x2E || (int)str[14]!=0x20 || (int)str[21]!=0x20)
+  if( (int)str[10]!=0x2E || (int)str[14]!=0x20 || ( (int)str[21]!=0x20 && (int)str[22]!=0x20 && (int)str[23]!=0x20 && (int)str[24]!=0x20  ) )
     {
       if(DEBUG>0)