summaryrefslogtreecommitdiffstats
path: root/sys/netinet
diff options
context:
space:
mode:
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/in_pcb.c4
-rw-r--r--sys/netinet/ip_flow.c3
-rw-r--r--sys/netinet/ip_input.c3
-rw-r--r--sys/netinet/ip_log.c13
-rw-r--r--sys/netinet/ip_mroute.c5
-rw-r--r--sys/netinet/mlf_ipl.c44
-rw-r--r--sys/netinet/tcp_subr.c3
-rw-r--r--sys/netinet/tcp_timewait.c3
-rw-r--r--sys/netinet/tcp_usrreq.c3
9 files changed, 37 insertions, 44 deletions
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index c8ac1c0..d604ad0 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)in_pcb.c 8.4 (Berkeley) 5/24/95
- * $Id: in_pcb.c,v 1.44 1998/05/15 20:11:32 wollman Exp $
+ * $Id: in_pcb.c,v 1.45 1998/09/17 18:42:16 fenner Exp $
*/
#include <sys/param.h>
@@ -688,7 +688,7 @@ in_pcblookup_local(pcbinfo, laddr, lport_arg, wild_okay)
u_int lport_arg;
int wild_okay;
{
- register struct inpcb *inp, *match = NULL;
+ register struct inpcb *inp;
int matchwild = 3, wildcard;
u_short lport = lport_arg;
diff --git a/sys/netinet/ip_flow.c b/sys/netinet/ip_flow.c
index b9a000c..d4a2439 100644
--- a/sys/netinet/ip_flow.c
+++ b/sys/netinet/ip_flow.c
@@ -33,7 +33,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: ip_flow.c,v 1.4 1998/05/19 17:47:11 jdp Exp $
+ * $Id: ip_flow.c,v 1.5 1998/06/21 14:53:29 bde Exp $
*/
#include <sys/param.h>
@@ -109,7 +109,6 @@ ipflow_fastforward(
struct ip *ip;
struct ipflow *ipf;
struct rtentry *rt;
- u_int32_t sum;
int error;
/*
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 364fd23..8661bf8 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ip_input.c 8.2 (Berkeley) 1/4/94
- * $Id: ip_input.c,v 1.106 1998/11/15 18:10:14 dfr Exp $
+ * $Id: ip_input.c,v 1.107 1998/11/16 08:27:36 dfr Exp $
* $ANA: ip_input.c,v 1.5 1996/09/18 14:34:59 wollman Exp $
*/
@@ -245,7 +245,6 @@ ip_input(struct mbuf *m)
{
struct ip *ip;
struct ipq *fp;
- struct ipqent *ipqe;
struct in_ifaddr *ia;
int i, hlen, mff;
u_short sum;
diff --git a/sys/netinet/ip_log.c b/sys/netinet/ip_log.c
index d41f070..8a826ed 100644
--- a/sys/netinet/ip_log.c
+++ b/sys/netinet/ip_log.c
@@ -5,7 +5,7 @@
* provided that this notice is preserved and due credit is given
* to the original author and the contributors.
*
- * $Id: ip_log.c,v 1.4 1998/04/06 11:40:42 phk Exp $
+ * $Id: ip_log.c,v 1.5 1998/11/26 18:54:52 eivind Exp $
*/
#include "opt_ipfilter.h"
@@ -135,7 +135,6 @@ static struct wait_queue *iplwait[IPL_LOGMAX+1];
*/
void ipflog_init()
{
- struct timeval tv;
int i;
for (i = IPL_LOGMAX; i >= 0; i--) {
@@ -146,12 +145,16 @@ void ipflog_init()
# if defined(__FreeBSD__) && __FreeBSD_version >= 300000
read_random(&iplcrcinit, sizeof iplcrcinit);
# else
+ {
+ struct timeval tv;
+
#if BSD >= 199306 || defined(__FreeBSD__) || defined(__sgi)
- microtime(&tv);
+ microtime(&tv);
# else
- uniqtime(&tv);
+ uniqtime(&tv);
# endif
- iplcrcinit = tv.tv_sec ^ (tv.tv_usec << 8) ^ tv.tv_usec;
+ iplcrcinit = tv.tv_sec ^ (tv.tv_usec << 8) ^ tv.tv_usec;
+ }
# endif
}
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 3c11f82..157b72d 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -9,7 +9,7 @@
* Modified by Bill Fenner, PARC, April 1995
*
* MROUTING Revision: 3.5
- * $Id: ip_mroute.c,v 1.48 1998/08/17 01:05:24 bde Exp $
+ * $Id: ip_mroute.c,v 1.49 1998/08/23 03:07:14 wollman Exp $
*/
#include "opt_mrouting.h"
@@ -556,8 +556,6 @@ ip_mrouter_init(so, version)
struct socket *so;
int version;
{
- int *v;
-
if (mrtdebug)
log(LOG_DEBUG,"ip_mrouter_init: so_type = %d, pr_protocol = %d\n",
so->so_type, so->so_proto->pr_protocol);
@@ -691,7 +689,6 @@ add_vif(vifcp)
static struct sockaddr_in sin = {sizeof sin, AF_INET};
struct ifaddr *ifa;
struct ifnet *ifp;
- struct ifreq ifr;
int error, s;
struct tbf *v_tbf = tbftable + vifcp->vifc_vifi;
diff --git a/sys/netinet/mlf_ipl.c b/sys/netinet/mlf_ipl.c
index 65c7139..1ef9077 100644
--- a/sys/netinet/mlf_ipl.c
+++ b/sys/netinet/mlf_ipl.c
@@ -81,29 +81,8 @@
extern int lkmenodev __P((void));
-static char *ipf_devfiles[] = { IPL_NAME, IPL_NAT, IPL_STATE, IPL_AUTH,
- NULL };
-static int if_ipl_unload __P((struct lkm_table *, int));
-static int if_ipl_load __P((struct lkm_table *, int));
-static int if_ipl_remove __P((void));
int xxxinit __P((struct lkm_table *, int, int));
-
-static struct cdevsw ipldevsw =
-{
- iplopen, /* open */
- iplclose, /* close */
- iplread, /* read */
- (void *)nullop, /* write */
- iplioctl, /* ioctl */
- (void *)nullop, /* stop */
- (void *)nullop, /* reset */
- (void *)NULL, /* tty */
- (void *)nullop, /* select */
- (void *)nullop, /* mmap */
- NULL /* strategy */
-};
-
#ifdef SYSCTL_INT
SYSCTL_NODE(_net_inet, OID_AUTO, ipf, CTLFLAG_RW, 0, "IPF");
SYSCTL_INT(_net_inet_ipf, OID_AUTO, fr_flags, CTLFLAG_RW, &fr_flags, 0, "");
@@ -146,13 +125,27 @@ static void *ipf_devfs[IPL_LOGMAX + 1];
#if !defined(__FreeBSD_version) || (__FreeBSD_version < 220000)
int ipl_major = 0;
+static struct cdevsw ipldevsw =
+{
+ iplopen, /* open */
+ iplclose, /* close */
+ iplread, /* read */
+ (void *)nullop, /* write */
+ iplioctl, /* ioctl */
+ (void *)nullop, /* stop */
+ (void *)nullop, /* reset */
+ (void *)NULL, /* tty */
+ (void *)nullop, /* select */
+ (void *)nullop, /* mmap */
+ NULL /* strategy */
+};
+
MOD_DEV(IPL_VERSION, LM_DT_CHAR, -1, &ipldevsw);
extern struct cdevsw cdevsw[];
extern int vd_unuseddev __P((void));
extern int nchrdev;
#else
-static int ipl_major = CDEV_MAJOR;
static struct cdevsw ipl_cdevsw = {
iplopen, iplclose, iplread, nowrite, /* 79 */
@@ -166,8 +159,13 @@ static struct cdevsw ipl_cdevsw = {
static void ipl_drvinit __P((void *));
#ifdef ACTUALLY_LKM_NOT_KERNEL
-static int iplaction __P((struct lkm_table *, int));
+static int if_ipl_unload __P((struct lkm_table *, int));
+static int if_ipl_load __P((struct lkm_table *, int));
+static int if_ipl_remove __P((void));
+static int ipl_major = CDEV_MAJOR;
+static int iplaction __P((struct lkm_table *, int));
+static char *ipf_devfiles[] = { IPL_NAME, IPL_NAT, IPL_STATE, IPL_AUTH, NULL };
static int iplaction(lkmtp, cmd)
struct lkm_table *lkmtp;
int cmd;
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index d844986..12ca025 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95
- * $Id: tcp_subr.c,v 1.47 1998/09/06 08:17:35 phk Exp $
+ * $Id: tcp_subr.c,v 1.48 1998/11/15 21:35:09 guido Exp $
*/
#include "opt_compat.h"
@@ -348,7 +348,6 @@ tcp_close(tp)
register struct mbuf *nq;
struct inpcb *inp = tp->t_inpcb;
struct socket *so = inp->inp_socket;
- register struct mbuf *m;
register struct rtentry *rt;
int dosavessthresh;
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index d844986..12ca025 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95
- * $Id: tcp_subr.c,v 1.47 1998/09/06 08:17:35 phk Exp $
+ * $Id: tcp_subr.c,v 1.48 1998/11/15 21:35:09 guido Exp $
*/
#include "opt_compat.h"
@@ -348,7 +348,6 @@ tcp_close(tp)
register struct mbuf *nq;
struct inpcb *inp = tp->t_inpcb;
struct socket *so = inp->inp_socket;
- register struct mbuf *m;
register struct rtentry *rt;
int dosavessthresh;
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index ba0c012..9c00208 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* From: @(#)tcp_usrreq.c 8.2 (Berkeley) 1/3/94
- * $Id: tcp_usrreq.c,v 1.37 1998/01/27 09:15:11 davidg Exp $
+ * $Id: tcp_usrreq.c,v 1.38 1998/08/23 03:07:15 wollman Exp $
*/
#include "opt_tcpdebug.h"
@@ -575,7 +575,6 @@ tcp_ctloutput(so, sopt)
int error, opt, optval, s;
struct inpcb *inp;
struct tcpcb *tp;
- struct mbuf *m;
error = 0;
s = splnet(); /* XXX */
OpenPOWER on IntegriCloud