Attachment #236403 for bug #266124

View | Details | Raw Unified | Return to bug 266124
Collapse All | Expand All





#ifdef	IPFILTER_LOG

# if defined(IPL_SELECT)
#  include	<machine/sys/user.h>
#  include	<sys/kthread_iface.h>
#  define	READ_COLLISION	0x001
extern int selwait;
# endif /* IPL_SELECT */

typedef struct ipf_log_softc_s {
	ipfmutex_t	ipl_mutex[IPL_LOGSIZE];
# if SOLARIS && defined(_KERNEL)

		softl->ipll[i] = NULL;
		softl->iplh[i] = &softl->iplt[i];
		bzero((char *)&softl->ipl_crc[i], sizeof(softl->ipl_crc[i]));
# ifdef	IPL_SELECT
		softl->iplog_ss[i].read_waiter = 0;
		softl->iplog_ss[i].state = 0;
# endif
	}



	POLLWAKEUP(unit);
# endif
	SPL_X(s);
# ifdef	IPL_SELECT
	iplog_input_ready(unit);
# endif
	return (0);
}

- 
--
sys/netpfil/ipfilter/netinet/ip_state.c | 12 ------------
1 file changed, 12 deletions(-)




		error = ipf_state_getent(softc, softs, data);
		break;

	/*
	 * Return a copy of the hash table bucket lengths
	 */
	case SIOCSTAT1 :
		error = BCOPYOUT(softs->ipf_state_stats.iss_bucketlen, data,
				 softs->ipf_state_size * sizeof(u_int));
		if (error != 0) {
			IPFERROR(100017);
			error = EFAULT;
		}
		break;

	case SIOCGENITER :
	    {
		ipftoken_t *token;
- 

Return to bug 266124

Lines 109-121 Link Here

(-)b/sys/netpfil/ipfilter/netinet/ip_log.c (-16 lines)
109		109
110	#ifdef IPFILTER_LOG	110	#ifdef IPFILTER_LOG
111		111
112	# if defined(IPL_SELECT)
113	# include <machine/sys/user.h>
114	# include <sys/kthread_iface.h>
115	# define READ_COLLISION 0x001
116	extern int selwait;
117	# endif /* IPL_SELECT */
118
119	typedef struct ipf_log_softc_s {	112	typedef struct ipf_log_softc_s {
120	ipfmutex_t ipl_mutex[IPL_LOGSIZE];	113	ipfmutex_t ipl_mutex[IPL_LOGSIZE];
121	# if SOLARIS && defined(_KERNEL)	114	# if SOLARIS && defined(_KERNEL)
Lines 239-248 ipf_log_soft_init(ipf_main_softc_t softc, void arg) Link Here
239	softl->ipll[i] = NULL;	232	softl->ipll[i] = NULL;
240	softl->iplh[i] = &softl->iplt[i];	233	softl->iplh[i] = &softl->iplt[i];
241	bzero((char *)&softl->ipl_crc[i], sizeof(softl->ipl_crc[i]));	234	bzero((char *)&softl->ipl_crc[i], sizeof(softl->ipl_crc[i]));
242	# ifdef IPL_SELECT
243	softl->iplog_ss[i].read_waiter = 0;
244	softl->iplog_ss[i].state = 0;
245	# endif
246	}	235	}
247		236
248		237
Lines 625-633 ipf_log_items(ipf_main_softc_t softc, int unit, fr_info_t fin, void **items, Link Here
625	POLLWAKEUP(unit);	614	POLLWAKEUP(unit);
626	# endif	615	# endif
627	SPL_X(s);	616	SPL_X(s);
628	# ifdef IPL_SELECT
629	iplog_input_ready(unit);
630	# endif
631	return (0);	617	return (0);
632	}	618	}
633		619
634	-
635	--
636	sys/netpfil/ipfilter/netinet/ip_state.c \| 12 ------------	620	sys/netpfil/ipfilter/netinet/ip_state.c \| 12 ------------
637	1 file changed, 12 deletions(-)	621	1 file changed, 12 deletions(-)

Lines 751-768 ipf_state_ioctl(ipf_main_softc_t *softc, caddr_t data, ioctlcmd_t cmd, Link Here

(-)b/sys/netpfil/ipfilter/netinet/ip_state.c (-13 lines)
751	error = ipf_state_getent(softc, softs, data);	751	error = ipf_state_getent(softc, softs, data);
752	break;	752	break;
753		753
754	/*
755	* Return a copy of the hash table bucket lengths
756	*/
757	case SIOCSTAT1 :
758	error = BCOPYOUT(softs->ipf_state_stats.iss_bucketlen, data,
759	softs->ipf_state_size * sizeof(u_int));
760	if (error != 0) {
761	IPFERROR(100017);
762	error = EFAULT;
763	}
764	break;
765
766	case SIOCGENITER :	754	case SIOCGENITER :
767	{	755	{
768	ipftoken_t *token;	756	ipftoken_t *token;
769	-