Skip to content
Browse files

makes it compilable on freebsd5 with IGMPV3 option

  • Loading branch information...
1 parent 3cd1c0c commit 92d47c173d69062ec8dd422708f3a350b9731e26 suz committed
View
6 freebsd5/sys/netinet/igmp.c
@@ -1007,8 +1007,12 @@ igmp_sendbuf(m, ifp)
#else
imo.imo_multicast_loop = 0;
#endif
- ip_output(m, router_alert, &igmprt, 0, &imo);
+ ip_output(m, router_alert, &igmprt, 0, &imo
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
+ ,NULL
+#endif
+ );
++igmpstat.igps_snd_v3_reports;
}
View
1 freebsd5/sys/netinet/in_pcb.c
@@ -67,6 +67,7 @@
*/
#include "opt_ipsec.h"
+#include "opt_inet.h"
#include "opt_inet6.h"
#include <sys/param.h>
View
2 freebsd5/sys/netinet/in_var.h
@@ -271,7 +271,7 @@ struct route;
#ifdef IGMPV3
struct in_multi * in_addmulti(struct in_addr *, struct ifnet *,
u_int16_t, struct sockaddr_storage *, u_int, int, int *);
-void in_delmulti((struct in_multi *, u_int16_t,
+void in_delmulti(struct in_multi *, u_int16_t,
struct sockaddr_storage *, u_int, int, int *);
struct in_multi * in_modmulti(struct in_addr *, struct ifnet *, u_int16_t,
struct sockaddr_storage *, u_int, u_int16_t,
View
1 freebsd5/sys/netinet/udp_usrreq.c
@@ -72,6 +72,7 @@
*/
#include "opt_ipsec.h"
+#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_mac.h"
View
11 kame/sys/netinet/in_msf.c
@@ -2752,8 +2752,13 @@ sock_setmopt_srcfilter(sop, grpfp)
return EADDRNOTAVAIL;
ifp = ro.ro_rt->rt_ifp;
rtfree(ro.ro_rt);
- } else
+ } else {
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
+ ifp = ifnet_byindex(grpf->gf_interface);
+#else
ifp = ifindex2ifnet[grpf->gf_interface];
+#endif
+ }
if (ifp == NULL || (ifp->if_flags & IFF_MULTICAST) == 0)
return EADDRNOTAVAIL;
@@ -3161,7 +3166,11 @@ sock_getmopt_srcfilter(sop, grpfp)
if (grpf->gf_interface == 0)
ifp = NULL;
else {
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
+ ifp = ifnet_byindex(grpf->gf_interface);
+#else
ifp = ifindex2ifnet[grpf->gf_interface];
+#endif
if (ifp == NULL)
return EINVAL;
}
View
8 kame/sys/netinet6/mld6.c
@@ -1,4 +1,4 @@
-/* $KAME: mld6.c,v 1.75 2003/02/07 10:17:09 suz Exp $ */
+/* $KAME: mld6.c,v 1.76 2003/02/09 15:49:11 suz Exp $ */
/*
* Copyright (c) 2002 INRIA. All rights reserved.
@@ -1217,7 +1217,11 @@ mld_sendbuf(mh, ifp)
/* XXX: ToDo: create MLDv2 statistics field */
icmp6_ifstat_inc(ifp, ifs6_out_mldreport);
- ip6_output(mh, &ip6_opts, NULL, ia ? 0 : IPV6_UNSPECSRC, &im6o, NULL);
+ ip6_output(mh, &ip6_opts, NULL, ia ? 0 : IPV6_UNSPECSRC, &im6o, NULL
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
+ , NULL
+#endif
+ );
}

0 comments on commit 92d47c1

Please sign in to comment.
Something went wrong with that request. Please try again.