diff options
| author | SUZUKI Shinsuke <suz@FreeBSD.org> | 2002-11-16 15:48:57 +0000 |
|---|---|---|
| committer | SUZUKI Shinsuke <suz@FreeBSD.org> | 2002-11-16 15:48:57 +0000 |
| commit | 2a7f2f999c1bf7148e4574a84c6fead4f4c6abe5 (patch) | |
| tree | 7e9c905aa16fb0c62659cb5e796c4d5df90823eb /net | |
| parent | Unbreak on -current. (diff) | |
fixed compilation error.
(sorry, I checked compilability just on KAME+FreeBSD)
Notes
Notes:
svn path=/head/; revision=70253
Diffstat (limited to 'net')
| -rw-r--r-- | net/pim6sd/files/patch-ad | 18 | ||||
| -rw-r--r-- | net/pim6sd/files/patch-ae | 33 |
2 files changed, 51 insertions, 0 deletions
diff --git a/net/pim6sd/files/patch-ad b/net/pim6sd/files/patch-ad new file mode 100644 index 000000000000..9d959db5cc68 --- /dev/null +++ b/net/pim6sd/files/patch-ad @@ -0,0 +1,18 @@ +--- pim6sd/mld6v2.h 5 Sep 2002 08:12:23 -0000 1.6 ++++ pim6sd/mld6v2.h 16 Nov 2002 15:14:01 -0000 +@@ -67,12 +67,10 @@ + #define nmcastrcd mldv2_hdr.icmp6_data16[1] + + struct mld_report_hdr { /* Multicast Report */ +- u_int8_t mld_type; /* Multicast Report Type */ +- u_int8_t mld_reserved1; /* Reserved */ +- u_int16_t mld_cksum; /* Checksum */ +- u_int16_t mld_reserved2; /* Reserved */ +- u_int16_t mld_grpnum; /* Number of Multicast Address Records */ ++ struct icmp6_hdr mld_icmp6_hdr; /* version & type of MLD message */ + }; ++ ++#define mld_grpnum mld_icmp6_hdr.icmp6_data16[1] + #endif + + #ifndef MLD_MINLEN diff --git a/net/pim6sd/files/patch-ae b/net/pim6sd/files/patch-ae new file mode 100644 index 000000000000..fc279a472aec --- /dev/null +++ b/net/pim6sd/files/patch-ae @@ -0,0 +1,33 @@ +--- pim6sd/mld6_proto.c Wed Oct 30 17:53:17 2002 ++++ pim6sd/mld6_proto.c Sun Nov 17 00:39:36 2002 +@@ -316,12 +316,14 @@ + inet6_fmt(group), v->uv_name); + return; + } ++#ifdef MLDV2_LISTENER_REPORT + if (v->uv_mld_version & MLDv2) { + log(LOG_DEBUG, 0, + "shift to MLDv1 compat-mode for %s on Mif %s", + inet6_fmt(group), v->uv_name); + mld_shift_to_v1mode(mifi, src, &group_sa); + } ++#endif + + IF_DEBUG(DEBUG_MLD) + log(LOG_DEBUG, 0, +@@ -517,6 +519,7 @@ + v->uv_ifindex, + MLD6_LAST_LISTENER_QUERY_INTERVAL, 0, 1); + break; ++#ifdef MLDV2_LISTENER_REPORT + case MLDv2: + default: + send_mld6v2(MLD_LISTENER_QUERY, 0, +@@ -526,6 +529,7 @@ + MLD6_QUERY_RESPONSE_INTERVAL, + 0, TRUE, SFLAGNO, v->uv_mld_robustness, + v->uv_mld_query_interval); ++#endif + break; + } + v->uv_out_mld_query++; |