fwsync/driver/fwsync.c - diff

Return to fwsync.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / fwsync / driver

Diff for /fwsync/driver/fwsync.c between versions 1.7 and 1.8

version 1.7, 2022/08/04 00:24:39	version 1.8, 2022/08/10 00:03:49
Line 33 fwsync_edge_proc(void *arg)	Line 33 fwsync_edge_proc(void *arg)
if (m_length(m, NULL) != sizeof(struct fws_proto)) {	if (m_length(m, NULL) != sizeof(struct fws_proto)) {
printf("FWSync packet length=%d isn't match expected %lu\n",	printf("FWSync packet length=%d isn't match expected %lu\n",
m_length(m, NULL), sizeof(struct fws_proto));	m_length(m, NULL), sizeof(struct fws_proto));
	m_freem(m);
return;	return;
}	}

Line 47 fwsync_edge_proc(void *arg)	Line 48 fwsync_edge_proc(void *arg)
break;	break;
default:	default:
printf("FWSync packet was discarded due to wrong version\n");	printf("FWSync packet was discarded due to wrong version\n");
return;	break;
}	}

	m_freem(m);
}	}
}	}

Line 168 fwsync_destroy(struct ip_fw_chain *ch, ip_fw3_opheader	Line 171 fwsync_destroy(struct ip_fw_chain *ch, ip_fw3_opheader

if (fws_ctx.config & CTX_EDGE_ONLINE) {	if (fws_ctx.config & CTX_EDGE_ONLINE) {
callout_drain(&fws_co);	callout_drain(&fws_co);
	ipfw_unregister_state_sync();
soshutdown(fws_ctx.sockz[CFG_SYNC_ADDR_EDGE], SHUT_RD);	soshutdown(fws_ctx.sockz[CFG_SYNC_ADDR_EDGE], SHUT_RD);
soclose(fws_ctx.sockz[CFG_SYNC_ADDR_EDGE]);	soclose(fws_ctx.sockz[CFG_SYNC_ADDR_EDGE]);
}	}
Line 178 fwsync_destroy(struct ip_fw_chain *ch, ip_fw3_opheader	Line 182 fwsync_destroy(struct ip_fw_chain *ch, ip_fw3_opheader
ipfw_unregister_alias_hook();	ipfw_unregister_alias_hook();
}	}

	taskqueue_drain(fws_tq, &fws_sndpkt_task);

fws_cfg.cfg.on &= ~CFG_SYNC_COLLECTOR;	fws_cfg.cfg.on &= ~CFG_SYNC_COLLECTOR;
fws_cfg.cfg.collector = 0;	fws_cfg.cfg.collector = 0;
fws_cfg.cfg.addrs = 0;	fws_cfg.cfg.addrs = 0;
Line 264 fwsync_start(struct ip_fw_chain ch, ip_fw3_opheader	Line 270 fwsync_start(struct ip_fw_chain ch, ip_fw3_opheader

if ((*n & CFG_SYNC_EDGE) && (fws_ctx.config & CTX_EDGE_READY)) {	if ((*n & CFG_SYNC_EDGE) && (fws_ctx.config & CTX_EDGE_READY)) {
fws_cfg.cfg.on \|= CFG_SYNC_EDGE;	fws_cfg.cfg.on \|= CFG_SYNC_EDGE;
fws_ctx.config \|= CTX_EDGE_ONLINE;

callout_reset(&fws_co, hz, fwsync_edge_proc, NULL);	callout_reset(&fws_co, hz, fwsync_edge_proc, NULL);

	if (!(fws_ctx.config & CTX_EDGE_ONLINE))
	ipfw_register_state_sync(fwsync_state_sync);

	fws_ctx.config \|= CTX_EDGE_ONLINE;
}	}

if ((*n & CFG_SYNC_COLLECTOR) && (fws_ctx.config & CTX_COLLECTOR_1_READY)) {	if ((*n & CFG_SYNC_COLLECTOR) && (fws_ctx.config & CTX_COLLECTOR_1_READY)) {
Line 321 fwsync_stop(struct ip_fw_chain ch, ip_fw3_opheader o	Line 331 fwsync_stop(struct ip_fw_chain ch, ip_fw3_opheader o
fws_ctx.config &= ~CTX_EDGE_ONLINE;	fws_ctx.config &= ~CTX_EDGE_ONLINE;

callout_drain(&fws_co);	callout_drain(&fws_co);

	ipfw_unregister_state_sync();
}	}

if ((*n & CFG_SYNC_COLLECTOR) && (fws_ctx.config & CTX_COLLECTOR_2_ONLINE))	if ((*n & CFG_SYNC_COLLECTOR) && (fws_ctx.config & CTX_COLLECTOR_2_ONLINE))
Line 334 fwsync_stop(struct ip_fw_chain ch, ip_fw3_opheader o	Line 346 fwsync_stop(struct ip_fw_chain ch, ip_fw3_opheader o

ipfw_unregister_state_hook();	ipfw_unregister_state_hook();
ipfw_unregister_alias_hook();	ipfw_unregister_alias_hook();

	taskqueue_drain(fws_tq, &fws_sndpkt_task);
}	}

return 0;	return 0;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.7
changed lines
	Added in v.1.8