| pf_ioctl.c (145836) | pf_ioctl.c (147321) |
|---|---|
| 1/* $FreeBSD: head/sys/contrib/pf/net/pf_ioctl.c 145836 2005-05-03 16:43:32Z mlaier $ */ | 1/* $FreeBSD: head/sys/contrib/pf/net/pf_ioctl.c 147321 2005-06-12 16:46:20Z mlaier $ */ |
| 2/* $OpenBSD: pf_ioctl.c,v 1.139 2005/03/03 07:13:39 dhartmei Exp $ */ 3 4/* 5 * Copyright (c) 2001 Daniel Hartmeier 6 * Copyright (c) 2002,2003 Henning Brauer 7 * All rights reserved. 8 * 9 * Redistribution and use in source and binary forms, with or without --- 320 unchanged lines hidden (view full) --- 330 my_timeout[PFTM_OTHER_FIRST_PACKET] = PFTM_OTHER_FIRST_PACKET_VAL; 331 my_timeout[PFTM_OTHER_SINGLE] = PFTM_OTHER_SINGLE_VAL; 332 my_timeout[PFTM_OTHER_MULTIPLE] = PFTM_OTHER_MULTIPLE_VAL; 333 my_timeout[PFTM_FRAG] = PFTM_FRAG_VAL; 334 my_timeout[PFTM_INTERVAL] = PFTM_INTERVAL_VAL; 335 my_timeout[PFTM_SRC_NODE] = PFTM_SRC_NODE_VAL; 336 my_timeout[PFTM_TS_DIFF] = PFTM_TS_DIFF_VAL; 337 | 2/* $OpenBSD: pf_ioctl.c,v 1.139 2005/03/03 07:13:39 dhartmei Exp $ */ 3 4/* 5 * Copyright (c) 2001 Daniel Hartmeier 6 * Copyright (c) 2002,2003 Henning Brauer 7 * All rights reserved. 8 * 9 * Redistribution and use in source and binary forms, with or without --- 320 unchanged lines hidden (view full) --- 330 my_timeout[PFTM_OTHER_FIRST_PACKET] = PFTM_OTHER_FIRST_PACKET_VAL; 331 my_timeout[PFTM_OTHER_SINGLE] = PFTM_OTHER_SINGLE_VAL; 332 my_timeout[PFTM_OTHER_MULTIPLE] = PFTM_OTHER_MULTIPLE_VAL; 333 my_timeout[PFTM_FRAG] = PFTM_FRAG_VAL; 334 my_timeout[PFTM_INTERVAL] = PFTM_INTERVAL_VAL; 335 my_timeout[PFTM_SRC_NODE] = PFTM_SRC_NODE_VAL; 336 my_timeout[PFTM_TS_DIFF] = PFTM_TS_DIFF_VAL; 337 |
| 338 /* 339 * XXX 340 * The 2nd arg. 0 to callout_init(9) shoule be set to CALLOUT_MPSAFE 341 * if Gaint lock is removed from the network stack. 342 */ 343 callout_init(&pf_expire_to, 0); | 338 callout_init(&pf_expire_to, NET_CALLOUT_MPSAFE); |
| 344 callout_reset(&pf_expire_to, my_timeout[PFTM_INTERVAL] * hz, 345 pf_purge_timeout, &pf_expire_to); 346 347 pf_normalize_init(); 348 bzero(&pf_status, sizeof(pf_status)); 349 pf_pfil_hooked = 0; 350 351 /* XXX do our best to avoid a conflict */ --- 3236 unchanged lines hidden --- | 339 callout_reset(&pf_expire_to, my_timeout[PFTM_INTERVAL] * hz, 340 pf_purge_timeout, &pf_expire_to); 341 342 pf_normalize_init(); 343 bzero(&pf_status, sizeof(pf_status)); 344 pf_pfil_hooked = 0; 345 346 /* XXX do our best to avoid a conflict */ --- 3236 unchanged lines hidden --- |