Make net/pim6sd compile again under -current.

Noticed on bento.
This commit is contained in:
Edwin Groothuis 2002-11-19 02:42:37 +00:00
parent bdaf558d2d
commit 95f1ea79f0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=70450
11 changed files with 104 additions and 4 deletions

View File

@ -0,0 +1,10 @@
--- pim6sd/cfparse.y.orig Tue Nov 19 03:27:18 2002
+++ pim6sd/cfparse.y Tue Nov 19 03:27:33 2002
@@ -31,6 +31,7 @@
%{
#include <sys/types.h>
#include <sys/socket.h>
+#include <sys/param.h>
#include <net/if.h>
#include <net/route.h>
#include <netinet/in.h>

View File

@ -0,0 +1,10 @@
--- pim6sd/config.c Tue Nov 19 03:16:55 2002
+++ pim6sd/config.c Tue Nov 19 03:15:44 2002
@@ -66,6 +66,7 @@
#endif
#include <net/route.h>
#include <netinet/in.h>
+#include <sys/param.h>
#include <netinet6/ip6_mroute.h>
#include <netinet6/in6_var.h>
#include <arpa/inet.h>

View File

@ -0,0 +1,11 @@
--- pim6sd/mld6.c Tue Nov 19 03:13:59 2002
+++ pim6sd/mld6.c Tue Nov 19 03:13:46 2002
@@ -117,7 +117,7 @@
/* Externals */
-extern struct in6_addr in6addr_linklocal_allnodes;
+//extern struct in6_addr in6addr_linklocal_allnodes;
/* local variables. */
static struct sockaddr_in6 dst = {sizeof(dst), AF_INET6};

View File

@ -1,5 +1,14 @@
--- pim6sd/mld6_proto.c Wed Oct 30 17:53:17 2002
+++ pim6sd/mld6_proto.c Sun Nov 17 00:39:36 2002
--- pim6sd/mld6_proto.c Tue Nov 19 03:15:12 2002
+++ pim6sd/mld6_proto.c Wed Oct 30 09:53:17 2002
@@ -120,7 +120,7 @@
#include "mld6_proto.h"
-extern struct in6_addr in6addr_any;
+//extern struct in6_addr in6addr_any;
/*
@@ -316,12 +316,14 @@
inet6_fmt(group), v->uv_name);
return;
@ -15,7 +24,7 @@
IF_DEBUG(DEBUG_MLD)
log(LOG_DEBUG, 0,
@@ -517,6 +519,7 @@
@@ -519,6 +517,7 @@
v->uv_ifindex,
MLD6_LAST_LISTENER_QUERY_INTERVAL, 0, 1);
break;
@ -23,7 +32,7 @@
case MLDv2:
default:
send_mld6v2(MLD_LISTENER_QUERY, 0,
@@ -526,6 +529,7 @@
@@ -529,6 +526,7 @@
MLD6_QUERY_RESPONSE_INTERVAL,
0, TRUE, SFLAGNO, v->uv_mld_robustness,
v->uv_mld_query_interval);

View File

@ -0,0 +1,10 @@
--- pim6sd/mrt.c Tue Nov 19 03:18:42 2002
+++ pim6sd/mrt.c Tue Nov 19 03:18:26 2002
@@ -48,6 +48,7 @@
#include <sys/types.h>
#include <sys/socket.h>
+#include <sys/param.h>
#include <net/if.h>
#include <net/route.h>
#include <netinet/in.h>

View File

@ -0,0 +1,10 @@
--- pim6sd/pim6_proto.c Tue Nov 19 03:19:39 2002
+++ pim6sd/pim6_proto.c Tue Nov 19 03:19:11 2002
@@ -103,6 +103,7 @@
*/
#include <sys/types.h>
+#include <sys/param.h>
#include <sys/socket.h>
#include <net/if.h>
#include <net/route.h>

View File

@ -0,0 +1,10 @@
--- pim6sd/route.c Tue Nov 19 03:17:26 2002
+++ pim6sd/route.c Tue Nov 19 03:17:09 2002
@@ -48,6 +48,7 @@
#include <sys/types.h>
#include <sys/socket.h>
+#include <sys/param.h>
#include <net/if.h>
#include <net/route.h>
#include <netinet/in.h>

View File

@ -0,0 +1,10 @@
--- pim6sd/rp.c Tue Nov 19 03:20:02 2002
+++ pim6sd/rp.c Tue Nov 19 03:19:50 2002
@@ -76,6 +76,7 @@
#include <sys/types.h>
#include <sys/socket.h>
+#include <sys/param.h>
#include <net/if.h>
#include <net/route.h>
#include <netinet/in.h>

View File

@ -0,0 +1,10 @@
--- pim7sd/trace.c Tue Nov 19 03:20:24 2002
+++ pim6sd/trace.c Tue Nov 19 03:20:12 2002
@@ -69,6 +69,7 @@
#include <sys/types.h>
#include <sys/socket.h>
+#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/uio.h>
#include <sys/queue.h>

View File

@ -0,0 +1,10 @@
--- pim6sd/vif.c Tue Nov 19 03:18:11 2002
+++ pim6sd/vif.c Tue Nov 19 03:17:44 2002
@@ -58,6 +58,7 @@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
+#include <sys/param.h>
#include <net/if.h>
#include <net/route.h>
#include <netinet/in.h>