X-Git-Url: http://git.onelab.eu/?p=ipfw.git;a=blobdiff_plain;f=dummynet%2Fip_fw2.c;h=d05fa7473d3548b00e7e38e4b0f2bbe902d253f7;hp=4c9b0a38d48312ad9713e7bd900ef2fa8a5360b7;hb=1f3693d89c1c88e895721e21751c354e74b99627;hpb=1a406635eb894da69f2435c4d3ae7517e3c5cd70 diff --git a/dummynet/ip_fw2.c b/dummynet/ip_fw2.c index 4c9b0a3..d05fa74 100644 --- a/dummynet/ip_fw2.c +++ b/dummynet/ip_fw2.c @@ -2022,7 +2022,7 @@ check_uidgid(ipfw_insn_u32 *insn, int proto, struct ifnet *oif, match = (ugp->fw_groups[1] == (uid_t)insn->d[0]); else if (insn->o.opcode == O_GID) match = (ugp->fw_groups[0] == (uid_t)insn->d[0]); - + return match; #else /* FreeBSD */ @@ -3201,8 +3201,8 @@ do { \ (ipfw_insn_limit *)cmd, args, tablearg)) { retval = IP_FW_DENY; /* was goto done; */ /* error/limit violation */ - l = 0; /* break the inner loop */ - done = 1; /* break the external loop */ + l = 0; /* break the inner loop */ + done = 1; /* break the external loop */ } match = 1; break; @@ -3235,8 +3235,8 @@ do { \ l = f->cmd_len - f->act_ofs; IPFW_DYN_UNLOCK(); /* previously was goto check_body; */ - cmdlen = 0; /* make null for() changes */ - match = 1; /* do not break to the external loop */ + cmdlen = 0; /* make null for() changes */ + match = 1; /* do not break to the external loop */ break; } /* @@ -3252,8 +3252,8 @@ do { \ case O_ACCEPT: retval = 0; /* accept */ /* was goto done; */ - l = 0; /* break the inner loop */ - done = 1; /* break the external loop */ + l = 0; /* break the inner loop */ + done = 1; /* break the external loop */ break; case O_PIPE: @@ -3265,8 +3265,8 @@ do { \ args->cookie = cmd->arg1; retval = IP_FW_DUMMYNET; /* was goto done; */ - l = 0; /* break the inner loop */ - done = 1; /* break the external loop */ + l = 0; /* break the inner loop */ + done = 1; /* break the external loop */ break; #if 0 @@ -3295,8 +3295,8 @@ do { \ retval = (cmd->opcode == O_DIVERT) ? IP_FW_DIVERT : IP_FW_TEE; /* was goto done; */ - l = 0; /* break the inner loop */ - done = 1; /* break the external loop */ + l = 0; /* break the inner loop */ + done = 1; /* break the external loop */ break; } #endif @@ -3308,8 +3308,8 @@ do { \ f->timestamp = time_uptime; if (cmd->opcode == O_COUNT) { /* was goto next_rule; */ - l = 0; /* exit the inner loop */ - match = 1; /* do not break the loop */ + l = 0; /* exit the inner loop */ + match = 1; /* do not break the loop */ break; } /* handle skipto */ @@ -3330,15 +3330,15 @@ do { \ while (f && (set_disable & (1 << f->set))) f = f->next; /* prepare to re-enter the inner loop. */ - if (f) { /* better safe than sorry */ + if (f) { /* better safe than sorry */ l = f->cmd_len; cmd = f->cmd; } else { - l = 0; /* this will break the inner loop */ + l = 0; /* this will break the inner loop */ } - cmdlen = 0; /* reset loop condition */ + cmdlen = 0; /* reset loop condition */ skip_or = 0; - match = 1; /* do not break the loop */ + match = 1; /* do not break the loop */ break; case O_REJECT: @@ -3374,8 +3374,8 @@ do { \ case O_DENY: retval = IP_FW_DENY; /* goto done; */ - l = 0; /* break the inner loop */ - done = 1; /* break the external loop */ + l = 0; /* break the inner loop */ + done = 1; /* break the external loop */ break; case O_FORWARD_IP: { @@ -3396,11 +3396,11 @@ do { \ } } retval = IP_FW_PASS; - } - /* goto done; */ - l = 0; /* break the inner loop */ - done = 1; /* break the external loop */ - break; + } + /* goto done; */ + l = 0; /* break the inner loop */ + done = 1; /* break the external loop */ + break; case O_NETGRAPH: case O_NGTEE: @@ -3412,8 +3412,8 @@ do { \ retval = (cmd->opcode == O_NETGRAPH) ? IP_FW_NETGRAPH : IP_FW_NGTEE; /* goto done; */ - l = 0; /* break the inner loop */ - done = 1; /* break the external loop */ + l = 0; /* break the inner loop */ + done = 1; /* break the external loop */ break; #if 0 @@ -3442,8 +3442,8 @@ do { \ if (t == NULL) { retval = IP_FW_DENY; /* goto done; */ - l = 0; /* break the inner loop */ - done = 1; /* break the external loop */ + l = 0; /* break the inner loop */ + done = 1; /* break the external loop */ break; } if (cmd->arg1 != IP_FW_TABLEARG) @@ -3453,8 +3453,8 @@ do { \ } else retval = IP_FW_DENY; /* goto done; */ - l = 0; /* break the inner loop */ - done = 1; /* break the external loop */ + l = 0; /* break the inner loop */ + done = 1; /* break the external loop */ break; } #endif @@ -3480,7 +3480,7 @@ do { \ if (done) break; -/* next_rule:; */ /* try next rule */ +/* next_rule:; */ /* try next rule */ } /* end of outer for, scan rules */ if (done) { @@ -4209,7 +4209,7 @@ ipfw_getrules(struct ip_fw_chain *chain, void *buf, size_t space) int i; time_t boot_seconds; - boot_seconds = boottime.tv_sec; + boot_seconds = boottime.tv_sec; /* XXX this can take a long time and locking will block packet flow */ IPFW_RLOCK(chain); @@ -4252,7 +4252,7 @@ ipfw_getdynrules(struct ip_fw_chain *chain, void *buf, size_t space) char *bp = buf; char *ep = bp + space; int i; - time_t boot_seconds; + time_t boot_seconds; printf("dynrules requested\n"); boot_seconds = boottime.tv_sec; @@ -4290,7 +4290,7 @@ ipfw_getdynrules(struct ip_fw_chain *chain, void *buf, size_t space) 0 : dst->expire - time_uptime ; bp += sizeof(ipfw_dyn_rule); } else { - p = NULL; /* break the loop */ + p = NULL; /* break the loop */ i = curr_dyn_buckets; } }