Browse files

make it compile

  • Loading branch information...
1 parent 555b750 commit 5a15c469c12bf66c6af453407bb119e861666984 itojun committed Oct 28, 2004
Showing with 10 additions and 4 deletions.
  1. +2 −3 kame/sys/netinet/dccp_tcplike.c
  2. +8 −1 kame/sys/netinet6/dccp6_usrreq.c
View
5 kame/sys/netinet/dccp_tcplike.c
@@ -1,4 +1,4 @@
-/* $KAME: dccp_tcplike.c,v 1.14 2004/10/28 04:27:23 itojun Exp $ */
+/* $KAME: dccp_tcplike.c,v 1.15 2004/10/28 04:33:26 itojun Exp $ */
/*
* Copyright (c) 2003 Magnus Erixzon
@@ -366,7 +366,6 @@ int tcplike_send_packet(void *ccb, long datasize)
timeout_set(&cb->rto_timer, tcplike_rto_timeout,
(void *)cb);
timeout_add(&cb->rto_timer, ticks);
- tcplike_rto_timeout, (void *)cb);
#else
callout_reset(&cb->rto_timer, ticks,
tcplike_rto_timeout, (void *)cb);
@@ -918,7 +917,7 @@ void *tcplike_recv_init(struct dccpcb *pcb)
#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
callout_init(&ccb->free_timer, 0);
#elif defined(__OpenBSD__)
-#endif
+#else
callout_init(&ccb->free_timer);
#endif
View
9 kame/sys/netinet6/dccp6_usrreq.c
@@ -1,4 +1,4 @@
-/* $KAME: dccp6_usrreq.c,v 1.6 2004/02/11 20:11:52 itojun Exp $ */
+/* $KAME: dccp6_usrreq.c,v 1.7 2004/10/28 04:33:26 itojun Exp $ */
/*
* Copyright (C) 2003 WIDE Project.
@@ -312,8 +312,15 @@ dccp6_connect(struct socket *so, struct mbuf *m, struct proc *td)
if (error != 0)
goto bad;
+#ifdef __OpenBSD__
+ timeout_set(&dp->retrans_timer, dccp_retrans_t, dp);
+ timeout_add(&dp->retrans_timer, dp->retrans);
+ timeout_set(&dp->connect_timer, dccp_connect_t, dp);
+ timeout_add(&dp->connect_timer, DCCP_CONNECT_TIMER);
+#else
callout_reset(&dp->retrans_timer, dp->retrans, dccp_retrans_t, dp);
callout_reset(&dp->connect_timer, DCCP_CONNECT_TIMER, dccp_connect_t, dp);
+#endif
test[0] = dp->pref_cc;
/* FIX THIS LATER */

0 comments on commit 5a15c46

Please sign in to comment.