mirror of
https://github.com/bol-van/zapret.git
synced 2025-05-24 22:32:58 +03:00
fix compiler warnings: -Wparentheses
This commit is contained in:
@@ -249,7 +249,7 @@ static bool ConntrackPoolFeedPool(t_conntrack_pool **pp, const struct ip *ip, co
|
||||
}
|
||||
}
|
||||
b_rev = tcphdr && tcp_synack_segment(tcphdr);
|
||||
if (tcphdr && tcp_syn_segment(tcphdr) || b_rev || udphdr)
|
||||
if ((tcphdr && tcp_syn_segment(tcphdr)) || b_rev || udphdr)
|
||||
{
|
||||
if ((ctr=ConntrackNew(pp, b_rev ? &connswp : &conn)))
|
||||
{
|
||||
@@ -297,12 +297,12 @@ void ConntrackPoolPurge(t_conntrack *p)
|
||||
HASH_ITER(hh, p->pool , t, tmp) {
|
||||
tidle = tnow - t->track.t_last;
|
||||
if ( t->track.b_cutoff ||
|
||||
t->conn.l4proto==IPPROTO_TCP && (
|
||||
t->track.state==SYN && tidle>=p->timeout_syn ||
|
||||
t->track.state==ESTABLISHED && tidle>=p->timeout_established ||
|
||||
t->track.state==FIN && tidle>=p->timeout_fin) ||
|
||||
t->conn.l4proto==IPPROTO_UDP &&
|
||||
tidle>=p->timeout_udp)
|
||||
(t->conn.l4proto==IPPROTO_TCP && (
|
||||
(t->track.state==SYN && tidle>=p->timeout_syn) ||
|
||||
(t->track.state==ESTABLISHED && tidle>=p->timeout_established) ||
|
||||
(t->track.state==FIN && tidle>=p->timeout_fin))
|
||||
) || (t->conn.l4proto==IPPROTO_UDP && tidle>=p->timeout_udp)
|
||||
)
|
||||
{
|
||||
HASH_DEL(p->pool, t); ConntrackFreeElem(t);
|
||||
}
|
||||
|
@@ -239,7 +239,7 @@ void phton64(uint8_t *p, uint64_t v)
|
||||
|
||||
bool seq_within(uint32_t s, uint32_t s1, uint32_t s2)
|
||||
{
|
||||
return s2>=s1 && s>=s1 && s<=s2 || s2<s1 && (s<=s2 || s>=s1);
|
||||
return (s2>=s1 && s>=s1 && s<=s2) || (s2<s1 && (s<=s2 || s>=s1));
|
||||
}
|
||||
|
||||
bool ipv6_addr_is_zero(const struct in6_addr *a)
|
||||
@@ -313,7 +313,7 @@ time_t file_mod_time(const char *filename)
|
||||
|
||||
bool pf_in_range(uint16_t port, const port_filter *pf)
|
||||
{
|
||||
return port && ((!pf->from && !pf->to || port>=pf->from && port<=pf->to) ^ pf->neg);
|
||||
return port && (((!pf->from && !pf->to) || (port>=pf->from && port<=pf->to)) ^ pf->neg);
|
||||
}
|
||||
bool pf_parse(const char *s, port_filter *pf)
|
||||
{
|
||||
|
@@ -579,7 +579,7 @@ static bool parse_cutoff(const char *opt, unsigned int *value, char *mode)
|
||||
}
|
||||
static bool parse_badseq_increment(const char *opt, uint32_t *value)
|
||||
{
|
||||
if ((opt[0]=='0' && opt[1]=='x' || opt[0]=='-' && opt[1]=='0' && opt[2]=='x') && sscanf(opt+2+(opt[0]=='-'), "%X", (int32_t*)value)>0)
|
||||
if (((opt[0]=='0' && opt[1]=='x') || (opt[0]=='-' && opt[1]=='0' && opt[2]=='x')) && sscanf(opt+2+(opt[0]=='-'), "%X", (int32_t*)value)>0)
|
||||
{
|
||||
if (opt[0]=='-') params.desync_badseq_increment = -params.desync_badseq_increment;
|
||||
return true;
|
||||
@@ -621,10 +621,10 @@ bool parse_autottl(const char *s, autottl *t)
|
||||
switch (sscanf(s,"%u:%u-%u",&delta,&min,&max))
|
||||
{
|
||||
case 3:
|
||||
if (delta && !max || max>255) return false;
|
||||
if ((delta && !max) || max>255) return false;
|
||||
t->max=(uint8_t)max;
|
||||
case 2:
|
||||
if (delta && !min || min>255 || min>max) return false;
|
||||
if ((delta && !min) || min>255 || min>max) return false;
|
||||
t->min=(uint8_t)min;
|
||||
case 1:
|
||||
if (delta>255) return false;
|
||||
|
@@ -104,7 +104,7 @@ bool HttpReplyLooksLikeDPIRedirect(const uint8_t *data, size_t len, const char *
|
||||
|
||||
code = HttpReplyCode(data,len);
|
||||
|
||||
if (code!=302 && code!=307 || !HttpExtractHeader(data,len,"\nLocation:",loc,sizeof(loc))) return false;
|
||||
if ((code!=302 && code!=307) || !HttpExtractHeader(data,len,"\nLocation:",loc,sizeof(loc))) return false;
|
||||
|
||||
// something like : https://censor.net/badpage.php?reason=denied&source=RKN
|
||||
|
||||
|
Reference in New Issue
Block a user