mirror
/
openwrt-routing
mirror of https://git.openwrt.org/feed/routing.git
1
0
Fork 0
Code Releases Activity

Merge c246b4337b into 0fed081486

This commit is contained in:
rthakur33 2024-04-10 19:13:55 +08:00 committed by GitHub
parent 0fed081486 c246b4337b
commit 0c59c9e2e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
mcproxy/patches/0008-fix-igmpv3-mld-record-type.patch Normal file
View File

@ -0,0 +1,42 @@
--- a/mcproxy/src/proxy/igmp_sender.cpp
+++ b/mcproxy/src/proxy/igmp_sender.cpp
@@ -54,10 +54,14 @@ bool igmp_sender::send_record(unsigned int if_index, mc_filter filter_mode, cons
m_sock.leave_group(gaddr, if_index);
return true;
} else if (filter_mode == EXCLUDE_MODE || filter_mode == INCLUDE_MODE) {
- m_sock.join_group(gaddr, if_index);
std::list<addr_storage> src_list;
- for (auto & e : slist) {
- src_list.push_back(e.saddr);
+ if (slist.empty()) {
+ m_sock.join_group(gaddr, if_index);
+ } else {
+ for (auto & e : slist) {
+ m_sock.join_source_group(gaddr, addr_storage(e.saddr), if_index);
+ src_list.push_back(e.saddr);
+ }
}
return m_sock.set_source_filter(if_index, gaddr, filter_mode, src_list);
--- a/mcproxy/src/proxy/mld_sender.cpp
+++ b/mcproxy/src/proxy/mld_sender.cpp
@@ -55,11 +55,15 @@ bool mld_sender::send_record(unsigned int if_index, mc_filter filter_mode, const
if (filter_mode == INCLUDE_MODE && slist.empty() ) {
m_sock.leave_group(gaddr, if_index);
return true;
- } else if (filter_mode == EXCLUDE_MODE || filter_mode == EXCLUDE_MODE) {
- m_sock.join_group(gaddr, if_index);
+ } else if (filter_mode == EXCLUDE_MODE || filter_mode == INCLUDE_MODE) {
std::list<addr_storage> src_list;
- for (auto & e : slist) {
- src_list.push_back(e.saddr);
+ if ( slist.empty() ) {
+ m_sock.join_group(gaddr, if_index);
+ } else {
+ for (auto & e : slist) {
+ m_sock.join_source_group(gaddr, addr_storage(e.saddr), if_index);
+ src_list.push_back(e.saddr);
+ }
}
return m_sock.set_source_filter(if_index, gaddr, filter_mode, src_list);