d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lookup_dyn_rule_locked(): style(9) cleanup

Browse Source 
MFC after:	1 month
This commit is contained in:
Oleg Bulyzhin 2012-02-28 21:53:39 +00:00
parent ac382cb7f1
commit 8ac1bb0495
1 changed files with 62 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
sys/netinet/ipfw/ip_fw_dynamic.c
View File

@ -390,72 +390,68 @@ ipfw_remove_dyn_children(struct ip_fw *rule)
IPFW_DYN_UNLOCK(); IPFW_DYN_UNLOCK();
} }
/** /*
* lookup a dynamic rule, locked version * Lookup a dynamic rule, locked version.
*/ */
static ipfw_dyn_rule * static ipfw_dyn_rule *
lookup_dyn_rule_locked(struct ipfw_flow_id *pkt, int *match_direction, lookup_dyn_rule_locked(struct ipfw_flow_id *pkt, int *match_direction,
struct tcphdr *tcp) struct tcphdr *tcp)
{ {
/* /*
* stateful ipfw extensions. * Stateful ipfw extensions.
* Lookup into dynamic session queue * Lookup into dynamic session queue.
*/ */
#define MATCH_REVERSE 0 #define MATCH_REVERSE 0
#define MATCH_FORWARD 1 #define MATCH_FORWARD 1
#define MATCH_NONE 2 #define MATCH_NONE 2
#define MATCH_UNKNOWN 3 #define MATCH_UNKNOWN 3
int i, dir = MATCH_NONE; int i, dir = MATCH_NONE;
ipfw_dyn_rule *prev, *q=NULL; ipfw_dyn_rule *prev, *q = NULL;
IPFW_DYN_LOCK_ASSERT(); IPFW_DYN_LOCK_ASSERT();
if (V_ipfw_dyn_v == NULL) if (V_ipfw_dyn_v == NULL)
goto done; /* not found */ goto done; /* not found */
i = hash_packet( pkt ); i = hash_packet(pkt);
for (prev=NULL, q = V_ipfw_dyn_v[i] ; q != NULL ; ) { for (prev = NULL, q = V_ipfw_dyn_v[i]; q != NULL;) {
if (q->dyn_type == O_LIMIT_PARENT && q->count) if (q->dyn_type == O_LIMIT_PARENT && q->count)
goto next; goto next;
if (TIME_LEQ( q->expire, time_uptime)) { /* expire entry */ if (TIME_LEQ(q->expire, time_uptime)) { /* expire entry */
UNLINK_DYN_RULE(prev, V_ipfw_dyn_v[i], q); UNLINK_DYN_RULE(prev, V_ipfw_dyn_v[i], q);
continue; continue;
} }
if (pkt->proto == q->id.proto && if (pkt->proto != q->id.proto || q->dyn_type == O_LIMIT_PARENT)
q->dyn_type != O_LIMIT_PARENT) { goto next;
if (IS_IP6_FLOW_ID(pkt)) {
if (IN6_ARE_ADDR_EQUAL(&(pkt->src_ip6), if (IS_IP6_FLOW_ID(pkt)) {
&(q->id.src_ip6)) && if (IN6_ARE_ADDR_EQUAL(&pkt->src_ip6, &q->id.src_ip6) &&
IN6_ARE_ADDR_EQUAL(&(pkt->dst_ip6), IN6_ARE_ADDR_EQUAL(&pkt->dst_ip6, &q->id.dst_ip6) &&
&(q->id.dst_ip6)) &&
pkt->src_port == q->id.src_port && pkt->src_port == q->id.src_port &&
pkt->dst_port == q->id.dst_port ) { pkt->dst_port == q->id.dst_port) {
dir = MATCH_FORWARD; dir = MATCH_FORWARD;
break; break;
} }
if (IN6_ARE_ADDR_EQUAL(&(pkt->src_ip6), if (IN6_ARE_ADDR_EQUAL(&pkt->src_ip6, &q->id.dst_ip6) &&
&(q->id.dst_ip6)) && IN6_ARE_ADDR_EQUAL(&pkt->dst_ip6, &q->id.src_ip6) &&
IN6_ARE_ADDR_EQUAL(&(pkt->dst_ip6), pkt->src_port == q->id.dst_port &&
&(q->id.src_ip6)) && pkt->dst_port == q->id.src_port) {
pkt->src_port == q->id.dst_port && dir = MATCH_REVERSE;
pkt->dst_port == q->id.src_port ) { break;
dir = MATCH_REVERSE; }
break; } else {
} if (pkt->src_ip == q->id.src_ip &&
} else { pkt->dst_ip == q->id.dst_ip &&
if (pkt->src_ip == q->id.src_ip && pkt->src_port == q->id.src_port &&
pkt->dst_ip == q->id.dst_ip && pkt->dst_port == q->id.dst_port) {
pkt->src_port == q->id.src_port && dir = MATCH_FORWARD;
pkt->dst_port == q->id.dst_port ) { break;
dir = MATCH_FORWARD; }
break; if (pkt->src_ip == q->id.dst_ip &&
} pkt->dst_ip == q->id.src_ip &&
if (pkt->src_ip == q->id.dst_ip && pkt->src_port == q->id.dst_port &&
pkt->dst_ip == q->id.src_ip && pkt->dst_port == q->id.src_port) {
pkt->src_port == q->id.dst_port && dir = MATCH_REVERSE;
pkt->dst_port == q->id.src_port ) { break;
dir = MATCH_REVERSE;
break;
}
} }
} }
next: next:
@ -463,43 +459,45 @@ lookup_dyn_rule_locked(struct ipfw_flow_id *pkt, int *match_direction,
q = q->next; q = q->next;
} }
if (q == NULL) if (q == NULL)
goto done; /* q = NULL, not found */ goto done; /* q = NULL, not found */
if ( prev != NULL) { /* found and not in front */ if (prev != NULL) { /* found and not in front */
prev->next = q->next; prev->next = q->next;
q->next = V_ipfw_dyn_v[i]; q->next = V_ipfw_dyn_v[i];
V_ipfw_dyn_v[i] = q; V_ipfw_dyn_v[i] = q;
} }
if (pkt->proto == IPPROTO_TCP) { /* update state according to flags */ if (pkt->proto == IPPROTO_TCP) { /* update state according to flags */
u_char flags = pkt->_flags & (TH_FIN|TH_SYN|TH_RST); uint32_t ack;
u_char flags = pkt->_flags & (TH_FIN | TH_SYN | TH_RST);
#define BOTH_SYN (TH_SYN | (TH_SYN << 8)) #define BOTH_SYN (TH_SYN | (TH_SYN << 8))
#define BOTH_FIN (TH_FIN | (TH_FIN << 8)) #define BOTH_FIN (TH_FIN | (TH_FIN << 8))
q->state |= (dir == MATCH_FORWARD ) ? flags : (flags << 8); q->state |= (dir == MATCH_FORWARD) ? flags : (flags << 8);
switch (q->state) { switch (q->state) {
case TH_SYN: /* opening */ case TH_SYN: /* opening */
q->expire = time_uptime + V_dyn_syn_lifetime; q->expire = time_uptime + V_dyn_syn_lifetime;
break; break;
case BOTH_SYN: /* move to established */ case BOTH_SYN: /* move to established */
case BOTH_SYN | TH_FIN : /* one side tries to close */ case BOTH_SYN | TH_FIN: /* one side tries to close */
case BOTH_SYN | (TH_FIN << 8) : case BOTH_SYN | (TH_FIN << 8):
if (tcp) {
#define _SEQ_GE(a,b) ((int)(a) - (int)(b) >= 0) #define _SEQ_GE(a,b) ((int)(a) - (int)(b) >= 0)
u_int32_t ack = ntohl(tcp->th_ack); if (tcp == NULL) {
if (dir == MATCH_FORWARD) { q->expire = time_uptime + V_dyn_ack_lifetime;
break;
}
ack = ntohl(tcp->th_ack);
if (dir == MATCH_FORWARD) {
if (q->ack_fwd == 0 || _SEQ_GE(ack, q->ack_fwd)) if (q->ack_fwd == 0 || _SEQ_GE(ack, q->ack_fwd))
q->ack_fwd = ack; q->ack_fwd = ack;
else { /* ignore out-of-sequence */ else /* ignore out-of-sequence */
break; break;
} } else {
} else {
if (q->ack_rev == 0 || _SEQ_GE(ack, q->ack_rev)) if (q->ack_rev == 0 || _SEQ_GE(ack, q->ack_rev))
q->ack_rev = ack; q->ack_rev = ack;
else { /* ignore out-of-sequence */ else /* ignore out-of-sequence */
break; break;
}
}
} }
q->expire = time_uptime + V_dyn_ack_lifetime; q->expire = time_uptime + V_dyn_ack_lifetime;
break; break;
@ -531,9 +529,9 @@ lookup_dyn_rule_locked(struct ipfw_flow_id *pkt, int *match_direction,
q->expire = time_uptime + V_dyn_short_lifetime; q->expire = time_uptime + V_dyn_short_lifetime;
} }
done: done:
if (match_direction) if (match_direction != NULL)
*match_direction = dir; *match_direction = dir;
return q; return (q);
} }
ipfw_dyn_rule * ipfw_dyn_rule *