Module Name: src
Committed By: riastradh
Date: Wed Jan 20 22:02:54 UTC 2016
Modified Files:
src/sys/netinet: ip_var.h raw_ip.c
Log Message:
Give proper prototype to rip_output.
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/sys/netinet/ip_var.h
cvs rdiff -u -r1.153 -r1.154 src/sys/netinet/raw_ip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/ip_var.h
diff -u src/sys/netinet/ip_var.h:1.108 src/sys/netinet/ip_var.h:1.109
--- src/sys/netinet/ip_var.h:1.108 Thu Jun 4 09:20:00 2015
+++ src/sys/netinet/ip_var.h Wed Jan 20 22:02:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_var.h,v 1.108 2015/06/04 09:20:00 ozaki-r Exp $ */
+/* $NetBSD: ip_var.h,v 1.109 2016/01/20 22:02:54 riastradh Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -230,7 +230,7 @@ void * rip_ctlinput(int, const struct s
int rip_ctloutput(int, struct socket *, struct sockopt *);
void rip_init(void);
void rip_input(struct mbuf *, ...);
-int rip_output(struct mbuf *, ...);
+int rip_output(struct mbuf *, struct inpcb *);
int rip_usrreq(struct socket *,
int, struct mbuf *, struct mbuf *, struct mbuf *, struct lwp *);
Index: src/sys/netinet/raw_ip.c
diff -u src/sys/netinet/raw_ip.c:1.153 src/sys/netinet/raw_ip.c:1.154
--- src/sys/netinet/raw_ip.c:1.153 Mon Aug 24 22:21:26 2015
+++ src/sys/netinet/raw_ip.c Wed Jan 20 22:02:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip.c,v 1.153 2015/08/24 22:21:26 pooka Exp $ */
+/* $NetBSD: raw_ip.c,v 1.154 2016/01/20 22:02:54 riastradh Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.153 2015/08/24 22:21:26 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.154 2016/01/20 22:02:54 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -311,17 +311,11 @@ rip_ctlinput(int cmd, const struct socka
* Tack on options user may have setup with control call.
*/
int
-rip_output(struct mbuf *m, ...)
+rip_output(struct mbuf *m, struct inpcb *inp)
{
- struct inpcb *inp;
struct ip *ip;
struct mbuf *opts;
int flags;
- va_list ap;
-
- va_start(ap, m);
- inp = va_arg(ap, struct inpcb *);
- va_end(ap);
flags =
(inp->inp_socket->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST
