d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a problem with multiple-delivery (i.e. broadcast) in ng_bridge.

Browse Source 
Only the first link0..link$NLINKS hooks would be utilized, whereas
the link hooks may be connected sparsely.

Add a counter variable so that the link hook array is only traversed
while there is still work to do, but that it continues up to the end
if it has to.
This commit is contained in:
Brian Feldman 2004-06-22 18:56:47 +00:00
parent 1b699be2e1
commit 114bf09149
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/netgraph/ng_bridge.c
View File

@ -517,7 +517,7 @@ ng_bridge_rcvdata(hook_p hook, item_p item)
struct ng_bridge_host *host;
struct ng_bridge_link *link;
struct ether_header *eh;
int error = 0, linkNum;
int error = 0, linkNum, linksSeen;
int manycast;
struct mbuf *m;
meta_p meta;
@ -668,7 +668,7 @@ ng_bridge_rcvdata(hook_p hook, item_p item)
/* Distribute unknown, multicast, broadcast pkts to all other links */
meta = NGI_META(item); /* peek.. */
firstLink = NULL;
for (linkNum = 0; linkNum <= priv->numLinks; linkNum++) {
for (linkNum = linksSeen = 0; linksSeen <= priv->numLinks; linkNum++) {
struct ng_bridge_link *destLink;
meta_p meta2 = NULL;
struct mbuf *m2 = NULL;
@ -677,7 +677,7 @@ ng_bridge_rcvdata(hook_p hook, item_p item)
* If we have checked all the links then now
* send the original on its reserved link
*/
if (linkNum == priv->numLinks) {
if (linksSeen == priv->numLinks) {
/* If we never saw a good link, leave. */
if (firstLink == NULL) {
NG_FREE_ITEM(item);
@ -687,6 +687,8 @@ ng_bridge_rcvdata(hook_p hook, item_p item)
destLink = firstLink;
} else {
destLink = priv->links[linkNum];
if (destLink != NULL)
linksSeen++;
/* Skip incoming link and disconnected links */
if (destLink == NULL || destLink == link) {
continue;