X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/blobdiff_plain/1f2de5d41c9be614e9a1cba7cf16de309a2ea210..e4700d005037e3f4546b85da39ea8640598c5d1a:/sys/netproto/key/keysock.c

diff --git a/sys/netproto/key/keysock.c b/sys/netproto/key/keysock.c
index f081327984..85a73a7e10 100644
--- a/sys/netproto/key/keysock.c
+++ b/sys/netproto/key/keysock.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/netkey/keysock.c,v 1.1.2.4 2003/01/11 19:10:59 ume Exp $	*/
-/*	$DragonFly: src/sys/netproto/key/keysock.c,v 1.5 2003/08/07 21:17:37 dillon Exp $	*/
+/*	$DragonFly: src/sys/netproto/key/keysock.c,v 1.8 2004/03/05 16:57:16 hsu Exp $	*/
 /*	$KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $	*/
 
 /*
@@ -65,7 +65,7 @@
 struct sockaddr key_dst = { 2, PF_KEY, };
 struct sockaddr key_src = { 2, PF_KEY, };
 
-static int key_sendup0 __P((struct rawcb *, struct mbuf *, int));
+static int key_sendup0 (struct rawcb *, struct mbuf *, int);
 
 struct pfkeystat pfkeystat;
 
@@ -73,23 +73,17 @@ struct pfkeystat pfkeystat;
  * key_output()
  */
 int
-#if __STDC__
 key_output(struct mbuf *m, ...)
-#else
-key_output(m, va_alist)
-	struct mbuf *m;
-	va_dcl
-#endif
 {
 	struct sadb_msg *msg;
 	int len, error = 0;
 	int s;
 	struct socket *so;
-	va_list ap;
+	__va_list ap;
 
-	va_start(ap, m);
-	so = va_arg(ap, struct socket *);
-	va_end(ap);
+	__va_start(ap, m);
+	so = __va_arg(ap, struct socket *);
+	__va_end(ap);
 
 	if (m == 0)
 		panic("key_output: NULL pointer was passed.\n");
@@ -393,7 +387,7 @@ key_abort(struct socket *so)
  * derived from net/rtsock.c:rts_attach()
  */
 static int
-key_attach(struct socket *so, int proto, struct thread *td)
+key_attach(struct socket *so, int proto, struct pru_attach_info *ai)
 {
 	struct keycb *kp;
 	int s, error;
@@ -414,7 +408,7 @@ key_attach(struct socket *so, int proto, struct thread *td)
 	 */
 	s = splnet();
 	so->so_pcb = (caddr_t)kp;
-	error = raw_usrreqs.pru_attach(so, proto, td);
+	error = raw_usrreqs.pru_attach(so, proto, ai);
 	kp = (struct keycb *)sotorawcb(so);
 	if (error) {
 		free(kp, M_PCB);