Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
be43b29b
Commit
be43b29b
authored
Jun 23, 2003
by
David Stevens
Committed by
Hideaki Yoshifuji
Jun 23, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[IPV{4,6}]: Fix "slow multicast on 2.5.69" bug.
parent
b798ab6d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
10 deletions
+12
-10
net/ipv4/igmp.c
net/ipv4/igmp.c
+6
-6
net/ipv6/mcast.c
net/ipv6/mcast.c
+6
-4
No files found.
net/ipv4/igmp.c
View file @
be43b29b
...
@@ -2011,7 +2011,7 @@ int ip_mc_sf_allow(struct sock *sk, u32 loc_addr, u32 rmt_addr, int dif)
...
@@ -2011,7 +2011,7 @@ int ip_mc_sf_allow(struct sock *sk, u32 loc_addr, u32 rmt_addr, int dif)
break
;
break
;
}
}
if
(
!
pmc
)
if
(
!
pmc
)
return
0
;
return
1
;
psl
=
pmc
->
sflist
;
psl
=
pmc
->
sflist
;
if
(
!
psl
)
if
(
!
psl
)
return
pmc
->
sfmode
==
MCAST_EXCLUDE
;
return
pmc
->
sfmode
==
MCAST_EXCLUDE
;
...
@@ -2020,11 +2020,11 @@ int ip_mc_sf_allow(struct sock *sk, u32 loc_addr, u32 rmt_addr, int dif)
...
@@ -2020,11 +2020,11 @@ int ip_mc_sf_allow(struct sock *sk, u32 loc_addr, u32 rmt_addr, int dif)
if
(
psl
->
sl_addr
[
i
]
==
rmt_addr
)
if
(
psl
->
sl_addr
[
i
]
==
rmt_addr
)
break
;
break
;
}
}
if
(
pmc
->
sfmode
==
MCAST_INCLUDE
&&
i
<
psl
->
sl_count
)
if
(
pmc
->
sfmode
==
MCAST_INCLUDE
&&
i
>=
psl
->
sl_count
)
return
1
;
return
0
;
if
(
pmc
->
sfmode
==
MCAST_EXCLUDE
&&
i
>=
psl
->
sl_count
)
if
(
pmc
->
sfmode
==
MCAST_EXCLUDE
&&
i
<
psl
->
sl_count
)
return
1
;
return
0
;
return
0
;
return
1
;
}
}
/*
/*
...
...
net/ipv6/mcast.c
View file @
be43b29b
...
@@ -582,7 +582,7 @@ int inet6_mc_check(struct sock *sk, struct in6_addr *mc_addr,
...
@@ -582,7 +582,7 @@ int inet6_mc_check(struct sock *sk, struct in6_addr *mc_addr,
struct
ipv6_pinfo
*
np
=
inet6_sk
(
sk
);
struct
ipv6_pinfo
*
np
=
inet6_sk
(
sk
);
struct
ipv6_mc_socklist
*
mc
;
struct
ipv6_mc_socklist
*
mc
;
struct
ip6_sf_socklist
*
psl
;
struct
ip6_sf_socklist
*
psl
;
int
rv
=
0
;
int
rv
=
1
;
read_lock
(
&
ipv6_sk_mc_lock
);
read_lock
(
&
ipv6_sk_mc_lock
);
for
(
mc
=
np
->
ipv6_mc_list
;
mc
;
mc
=
mc
->
next
)
{
for
(
mc
=
np
->
ipv6_mc_list
;
mc
;
mc
=
mc
->
next
)
{
...
@@ -591,7 +591,7 @@ int inet6_mc_check(struct sock *sk, struct in6_addr *mc_addr,
...
@@ -591,7 +591,7 @@ int inet6_mc_check(struct sock *sk, struct in6_addr *mc_addr,
}
}
if
(
!
mc
)
{
if
(
!
mc
)
{
read_unlock
(
&
ipv6_sk_mc_lock
);
read_unlock
(
&
ipv6_sk_mc_lock
);
return
0
;
return
1
;
}
}
psl
=
mc
->
sflist
;
psl
=
mc
->
sflist
;
if
(
!
psl
)
{
if
(
!
psl
)
{
...
@@ -603,8 +603,10 @@ int inet6_mc_check(struct sock *sk, struct in6_addr *mc_addr,
...
@@ -603,8 +603,10 @@ int inet6_mc_check(struct sock *sk, struct in6_addr *mc_addr,
if
(
ipv6_addr_cmp
(
&
psl
->
sl_addr
[
i
],
src_addr
)
==
0
)
if
(
ipv6_addr_cmp
(
&
psl
->
sl_addr
[
i
],
src_addr
)
==
0
)
break
;
break
;
}
}
rv
=
(
mc
->
sfmode
==
MCAST_INCLUDE
&&
i
<
psl
->
sl_count
);
if
(
mc
->
sfmode
==
MCAST_INCLUDE
&&
i
>=
psl
->
sl_count
);
rv
|=
(
mc
->
sfmode
==
MCAST_EXCLUDE
&&
i
>=
psl
->
sl_count
);
rv
=
0
;
if
(
mc
->
sfmode
==
MCAST_EXCLUDE
&&
i
<
psl
->
sl_count
);
rv
=
0
;
}
}
read_unlock
(
&
ipv6_sk_mc_lock
);
read_unlock
(
&
ipv6_sk_mc_lock
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment