Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixed a compilation error with carp on freebsd5

  • Loading branch information...
commit f45d38f579a364d6d585095e72c7153a3c5ee4d8 1 parent 84069c6
suz authored
Showing with 13 additions and 3 deletions.
  1. +4 −2 freebsd5/sys/netinet/ip_carp.c
  2. +9 −1 kame/sys/netinet6/in6.c
View
6 freebsd5/sys/netinet/ip_carp.c
@@ -74,9 +74,11 @@
#ifdef INET6
#include <netinet/icmp6.h>
+#include <netinet6/in6_var.h>
#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
#include <netinet6/nd6.h>
+#include <netinet6/scope6_var.h>
#include <net/if_dl.h>
#endif
@@ -1579,7 +1581,7 @@ carp_set_addr6(struct carp_softc *sc, struct sockaddr_in6 *sin6)
in6.s6_addr8[15] = 0x12;
if (in6_setscope(&in6, ifp, NULL) != 0)
goto cleanup;
- if ((imm = in6_joingroup(ifp, &in6, &error)) == NULL)
+ if ((imm = in6_joingroup(ifp, &in6, &error, 0)) == NULL)
goto cleanup;
LIST_INSERT_HEAD(&im6o->im6o_memberships, imm, i6mm_chain);
@@ -1592,7 +1594,7 @@ carp_set_addr6(struct carp_softc *sc, struct sockaddr_in6 *sin6)
in6.s6_addr8[12] = 0xff;
if (in6_setscope(&in6, ifp, NULL) != 0)
goto cleanup;
- if ((imm = in6_joingroup(ifp, &in6, &error)) == NULL)
+ if ((imm = in6_joingroup(ifp, &in6, &error, 0)) == NULL)
goto cleanup;
LIST_INSERT_HEAD(&im6o->im6o_memberships, imm, i6mm_chain);
}
View
10 kame/sys/netinet6/in6.c
@@ -1,4 +1,4 @@
-/* $KAME: in6.c,v 1.399 2005/10/22 04:39:21 suz Exp $ */
+/* $KAME: in6.c,v 1.400 2005/10/23 12:15:18 suz Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -289,7 +289,11 @@ in6_ifloop_request(int cmd, struct ifaddr *ifa)
* rely on the cloning mechanism from the corresponding interface route
* any more.
*/
+#ifdef __FreeBSD__
+void
+#else
static void
+#endif
in6_ifaddloop(struct ifaddr *ifa)
{
struct rtentry *rt;
@@ -316,7 +320,11 @@ in6_ifaddloop(struct ifaddr *ifa)
* Remove loopback rtentry of ownaddr generated by in6_ifaddloop(),
* if it exists.
*/
+#ifdef __FreeBSD__
+void
+#else
static void
+#endif
in6_ifremloop(struct ifaddr *ifa)
{
struct in6_ifaddr *ia;
Please sign in to comment.
Something went wrong with that request. Please try again.