diff options
| author | Stef Walter <stef@memberwebs.com> | 2009-09-09 19:25:52 +0000 |
|---|---|---|
| committer | Stef Walter <stef@memberwebs.com> | 2009-09-09 19:25:52 +0000 |
| commit | b3ed25869949d6fc007ac66969738e11e117067f (patch) | |
| tree | 6172acac8c6091a2746d2c077daeb8f32666a4a2 | |
| parent | a394cf31344594e207bdb91ffcc3533169406add (diff) | |
Split patch properly
| -rw-r--r-- | kernel-8.0/freebsd-mcast-eaddrinuse.patch | 11 | ||||
| -rw-r--r-- | kernel-8.0/freebsd-mcast-eaddrnotavail.patch | 9 |
2 files changed, 0 insertions, 20 deletions
diff --git a/kernel-8.0/freebsd-mcast-eaddrinuse.patch b/kernel-8.0/freebsd-mcast-eaddrinuse.patch index b933672..e4eda22 100644 --- a/kernel-8.0/freebsd-mcast-eaddrinuse.patch +++ b/kernel-8.0/freebsd-mcast-eaddrinuse.patch @@ -9,14 +9,3 @@ + goto out_inp_locked; } else { inm = imo->imo_membership[idx]; -@@ -2139,6 +2143,9 @@ - } - -- if (!in_nullhost(gsa->sin.sin_addr)) -+ if (!in_nullhost(gsa->sin.sin_addr)) { - INADDR_TO_IFP(mreqs.imr_interface, ifp); -+ if (ifp == NULL) -+ return (EADDRNOTAVAIL); -+ } - - CTR3(KTR_IGMPV3, "%s: imr_interface = %s, ifp = %p", diff --git a/kernel-8.0/freebsd-mcast-eaddrnotavail.patch b/kernel-8.0/freebsd-mcast-eaddrnotavail.patch index b933672..707d118 100644 --- a/kernel-8.0/freebsd-mcast-eaddrnotavail.patch +++ b/kernel-8.0/freebsd-mcast-eaddrnotavail.patch @@ -1,14 +1,5 @@ --- sys/netinet/in_mcast.c.orig 2009-08-03 08:13:06.000000000 +0000 +++ sys/netinet/in_mcast.c 2009-09-09 01:35:06.000000000 +0000 -@@ -1964,4 +1964,8 @@ - if (idx == -1) { - is_new = 1; -+ } else if (sopt->sopt_name == IP_ADD_MEMBERSHIP) { -+ /* Trying to join the same Any-source group again. */ -+ error = EADDRINUSE; -+ goto out_inp_locked; - } else { - inm = imo->imo_membership[idx]; @@ -2139,6 +2143,9 @@ } |