Index: contrib/ipfilter/netinet/ip_nat.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/ipfilter/netinet/ip_nat.c,v retrieving revision 1.34 diff -u -r1.34 ip_nat.c --- contrib/ipfilter/netinet/ip_nat.c 21 Jun 2004 22:46:35 -0000 1.34 +++ contrib/ipfilter/netinet/ip_nat.c 12 Jul 2004 01:24:33 -0000 @@ -128,7 +128,7 @@ ipnat_t **rdr_rules = NULL; hostmap_t **maptable = NULL; -u_long fr_defnatage = DEF_NAT_AGE, +u_int fr_defnatage = DEF_NAT_AGE, fr_defnaticmpage = 6; /* 3 seconds */ natstat_t nat_stats; int fr_nat_lock = 0; Index: contrib/ipfilter/netinet/ip_nat.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/ipfilter/netinet/ip_nat.h,v retrieving revision 1.21 diff -u -r1.21 ip_nat.h --- contrib/ipfilter/netinet/ip_nat.h 21 Jun 2004 22:46:36 -0000 1.21 +++ contrib/ipfilter/netinet/ip_nat.h 12 Jul 2004 01:24:33 -0000 @@ -301,8 +301,8 @@ extern u_int ipf_rdrrules_sz; extern int fr_nat_lock; extern void ip_natsync __P((void *)); -extern u_long fr_defnatage; -extern u_long fr_defnaticmpage; +extern u_int fr_defnatage; +extern u_int fr_defnaticmpage; extern nat_t **nat_table[2]; extern nat_t *nat_instances; extern ipnat_t **nat_rules; Index: contrib/ipfilter/netinet/ip_state.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/ipfilter/netinet/ip_state.c,v retrieving revision 1.33 diff -u -r1.33 ip_state.c --- contrib/ipfilter/netinet/ip_state.c 21 Jun 2004 22:46:36 -0000 1.33 +++ contrib/ipfilter/netinet/ip_state.c 12 Jul 2004 01:24:33 -0000 @@ -134,7 +134,7 @@ #define FIVE_DAYS (2 * 5 * 86400) /* 5 days: half closed session */ #define TCP_MSL 240 /* 2 minutes */ -u_long fr_tcpidletimeout = FIVE_DAYS, +u_int fr_tcpidletimeout = FIVE_DAYS, fr_tcpclosewait = 2 * TCP_MSL, fr_tcplastack = 2 * TCP_MSL, fr_tcptimeout = 2 * TCP_MSL, Index: contrib/ipfilter/netinet/ip_state.h =================================================================== RCS file: /home/ncvs/src/sys/contrib/ipfilter/netinet/ip_state.h,v retrieving revision 1.15 diff -u -r1.15 ip_state.h --- contrib/ipfilter/netinet/ip_state.h 21 Jun 2004 22:46:36 -0000 1.15 +++ contrib/ipfilter/netinet/ip_state.h 12 Jul 2004 01:24:34 -0000 @@ -183,16 +183,16 @@ } ips_stat_t; -extern u_long fr_tcpidletimeout; -extern u_long fr_tcpclosewait; -extern u_long fr_tcplastack; -extern u_long fr_tcptimeout; -extern u_long fr_tcpclosed; -extern u_long fr_tcphalfclosed; -extern u_long fr_udptimeout; -extern u_long fr_udpacktimeout; -extern u_long fr_icmptimeout; -extern u_long fr_icmpacktimeout; +extern u_int fr_tcpidletimeout; +extern u_int fr_tcpclosewait; +extern u_int fr_tcplastack; +extern u_int fr_tcptimeout; +extern u_int fr_tcpclosed; +extern u_int fr_tcphalfclosed; +extern u_int fr_udptimeout; +extern u_int fr_udpacktimeout; +extern u_int fr_icmptimeout; +extern u_int fr_icmpacktimeout; extern ipstate_t *ips_list; extern int fr_state_lock; extern int fr_stateinit __P((void)); Index: contrib/ipfilter/netinet/mlfk_ipl.c =================================================================== RCS file: /home/ncvs/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c,v retrieving revision 1.13 diff -u -r1.13 mlfk_ipl.c --- contrib/ipfilter/netinet/mlfk_ipl.c 16 Jun 2004 09:46:34 -0000 1.13 +++ contrib/ipfilter/netinet/mlfk_ipl.c 12 Jul 2004 01:24:34 -0000 @@ -62,27 +62,27 @@ SYSCTL_INT(_net_inet_ipf, OID_AUTO, fr_flags, CTLFLAG_RW, &fr_flags, 0, ""); SYSCTL_INT(_net_inet_ipf, OID_AUTO, fr_pass, CTLFLAG_RW, &fr_pass, 0, ""); SYSCTL_INT(_net_inet_ipf, OID_AUTO, fr_active, CTLFLAG_RD, &fr_active, 0, ""); -SYSCTL_INT(_net_inet_ipf, OID_AUTO, fr_tcpidletimeout, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_ipf, OID_AUTO, fr_tcpidletimeout, CTLFLAG_RW, &fr_tcpidletimeout, 0, ""); -SYSCTL_INT(_net_inet_ipf, OID_AUTO, fr_tcpclosewait, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_ipf, OID_AUTO, fr_tcpclosewait, CTLFLAG_RW, &fr_tcpclosewait, 0, ""); -SYSCTL_INT(_net_inet_ipf, OID_AUTO, fr_tcplastack, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_ipf, OID_AUTO, fr_tcplastack, CTLFLAG_RW, &fr_tcplastack, 0, ""); -SYSCTL_INT(_net_inet_ipf, OID_AUTO, fr_tcptimeout, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_ipf, OID_AUTO, fr_tcptimeout, CTLFLAG_RW, &fr_tcptimeout, 0, ""); -SYSCTL_INT(_net_inet_ipf, OID_AUTO, fr_tcpclosed, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_ipf, OID_AUTO, fr_tcpclosed, CTLFLAG_RW, &fr_tcpclosed, 0, ""); -SYSCTL_INT(_net_inet_ipf, OID_AUTO, fr_tcphalfclosed, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_ipf, OID_AUTO, fr_tcphalfclosed, CTLFLAG_RW, &fr_tcphalfclosed, 0, ""); -SYSCTL_INT(_net_inet_ipf, OID_AUTO, fr_udptimeout, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_ipf, OID_AUTO, fr_udptimeout, CTLFLAG_RW, &fr_udptimeout, 0, ""); -SYSCTL_INT(_net_inet_ipf, OID_AUTO, fr_udpacktimeout, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_ipf, OID_AUTO, fr_udpacktimeout, CTLFLAG_RW, &fr_udpacktimeout, 0, ""); -SYSCTL_INT(_net_inet_ipf, OID_AUTO, fr_icmptimeout, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_ipf, OID_AUTO, fr_icmptimeout, CTLFLAG_RW, &fr_icmptimeout, 0, ""); -SYSCTL_INT(_net_inet_ipf, OID_AUTO, fr_icmpacktimeout, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_ipf, OID_AUTO, fr_icmpacktimeout, CTLFLAG_RW, &fr_icmpacktimeout, 0, ""); -SYSCTL_INT(_net_inet_ipf, OID_AUTO, fr_defnatage, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_ipf, OID_AUTO, fr_defnatage, CTLFLAG_RW, &fr_defnatage, 0, ""); SYSCTL_INT(_net_inet_ipf, OID_AUTO, fr_ipfrttl, CTLFLAG_RW, &fr_ipfrttl, 0, ""); Index: fs/devfs/devfs_devs.c =================================================================== RCS file: /home/ncvs/src/sys/fs/devfs/devfs_devs.c,v retrieving revision 1.31 diff -u -r1.31 devfs_devs.c --- fs/devfs/devfs_devs.c 18 Jun 2004 08:08:47 -0000 1.31 +++ fs/devfs/devfs_devs.c 12 Jul 2004 01:25:56 -0000 @@ -61,13 +61,13 @@ static struct devfs_dirent *devfs_find (struct devfs_dirent *dd, const char *name, int namelen); SYSCTL_NODE(_vfs, OID_AUTO, devfs, CTLFLAG_RW, 0, "DEVFS filesystem"); -SYSCTL_UINT(_vfs_devfs, OID_AUTO, noverflow, CTLFLAG_RW, +SYSCTL_INT(_vfs_devfs, OID_AUTO, noverflow, CTLFLAG_RW, &devfs_noverflowwant, 0, "Size of DEVFS overflow table"); SYSCTL_UINT(_vfs_devfs, OID_AUTO, generation, CTLFLAG_RD, &devfs_generation, 0, "DEVFS generation number"); -SYSCTL_UINT(_vfs_devfs, OID_AUTO, inodes, CTLFLAG_RD, +SYSCTL_INT(_vfs_devfs, OID_AUTO, inodes, CTLFLAG_RD, &devfs_numino, 0, "DEVFS inodes"); -SYSCTL_UINT(_vfs_devfs, OID_AUTO, topinode, CTLFLAG_RD, +SYSCTL_INT(_vfs_devfs, OID_AUTO, topinode, CTLFLAG_RD, &devfs_topino, 0, "DEVFS highest inode#"); static int * Index: kern/kern_mib.c =================================================================== RCS file: /home/ncvs/src/sys/kern/kern_mib.c,v retrieving revision 1.71 diff -u -r1.71 kern_mib.c --- kern/kern_mib.c 5 Apr 2004 21:03:34 -0000 1.71 +++ kern/kern_mib.c 12 Jul 2004 01:26:41 -0000 @@ -178,7 +178,7 @@ SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG | CTLFLAG_RD, 0, 0, sysctl_hw_usermem, "LU", ""); -SYSCTL_ULONG(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0, ""); +SYSCTL_LONG(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0, ""); static char machine_arch[] = MACHINE_ARCH; SYSCTL_STRING(_hw, HW_MACHINE_ARCH, machine_arch, CTLFLAG_RD, Index: kern/sched_4bsd.c =================================================================== RCS file: /home/ncvs/src/sys/kern/sched_4bsd.c,v retrieving revision 1.43 diff -u -r1.43 sched_4bsd.c --- kern/sched_4bsd.c 2 Jul 2004 20:21:43 -0000 1.43 +++ kern/sched_4bsd.c 12 Jul 2004 01:26:43 -0000 @@ -267,7 +267,7 @@ /* decay 95% of `ke_pctcpu' in 60 seconds; see CCPU_SHIFT before changing */ static fixpt_t ccpu = 0.95122942450071400909 * FSCALE; /* exp(-1/20) */ -SYSCTL_INT(_kern, OID_AUTO, ccpu, CTLFLAG_RD, &ccpu, 0, ""); +SYSCTL_UINT(_kern, OID_AUTO, ccpu, CTLFLAG_RD, &ccpu, 0, ""); /* * If `ccpu' is not equal to `exp(-1/20)' and you still want to use the Index: kern/sched_ule.c =================================================================== RCS file: /home/ncvs/src/sys/kern/sched_ule.c,v retrieving revision 1.115 diff -u -r1.115 sched_ule.c --- kern/sched_ule.c 10 Jul 2004 21:38:22 -0000 1.115 +++ kern/sched_ule.c 13 Jul 2004 21:42:16 -0000 @@ -56,7 +56,7 @@ /* decay 95% of `p_pctcpu' in 60 seconds; see CCPU_SHIFT before changing */ /* XXX This is bogus compatability crap for ps */ static fixpt_t ccpu = 0.95122942450071400909 * FSCALE; /* exp(-1/20) */ -SYSCTL_INT(_kern, OID_AUTO, ccpu, CTLFLAG_RD, &ccpu, 0, ""); +SYSCTL_UINT(_kern, OID_AUTO, ccpu, CTLFLAG_RD, &ccpu, 0, ""); static void sched_setup(void *dummy); SYSINIT(sched_setup, SI_SUB_RUN_QUEUE, SI_ORDER_FIRST, sched_setup, NULL) Index: kern/subr_kobj.c =================================================================== RCS file: /home/ncvs/src/sys/kern/subr_kobj.c,v retrieving revision 1.8 diff -u -r1.8 subr_kobj.c --- kern/subr_kobj.c 16 Oct 2003 09:16:28 -0000 1.8 +++ kern/subr_kobj.c 13 Jul 2004 18:08:57 -0000 @@ -59,7 +59,7 @@ static struct mtx kobj_mtx; static int kobj_next_id = 1; -SYSCTL_UINT(_kern, OID_AUTO, kobj_methodcount, CTLFLAG_RD, +SYSCTL_INT(_kern, OID_AUTO, kobj_methodcount, CTLFLAG_RD, &kobj_next_id, 0, ""); static void Index: kern/uipc_usrreq.c =================================================================== RCS file: /home/ncvs/src/sys/kern/uipc_usrreq.c,v retrieving revision 1.133 diff -u -r1.133 uipc_usrreq.c --- kern/uipc_usrreq.c 2 Jul 2004 07:40:10 -0000 1.133 +++ kern/uipc_usrreq.c 12 Jul 2004 01:26:49 -0000 @@ -553,23 +553,23 @@ #ifndef PIPSIZ #define PIPSIZ 8192 #endif -static u_long unpst_sendspace = PIPSIZ; -static u_long unpst_recvspace = PIPSIZ; -static u_long unpdg_sendspace = 2*1024; /* really max datagram size */ -static u_long unpdg_recvspace = 4*1024; +static u_int unpst_sendspace = PIPSIZ; +static u_int unpst_recvspace = PIPSIZ; +static u_int unpdg_sendspace = 2*1024; /* really max datagram size */ +static u_int unpdg_recvspace = 4*1024; static int unp_rights; /* file descriptors in flight */ SYSCTL_DECL(_net_local_stream); -SYSCTL_INT(_net_local_stream, OID_AUTO, sendspace, CTLFLAG_RW, - &unpst_sendspace, 0, ""); -SYSCTL_INT(_net_local_stream, OID_AUTO, recvspace, CTLFLAG_RW, - &unpst_recvspace, 0, ""); +SYSCTL_UINT(_net_local_stream, OID_AUTO, sendspace, CTLFLAG_RW, + &unpst_sendspace, 0, ""); +SYSCTL_UINT(_net_local_stream, OID_AUTO, recvspace, CTLFLAG_RW, + &unpst_recvspace, 0, ""); SYSCTL_DECL(_net_local_dgram); -SYSCTL_INT(_net_local_dgram, OID_AUTO, maxdgram, CTLFLAG_RW, - &unpdg_sendspace, 0, ""); -SYSCTL_INT(_net_local_dgram, OID_AUTO, recvspace, CTLFLAG_RW, - &unpdg_recvspace, 0, ""); +SYSCTL_UINT(_net_local_dgram, OID_AUTO, maxdgram, CTLFLAG_RW, + &unpdg_sendspace, 0, ""); +SYSCTL_UINT(_net_local_dgram, OID_AUTO, recvspace, CTLFLAG_RW, + &unpdg_recvspace, 0, ""); SYSCTL_DECL(_net_local); SYSCTL_INT(_net_local, OID_AUTO, inflight, CTLFLAG_RD, &unp_rights, 0, ""); Index: kern/vfs_subr.c =================================================================== RCS file: /home/ncvs/src/sys/kern/vfs_subr.c,v retrieving revision 1.510 diff -u -r1.510 vfs_subr.c --- kern/vfs_subr.c 12 Jul 2004 08:14:08 -0000 1.510 +++ kern/vfs_subr.c 13 Jul 2004 16:54:31 -0000 @@ -98,7 +98,7 @@ */ static unsigned long numvnodes; -SYSCTL_LONG(_vfs, OID_AUTO, numvnodes, CTLFLAG_RD, &numvnodes, 0, ""); +SYSCTL_ULONG(_vfs, OID_AUTO, numvnodes, CTLFLAG_RD, &numvnodes, 0, ""); /* * Conversion tables for conversion from vnode types to inode formats @@ -123,10 +123,10 @@ * getnewvnode() will return a newly allocated vnode. */ static u_long wantfreevnodes = 25; -SYSCTL_LONG(_vfs, OID_AUTO, wantfreevnodes, CTLFLAG_RW, &wantfreevnodes, 0, ""); +SYSCTL_ULONG(_vfs, OID_AUTO, wantfreevnodes, CTLFLAG_RW, &wantfreevnodes, 0, ""); /* Number of vnodes in the free list. */ static u_long freevnodes; -SYSCTL_LONG(_vfs, OID_AUTO, freevnodes, CTLFLAG_RD, &freevnodes, 0, ""); +SYSCTL_ULONG(_vfs, OID_AUTO, freevnodes, CTLFLAG_RD, &freevnodes, 0, ""); /* * Various variables used for debugging the new implementation of Index: netinet/ip_fw2.c =================================================================== RCS file: /home/ncvs/src/sys/netinet/ip_fw2.c,v retrieving revision 1.63 diff -u -r1.63 ip_fw2.c --- netinet/ip_fw2.c 24 Jun 2004 02:01:48 -0000 1.63 +++ netinet/ip_fw2.c 12 Jul 2004 01:28:04 -0000 @@ -258,29 +258,30 @@ static u_int32_t dyn_count; /* # of dynamic rules */ static u_int32_t dyn_max = 4096; /* max # of dynamic rules */ -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_buckets, CTLFLAG_RW, +/* really need SYSCTL_UINT32, or need these types to just be u_int */ +SYSCTL_UINT(_net_inet_ip_fw, OID_AUTO, dyn_buckets, CTLFLAG_RW, &dyn_buckets, 0, "Number of dyn. buckets"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, curr_dyn_buckets, CTLFLAG_RD, +SYSCTL_UINT(_net_inet_ip_fw, OID_AUTO, curr_dyn_buckets, CTLFLAG_RD, &curr_dyn_buckets, 0, "Current Number of dyn. buckets"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_count, CTLFLAG_RD, +SYSCTL_UINT(_net_inet_ip_fw, OID_AUTO, dyn_count, CTLFLAG_RD, &dyn_count, 0, "Number of dyn. rules"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_max, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_ip_fw, OID_AUTO, dyn_max, CTLFLAG_RW, &dyn_max, 0, "Max number of dyn. rules"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, static_count, CTLFLAG_RD, +SYSCTL_UINT(_net_inet_ip_fw, OID_AUTO, static_count, CTLFLAG_RD, &static_count, 0, "Number of static rules"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_ack_lifetime, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_ip_fw, OID_AUTO, dyn_ack_lifetime, CTLFLAG_RW, &dyn_ack_lifetime, 0, "Lifetime of dyn. rules for acks"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_syn_lifetime, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_ip_fw, OID_AUTO, dyn_syn_lifetime, CTLFLAG_RW, &dyn_syn_lifetime, 0, "Lifetime of dyn. rules for syn"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_fin_lifetime, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_ip_fw, OID_AUTO, dyn_fin_lifetime, CTLFLAG_RW, &dyn_fin_lifetime, 0, "Lifetime of dyn. rules for fin"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_rst_lifetime, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_ip_fw, OID_AUTO, dyn_rst_lifetime, CTLFLAG_RW, &dyn_rst_lifetime, 0, "Lifetime of dyn. rules for rst"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_udp_lifetime, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_ip_fw, OID_AUTO, dyn_udp_lifetime, CTLFLAG_RW, &dyn_udp_lifetime, 0, "Lifetime of dyn. rules for UDP"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_short_lifetime, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_ip_fw, OID_AUTO, dyn_short_lifetime, CTLFLAG_RW, &dyn_short_lifetime, 0, "Lifetime of dyn. rules for other situations"); -SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_keepalive, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_ip_fw, OID_AUTO, dyn_keepalive, CTLFLAG_RW, &dyn_keepalive, 0, "Enable keepalives for dyn. rules"); #endif /* SYSCTL_NODE */ Index: netinet/raw_ip.c =================================================================== RCS file: /home/ncvs/src/sys/netinet/raw_ip.c,v retrieving revision 1.135 diff -u -r1.135 raw_ip.c --- netinet/raw_ip.c 26 Jun 2004 19:10:39 -0000 1.135 +++ netinet/raw_ip.c 12 Jul 2004 01:28:05 -0000 @@ -531,12 +531,12 @@ } } -u_long rip_sendspace = RIPSNDQ; -u_long rip_recvspace = RIPRCVQ; +u_int rip_sendspace = RIPSNDQ; +u_int rip_recvspace = RIPRCVQ; -SYSCTL_INT(_net_inet_raw, OID_AUTO, maxdgram, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_raw, OID_AUTO, maxdgram, CTLFLAG_RW, &rip_sendspace, 0, "Maximum outgoing raw IP datagram size"); -SYSCTL_INT(_net_inet_raw, OID_AUTO, recvspace, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_raw, OID_AUTO, recvspace, CTLFLAG_RW, &rip_recvspace, 0, "Maximum space for incoming raw IP datagrams"); static int Index: netinet/tcp_hostcache.c =================================================================== RCS file: /home/ncvs/src/sys/netinet/tcp_hostcache.c,v retrieving revision 1.4 diff -u -r1.4 tcp_hostcache.c --- netinet/tcp_hostcache.c 23 Apr 2004 13:54:28 -0000 1.4 +++ netinet/tcp_hostcache.c 13 Jul 2004 18:27:16 -0000 @@ -156,16 +156,16 @@ SYSCTL_NODE(_net_inet_tcp, OID_AUTO, hostcache, CTLFLAG_RW, 0, "TCP Host cache"); -SYSCTL_INT(_net_inet_tcp_hostcache, OID_AUTO, cachelimit, CTLFLAG_RDTUN, +SYSCTL_UINT(_net_inet_tcp_hostcache, OID_AUTO, cachelimit, CTLFLAG_RDTUN, &tcp_hostcache.cache_limit, 0, "Overall entry limit for hostcache"); -SYSCTL_INT(_net_inet_tcp_hostcache, OID_AUTO, hashsize, CTLFLAG_RDTUN, +SYSCTL_UINT(_net_inet_tcp_hostcache, OID_AUTO, hashsize, CTLFLAG_RDTUN, &tcp_hostcache.hashsize, 0, "Size of TCP hostcache hashtable"); -SYSCTL_INT(_net_inet_tcp_hostcache, OID_AUTO, bucketlimit, CTLFLAG_RDTUN, +SYSCTL_UINT(_net_inet_tcp_hostcache, OID_AUTO, bucketlimit, CTLFLAG_RDTUN, &tcp_hostcache.bucket_limit, 0, "Per-bucket hash limit for hostcache"); -SYSCTL_INT(_net_inet_tcp_hostcache, OID_AUTO, count, CTLFLAG_RD, +SYSCTL_UINT(_net_inet_tcp_hostcache, OID_AUTO, count, CTLFLAG_RD, &tcp_hostcache.cache_count, 0, "Current number of entries in hostcache"); SYSCTL_INT(_net_inet_tcp_hostcache, OID_AUTO, expire, CTLFLAG_RW, Index: netinet/tcp_subr.c =================================================================== RCS file: /home/ncvs/src/sys/netinet/tcp_subr.c,v retrieving revision 1.193 diff -u -r1.193 tcp_subr.c --- netinet/tcp_subr.c 23 Jun 2004 21:34:07 -0000 1.193 +++ netinet/tcp_subr.c 12 Jul 2004 01:28:06 -0000 @@ -167,7 +167,7 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, do_tcpdrain, CTLFLAG_RW, &do_tcpdrain, 0, "Enable tcp_drain routine for extra help when low on mbufs"); -SYSCTL_INT(_net_inet_tcp, OID_AUTO, pcbcount, CTLFLAG_RD, +SYSCTL_UINT(_net_inet_tcp, OID_AUTO, pcbcount, CTLFLAG_RD, &tcbinfo.ipi_count, 0, "Number of active PCBs"); static int icmp_may_rst = 1; Index: netinet/tcp_syncache.c =================================================================== RCS file: /home/ncvs/src/sys/netinet/tcp_syncache.c,v retrieving revision 1.60 diff -u -r1.60 tcp_syncache.c --- netinet/tcp_syncache.c 23 Jun 2004 21:04:37 -0000 1.60 +++ netinet/tcp_syncache.c 12 Jul 2004 01:28:06 -0000 @@ -152,19 +152,19 @@ SYSCTL_NODE(_net_inet_tcp, OID_AUTO, syncache, CTLFLAG_RW, 0, "TCP SYN cache"); -SYSCTL_INT(_net_inet_tcp_syncache, OID_AUTO, bucketlimit, CTLFLAG_RDTUN, +SYSCTL_UINT(_net_inet_tcp_syncache, OID_AUTO, bucketlimit, CTLFLAG_RDTUN, &tcp_syncache.bucket_limit, 0, "Per-bucket hash limit for syncache"); -SYSCTL_INT(_net_inet_tcp_syncache, OID_AUTO, cachelimit, CTLFLAG_RDTUN, +SYSCTL_UINT(_net_inet_tcp_syncache, OID_AUTO, cachelimit, CTLFLAG_RDTUN, &tcp_syncache.cache_limit, 0, "Overall entry limit for syncache"); -SYSCTL_INT(_net_inet_tcp_syncache, OID_AUTO, count, CTLFLAG_RD, +SYSCTL_UINT(_net_inet_tcp_syncache, OID_AUTO, count, CTLFLAG_RD, &tcp_syncache.cache_count, 0, "Current number of entries in syncache"); -SYSCTL_INT(_net_inet_tcp_syncache, OID_AUTO, hashsize, CTLFLAG_RDTUN, +SYSCTL_UINT(_net_inet_tcp_syncache, OID_AUTO, hashsize, CTLFLAG_RDTUN, &tcp_syncache.hashsize, 0, "Size of TCP syncache hashtable"); -SYSCTL_INT(_net_inet_tcp_syncache, OID_AUTO, rexmtlimit, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_tcp_syncache, OID_AUTO, rexmtlimit, CTLFLAG_RW, &tcp_syncache.rexmt_limit, 0, "Limit on SYN/ACK retransmissions"); static MALLOC_DEFINE(M_SYNCACHE, "syncache", "TCP syncache"); Index: netinet/tcp_usrreq.c =================================================================== RCS file: /home/ncvs/src/sys/netinet/tcp_usrreq.c,v retrieving revision 1.103 diff -u -r1.103 tcp_usrreq.c --- netinet/tcp_usrreq.c 26 Jun 2004 17:50:50 -0000 1.103 +++ netinet/tcp_usrreq.c 12 Jul 2004 01:28:06 -0000 @@ -1129,11 +1129,11 @@ * sizes, respectively. These are obsolescent (this information should * be set by the route). */ -u_long tcp_sendspace = 1024*32; -SYSCTL_INT(_net_inet_tcp, TCPCTL_SENDSPACE, sendspace, CTLFLAG_RW, +u_int tcp_sendspace = 1024*32; +SYSCTL_UINT(_net_inet_tcp, TCPCTL_SENDSPACE, sendspace, CTLFLAG_RW, &tcp_sendspace , 0, "Maximum outgoing TCP datagram size"); -u_long tcp_recvspace = 1024*64; -SYSCTL_INT(_net_inet_tcp, TCPCTL_RECVSPACE, recvspace, CTLFLAG_RW, +u_int tcp_recvspace = 1024*64; +SYSCTL_UINT(_net_inet_tcp, TCPCTL_RECVSPACE, recvspace, CTLFLAG_RW, &tcp_recvspace , 0, "Maximum incoming TCP datagram size"); /* Index: netinet/tcp_var.h =================================================================== RCS file: /home/ncvs/src/sys/netinet/tcp_var.h,v retrieving revision 1.107 diff -u -r1.107 tcp_var.h --- netinet/tcp_var.h 25 Jun 2004 02:29:58 -0000 1.107 +++ netinet/tcp_var.h 12 Jul 2004 01:28:07 -0000 @@ -607,8 +607,8 @@ #define TCP_HC_TAO_MSSOPT 0x3 extern struct pr_usrreqs tcp_usrreqs; -extern u_long tcp_sendspace; -extern u_long tcp_recvspace; +extern u_int tcp_sendspace; +extern u_int tcp_recvspace; tcp_seq tcp_new_isn(struct tcpcb *); int tcp_sack_option(struct tcpcb *,struct tcphdr *,u_char *,int); Index: netinet/udp_usrreq.c =================================================================== RCS file: /home/ncvs/src/sys/netinet/udp_usrreq.c,v retrieving revision 1.156 diff -u -r1.156 udp_usrreq.c --- netinet/udp_usrreq.c 26 Jun 2004 19:10:39 -0000 1.156 +++ netinet/udp_usrreq.c 12 Jul 2004 01:28:07 -0000 @@ -889,19 +889,19 @@ return (error); } -u_long udp_sendspace = 9216; /* really max datagram size */ +u_int udp_sendspace = 9216; /* really max datagram size */ /* 40 1K datagrams */ -SYSCTL_INT(_net_inet_udp, UDPCTL_MAXDGRAM, maxdgram, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_udp, UDPCTL_MAXDGRAM, maxdgram, CTLFLAG_RW, &udp_sendspace, 0, "Maximum outgoing UDP datagram size"); -u_long udp_recvspace = 40 * (1024 + +u_int udp_recvspace = 40 * (1024 + #ifdef INET6 sizeof(struct sockaddr_in6) #else sizeof(struct sockaddr_in) #endif ); -SYSCTL_INT(_net_inet_udp, UDPCTL_RECVSPACE, recvspace, CTLFLAG_RW, +SYSCTL_UINT(_net_inet_udp, UDPCTL_RECVSPACE, recvspace, CTLFLAG_RW, &udp_recvspace, 0, "Maximum space for incoming UDP datagrams"); static int Index: netinet/udp_var.h =================================================================== RCS file: /home/ncvs/src/sys/netinet/udp_var.h,v retrieving revision 1.27 diff -u -r1.27 udp_var.h --- netinet/udp_var.h 7 Apr 2004 20:46:14 -0000 1.27 +++ netinet/udp_var.h 12 Jul 2004 01:28:07 -0000 @@ -94,8 +94,8 @@ extern struct pr_usrreqs udp_usrreqs; extern struct inpcbhead udb; extern struct inpcbinfo udbinfo; -extern u_long udp_sendspace; -extern u_long udp_recvspace; +extern u_int udp_sendspace; +extern u_int udp_recvspace; extern struct udpstat udpstat; extern int log_in_vain; Index: netinet6/raw_ip6.c =================================================================== RCS file: /home/ncvs/src/sys/netinet6/raw_ip6.c,v retrieving revision 1.41 diff -u -r1.41 raw_ip6.c --- netinet6/raw_ip6.c 7 Apr 2004 20:46:16 -0000 1.41 +++ netinet6/raw_ip6.c 12 Jul 2004 01:28:09 -0000 @@ -117,8 +117,8 @@ extern struct inpcbhead ripcb; extern struct inpcbinfo ripcbinfo; -extern u_long rip_sendspace; -extern u_long rip_recvspace; +extern u_int rip_sendspace; +extern u_int rip_recvspace; struct rip6stat rip6stat; Index: rpc/rpcclnt.h =================================================================== RCS file: /home/ncvs/src/sys/rpc/rpcclnt.h,v retrieving revision 1.3 diff -u -r1.3 rpcclnt.h --- rpc/rpcclnt.h 7 Apr 2004 05:00:00 -0000 1.3 +++ rpc/rpcclnt.h 13 Jul 2004 18:38:05 -0000 @@ -152,11 +152,11 @@ /* global rpcstats * XXX should be per rpcclnt */ struct rpcstats { - int rpcretries; - int rpcrequests; - int rpctimeouts; - int rpcunexpected; - int rpcinvalid; + u_int rpcretries; + u_int rpcrequests; + u_int rpctimeouts; + u_int rpcunexpected; + u_int rpcinvalid; }; struct rpc_program { Index: security/mac_seeotheruids/mac_seeotheruids.c =================================================================== RCS file: /home/ncvs/src/sys/security/mac_seeotheruids/mac_seeotheruids.c,v retrieving revision 1.6 diff -u -r1.6 mac_seeotheruids.c --- security/mac_seeotheruids/mac_seeotheruids.c 22 Feb 2004 00:33:12 -0000 1.6 +++ security/mac_seeotheruids/mac_seeotheruids.c 22 Mar 2004 21:18:45 -0000 @@ -94,7 +94,7 @@ "with a specific gid as their real primary group id or group set"); static gid_t specificgid = 0; -SYSCTL_INT(_security_mac_seeotheruids, OID_AUTO, specificgid, CTLFLAG_RW, +SYSCTL_UINT(_security_mac_seeotheruids, OID_AUTO, specificgid, CTLFLAG_RW, &specificgid, 0, "Specific gid to be exempt from seeotheruids policy"); static int