version 1.7, 2022/08/03 17:07:07
|
version 1.9, 2022/08/10 00:03:50
|
Line 6
|
Line 6
|
|
|
|
|
static int |
static int |
fwsync_add_state_4(struct ipfw_flow_id *fid, u_int ruleid, u_short rulenum) | fwsync_add_state_4(struct ipfw_flow_id *fid, u_int ruleid, u_short rulenum, |
| u_short kidx, u_char cmdtype) |
{ |
{ |
struct ip_fw *rule = NULL; |
struct ip_fw *rule = NULL; |
struct ip_fw_args args; |
|
struct ipfw_dyn_info info; |
|
ipfw_insn cmd; |
|
|
|
DTRACE(); |
DTRACE(); |
|
|
memset(&cmd, 0, sizeof cmd); | return ipfw_dyn_install_sync_state(fid, rule, ruleid, rulenum, kidx, cmdtype); |
cmd.opcode = O_KEEP_STATE; | |
memset(&info, 0, sizeof info); | |
memset(&args, 0, sizeof args); | |
memcpy(&args.f_id, fid, sizeof args.f_id); | |
| |
rule = ipfw_dyn_lookup_state(&args, NULL, 0, &cmd, &info); | |
return ipfw_dyn_install_sync_state(fid, rule, ruleid, rulenum); | |
} |
} |
|
|
static int |
static int |
fwsync_add_state_6(struct ipfw_flow_id *fid, u_int ruleid, u_short rulenum) | fwsync_add_state_6(struct ipfw_flow_id *fid, u_int ruleid, u_short rulenum, |
| u_short kidx, u_char cmdtype) |
{ |
{ |
DTRACE(); |
DTRACE(); |
|
|
Line 36 fwsync_add_state_6(struct ipfw_flow_id *fid, u_int rul
|
Line 28 fwsync_add_state_6(struct ipfw_flow_id *fid, u_int rul
|
int |
int |
fwsync_add_state(const struct fws_proto *pkt) |
fwsync_add_state(const struct fws_proto *pkt) |
{ |
{ |
struct ipfw_flow_id fid; | struct fws_sndpkt *p; |
|
|
DTRACE(); |
DTRACE(); |
|
|
memset(&fid, 0, sizeof fid); | if (!pkt || pkt->fws_addrtype == 1) |
fid.fib = pkt->fws_fib; | return 0; /* skip ethernet packet */ |
fid.proto = pkt->fws_proto; | |
fid.addr_type = pkt->fws_addrtype; | |
fid.src_port = pkt->fws_sport; | |
fid.dst_port = pkt->fws_dport; | |
switch (pkt->fws_addrtype) { | |
case 4: | |
fid.src_ip = pkt->fws_saddr.s_addr; | |
fid.dst_ip = pkt->fws_daddr.s_addr; | |
break; | |
case 6: | |
memcpy(&fid.src_ip6, &pkt->fws_saddr6, sizeof fid.src_ip6); | |
memcpy(&fid.dst_ip6, &pkt->fws_daddr6, sizeof fid.dst_ip6); | |
fid.flow_id6 = pkt->fws_scopeid; | |
break; | |
default: | |
return EINVAL; | |
} | |
|
|
if (pkt->fws_addrtype == 4) | p = malloc(sizeof(struct fws_sndpkt), M_FWSYNC, M_NOWAIT | M_ZERO); |
fwsync_add_state_4(&fid, pkt->fws_ruleid, pkt->fws_rulenum); | if (!p) { |
else if (pkt->fws_addrtype == 6) | return ENOMEM; |
fwsync_add_state_6(&fid, pkt->fws_ruleid, pkt->fws_rulenum); | } else |
else | memcpy(&p->sp_proto, pkt, sizeof(struct fws_proto)); |
return EINVAL; | |
|
|
|
mtx_lock(&fws_mtx_u); |
|
TAILQ_INSERT_TAIL(&fwsync_updpkt, p, sp_next); |
|
mtx_unlock(&fws_mtx_u); |
return 0; |
return 0; |
} |
} |
|
|
|
|
int |
int |
fwsync_add_alias(const struct fws_proto *pkt) |
fwsync_add_alias(const struct fws_proto *pkt) |
{ |
{ |
Line 88 fwsync_sndpkt_handler(void *context, int pending)
|
Line 66 fwsync_sndpkt_handler(void *context, int pending)
|
|
|
DTRACE(); |
DTRACE(); |
|
|
printf("pending=%d\n", pending); |
|
|
|
do { |
do { |
mtx_lock(&fws_mtx_c); |
mtx_lock(&fws_mtx_c); |
pkt = TAILQ_FIRST(&fwsync_sndpkt); |
pkt = TAILQ_FIRST(&fwsync_sndpkt); |
Line 172 fwsync_state_handler(const void *arg, const void *extd
|
Line 148 fwsync_state_handler(const void *arg, const void *extd
|
|
|
spkt->fws_version = FWS_PKTVER_STATE; |
spkt->fws_version = FWS_PKTVER_STATE; |
spkt->fws_fib = pkt->fib; |
spkt->fws_fib = pkt->fib; |
|
spkt->fws_cmdtype = edata->cmdtype; |
|
spkt->fws_kidx = edata->kidx; |
spkt->fws_ruleid = edata->ruleid; |
spkt->fws_ruleid = edata->ruleid; |
spkt->fws_rulenum = edata->rulenum; |
spkt->fws_rulenum = edata->rulenum; |
spkt->fws_proto = pkt->proto; |
spkt->fws_proto = pkt->proto; |
Line 242 fwsync_alias_handler(const void *arg, const void *extd
|
Line 220 fwsync_alias_handler(const void *arg, const void *extd
|
mtx_unlock(&fws_mtx_c); |
mtx_unlock(&fws_mtx_c); |
|
|
taskqueue_enqueue(fws_tq, &fws_sndpkt_task); |
taskqueue_enqueue(fws_tq, &fws_sndpkt_task); |
|
return 0; |
|
} |
|
|
|
int |
|
fwsync_state_sync(const void *arg, const void *extdata) |
|
{ |
|
struct fws_sndpkt *pkt; |
|
struct ipfw_flow_id fid; |
|
|
|
DTRACE(); |
|
|
|
mtx_lock(&fws_mtx_u); |
|
pkt = TAILQ_FIRST(&fwsync_updpkt); |
|
if (pkt) |
|
TAILQ_REMOVE(&fwsync_updpkt, pkt, sp_next); |
|
mtx_unlock(&fws_mtx_u); |
|
|
|
if (!pkt) /* update queue is empty */ |
|
return 0; |
|
|
|
if (!(fws_cfg.cfg.on & CFG_SYNC_EDGE)) { |
|
free(pkt, M_FWSYNC); |
|
return EAGAIN; |
|
} |
|
|
|
memset(&fid, 0, sizeof fid); |
|
fid.fib = pkt->sp_proto.fws_fib; |
|
fid.proto = pkt->sp_proto.fws_proto; |
|
fid.addr_type = pkt->sp_proto.fws_addrtype; |
|
fid.src_port = pkt->sp_proto.fws_sport; |
|
fid.dst_port = pkt->sp_proto.fws_dport; |
|
switch (pkt->sp_proto.fws_addrtype) { |
|
case 4: |
|
fid.src_ip = pkt->sp_proto.fws_saddr.s_addr; |
|
fid.dst_ip = pkt->sp_proto.fws_daddr.s_addr; |
|
break; |
|
case 6: |
|
memcpy(&fid.src_ip6, &pkt->sp_proto.fws_saddr6, sizeof fid.src_ip6); |
|
memcpy(&fid.dst_ip6, &pkt->sp_proto.fws_daddr6, sizeof fid.dst_ip6); |
|
fid.flow_id6 = pkt->sp_proto.fws_scopeid; |
|
break; |
|
default: |
|
free(pkt, M_FWSYNC); |
|
return EINVAL; |
|
} |
|
|
|
if (pkt->sp_proto.fws_addrtype == 4) |
|
fwsync_add_state_4(&fid, pkt->sp_proto.fws_ruleid, pkt->sp_proto.fws_rulenum, |
|
pkt->sp_proto.fws_kidx, pkt->sp_proto.fws_cmdtype); |
|
else if (pkt->sp_proto.fws_addrtype == 6) |
|
fwsync_add_state_6(&fid, pkt->sp_proto.fws_ruleid, pkt->sp_proto.fws_rulenum, |
|
pkt->sp_proto.fws_kidx, pkt->sp_proto.fws_cmdtype); |
|
|
|
free(pkt, M_FWSYNC); |
return 0; |
return 0; |
} |
} |