GIT.Harvie.CZ
/
svn
/
Prometheus-QoS
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lmsid -> code
[svn/Prometheus-QoS/.git]
/
htmlandlogs.c
diff --git
a/htmlandlogs.c
b/htmlandlogs.c
index 798544db52b6e0480dbe4166625c5cb3228057fb..431d044bf3d36fb53ada3ae48340152c5744c613 100644
(file)
--- a/
htmlandlogs.c
+++ b/
htmlandlogs.c
@@
-18,7
+18,7
@@
extern int dry_run;
extern int qos_proxy;
\r
extern char *title;
\r
extern char *log_url;
\r
extern int qos_proxy;
\r
extern char *title;
\r
extern char *log_url;
\r
-extern int found_
lmsid
;
\r
+extern int found_
code
;
\r
extern char *lms_url;
\r
extern char *log_dir;
\r
extern char *ip6prefix;
\r
extern char *lms_url;
\r
extern char *log_dir;
\r
extern char *ip6prefix;
\r
@@
-42,9
+42,9
@@
void append_log(struct IP *self) /*using global variables*/
f = fopen(str, "a");
\r
if(f > 0)
\r
{
\r
f = fopen(str, "a");
\r
if(f > 0)
\r
{
\r
- fprintf(f, "%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%
d
\t%s",
\r
+ fprintf(f, "%ld\t%s\t%Lu\t%Lu\t%Lu\t%Lu\t%d\t%d\t%d\t%
s
\t%s",
\r
time(NULL), self->name, self->traffic, self->direct, self->proxy,
\r
time(NULL), self->name, self->traffic, self->direct, self->proxy,
\r
- self->upload, self->min, self->max, self->desired, self->
lmsid
, d); /* d = date*/
\r
+ self->upload, self->min, self->max, self->desired, self->
code
, d); /* d = date*/
\r
fclose(f);
\r
}
\r
else
\r
fclose(f);
\r
}
\r
else
\r
@@
-125,7
+125,7
@@
void write_htmlandlogs(char *html, char *d, int total, int just_preview)
i=0;
\r
if(f > 0)
\r
{
\r
i=0;
\r
if(f > 0)
\r
{
\r
- unsigned long long total_traffic
=0
, total_direct=0, total_proxy=0, total_upload=0, tmp_sum = 0;
\r
+ unsigned long long total_traffic
= 1 /* prevent divide by zero */
, total_direct=0, total_proxy=0, total_upload=0, tmp_sum = 0;
\r
unsigned long long total_pktup = 0, total_pktdown = 0;
\r
int active_classes = 0;
\r
// int colspan = 14;
\r
unsigned long long total_pktup = 0, total_pktdown = 0;
\r
int active_classes = 0;
\r
// int colspan = 14;
\r
@@
-133,7
+133,7
@@
void write_htmlandlogs(char *html, char *d, int total, int just_preview)
int agreg_count = 0, limit_count = 0, prio_count = 0;
\r
int popup_button = 0;
\r
/* IPv6 vs. IPv4 stats */
\r
int agreg_count = 0, limit_count = 0, prio_count = 0;
\r
int popup_button = 0;
\r
/* IPv6 vs. IPv4 stats */
\r
- unsigned long long pkts4 =
0, pkts6 = 0
, bytes4 = 0, bytes6 = 0;
\r
+ unsigned long long pkts4 =
1, pkts6 = 1 /*prevent divide by zero */
, bytes4 = 0, bytes6 = 0;
\r
int count4 = 0, count6 = 0;
\r
int mpkts;
\r
double perc6;
\r
int count4 = 0, count6 = 0;
\r
int mpkts;
\r
double perc6;
\r
@@
-255,15
+255,15
@@
style=\"cursor: pointer;\">+%d</a>]</span>",
fputs("</td>\n",f);
\r
/* ----------------------------------------------- */
\r
\r
fputs("</td>\n",f);
\r
/* ----------------------------------------------- */
\r
\r
- if(found_
lmsid
)
\r
+ if(found_
code
)
\r
{
\r
fputs("<td style=\"text-align: right\">",f);
\r
{
\r
fputs("<td style=\"text-align: right\">",f);
\r
- if(ip->
lmsid > 0
)
\r
+ if(ip->
code[0]
)
\r
{
\r
{
\r
- fprintf(f, "<a class=\"blue\" target=\"_blank\" href=\"%s%
d\">%04d
</a>\n",
\r
- lms_url, ip->
lmsid, ip->lmsid
);
\r
+ fprintf(f, "<a class=\"blue\" target=\"_blank\" href=\"%s%
s\">%s
</a>\n",
\r
+ lms_url, ip->
code, ip->code
);
\r
}
\r
}
\r
- else if(ip->
lmsid
== 0)
\r
+ else if(ip->
code[0]
== 0)
\r
{
\r
fputs("------",f);
\r
}
\r
{
\r
fputs("------",f);
\r
}
\r
This page took
0.145461 seconds
and
4
git commands to generate.