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]
/
parsehosts.c
diff --git
a/parsehosts.c
b/parsehosts.c
index f356f165b76b9d21fcc36b3382e0aaf7d0eac947..cc2548f909dc040f04b82002bc5c2f38cb9abb09 100644
(file)
--- a/
parsehosts.c
+++ b/
parsehosts.c
@@
-13,7
+13,7
@@
extern struct Keyword *keyword, *defaultkeyword, *keywords;
extern struct Macro *macro, *macros;
\r
extern int class_count;
\r
extern int ip_count;
\r
extern struct Macro *macro, *macros;
\r
extern int class_count;
\r
extern int ip_count;
\r
-extern int found_
lmsid
;
\r
+extern int found_
code
;
\r
extern int free_min;
\r
extern const int highest_priority;
\r
extern char *ip6prefix;
\r
extern int free_min;
\r
extern const int highest_priority;
\r
extern char *ip6prefix;
\r
@@
-29,7
+29,7
@@
void TheIP(char *ipaddr, int is_network)
ip->addr = ipaddr;
\r
ip->sharing = NULL;
\r
ip->prio = highest_priority+1;
\r
ip->addr = ipaddr;
\r
ip->sharing = NULL;
\r
ip->prio = highest_priority+1;
\r
- ip->
lmsid = -1
;
\r
+ ip->
code = "-----"
;
\r
ip->fixedprio = \
\r
ip->aggregated = \
\r
ip->mark = \
\r
ip->fixedprio = \
\r
ip->aggregated = \
\r
ip->mark = \
\r
@@
-74,7
+74,7
@@
struct IP *lastIP6range, *lastIP6uplink;
void parse_and_append_ip(char *str, struct IP *listhead)
\r
{
\r
char *ptr, *ipaddr, *nextip6, *ip6buf;
\r
void parse_and_append_ip(char *str, struct IP *listhead)
\r
{
\r
char *ptr, *ipaddr, *nextip6, *ip6buf;
\r
- char *ip6uplink = NULL, *ip6range = NULL, *ipname = NULL, *
lmsid
= NULL;
\r
+ char *ip6uplink = NULL, *ip6range = NULL, *ipname = NULL, *
code
= NULL;
\r
\r
if(ip6prefix) /* Try this only if IPv6 subsystem is active... */
\r
{
\r
\r
if(ip6prefix) /* Try this only if IPv6 subsystem is active... */
\r
{
\r
@@
-105,7
+105,7
@@
void parse_and_append_ip(char *str, struct IP *listhead)
ptr = strchr(str, '{');
\r
if(ptr)
\r
{
\r
ptr = strchr(str, '{');
\r
if(ptr)
\r
{
\r
-
lmsid
= ++ptr;
\r
+
code
= ++ptr;
\r
while(*ptr and *ptr != '}')
\r
{
\r
ptr++;
\r
while(*ptr and *ptr != '}')
\r
{
\r
ptr++;
\r
@@
-144,9
+144,9
@@
void parse_and_append_ip(char *str, struct IP *listhead)
}
\r
ip->name = ip6range;
\r
ip->keyword = defaultkeyword; /* settings for default keyword */
\r
}
\r
ip->name = ip6range;
\r
ip->keyword = defaultkeyword; /* settings for default keyword */
\r
- if(
lmsid
)
\r
+ if(
code
)
\r
{
\r
{
\r
- ip->
lmsid = atoi(lmsid)
;
\r
+ ip->
code = code
;
\r
}
\r
lastIP6range = ip;
\r
}
\r
}
\r
lastIP6range = ip;
\r
}
\r
@@
-163,9
+163,9
@@
void parse_and_append_ip(char *str, struct IP *listhead)
TheIP(ip6uplink, FALSE); /* always new IP - more IPs in single uplink network */
\r
ip->name = ip6uplink;
\r
ip->keyword = defaultkeyword; /* settings for default keyword */
\r
TheIP(ip6uplink, FALSE); /* always new IP - more IPs in single uplink network */
\r
ip->name = ip6uplink;
\r
ip->keyword = defaultkeyword; /* settings for default keyword */
\r
- if(
lmsid
)
\r
+ if(
code
)
\r
{
\r
{
\r
- ip->
lmsid = atoi(lmsid)
;
\r
+ ip->
code = code
;
\r
}
\r
lastIP6uplink = ip;
\r
}
\r
}
\r
lastIP6uplink = ip;
\r
}
\r
@@
-180,10
+180,10
@@
void parse_and_append_ip(char *str, struct IP *listhead)
TheIP(ipaddr, (listhead==networks));
\r
}
\r
ip->name = ipname;
\r
TheIP(ipaddr, (listhead==networks));
\r
}
\r
ip->name = ipname;
\r
- if(
lmsid
)
\r
+ if(
code
)
\r
{
\r
{
\r
- ip->
lmsid = atoi(lmsid)
;
\r
- found_
lmsid
= TRUE;
\r
+ ip->
code = code
;
\r
+ found_
code
= TRUE;
\r
}
\r
}
\r
\r
}
\r
}
\r
\r
@@
-375,14
+375,17
@@
void parse_hosts(char *hosts)
}
\r
}
\r
\r
}
\r
}
\r
\r
- /* avg MTU bytes * 8 >> 10 = in bits, max is in kb/s */
\r
- pktratio = (ip->keyword->allowed_avgmtu*8) >> 10;
\r
- if(pktratio > 0)
\r
+ if(ip->keyword->allowed_avgmtu)
\r
{
\r
{
\r
- ip->pps_limit = ip->max/pktratio;
\r
- if(ip->pps_limit > 10000) /* this limit seems to be hardcoded in iptables */
\r
+ /* avg MTU bytes * 8 >> 10 = in bits, max is in kb/s */
\r
+ pktratio = (ip->keyword->allowed_avgmtu*8) >> 10;
\r
+ if(pktratio > 0)
\r
{
\r
{
\r
- ip->pps_limit = 0; /* do not apply packet limits */
\r
+ ip->pps_limit = ip->max/pktratio;
\r
+ if(ip->pps_limit > 10000) /* this limit seems to be hardcoded in iptables */
\r
+ {
\r
+ ip->pps_limit = 0; /* do not apply packet limits */
\r
+ }
\r
}
\r
}
\r
\r
}
\r
}
\r
\r
This page took
0.15979 seconds
and
4
git commands to generate.