xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nusb/ether: support for "bridge" ctl message

Browse source
This commit is contained in:
cinap_lenrek 2016-11-12 23:11:03 +01:00
parent c86b5ddaa6
commit fdc8187038
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
sys/src/cmd/nusb/ether/ether.c
View file

@ -69,6 +69,8 @@ struct Conn
int used; int used;
int type; int type;
int prom; int prom;
int bridge;
Dq *dq; Dq *dq;
}; };
@ -405,7 +407,9 @@ fswrite(Req *r)
case Qctl: case Qctl:
n = r->ifcall.count; n = r->ifcall.count;
p = (char*)r->ifcall.data; p = (char*)r->ifcall.data;
if(n == 11 && memcmp(p, "promiscuous", 11)==0){ if(n >= 6 && memcmp(p, "bridge", 6)==0){
conn[NUM(path)].bridge = 1;
} else if(n >= 11 && memcmp(p, "promiscuous", 11)==0){
if(conn[NUM(path)].prom == 0){ if(conn[NUM(path)].prom == 0){
conn[NUM(path)].prom = 1; conn[NUM(path)].prom = 1;
if(nprom++ == 0 && eppromiscuous != nil) if(nprom++ == 0 && eppromiscuous != nil)
@ -513,6 +517,7 @@ fsopen(Req *r)
if(c->used++ == 0){ if(c->used++ == 0){
c->type = 0; c->type = 0;
c->prom = 0; c->prom = 0;
c->bridge = 0;
} }
if(d != nil){ if(d != nil){
d->next = c->dq; d->next = c->dq;
@ -692,7 +697,7 @@ inote(void *, char *msg)
void void
etheriq(Block *b, int wire) etheriq(Block *b, int wire)
{ {
int i, t; int i, t, tome, fromme, multi;
Block *q; Block *q;
Conn *c; Conn *c;
Dq *d; Dq *d;
@ -706,17 +711,21 @@ etheriq(Block *b, int wire)
h = (Ehdr*)b->rp; h = (Ehdr*)b->rp;
t = (h->type[0]<<8)|h->type[1]; t = (h->type[0]<<8)|h->type[1];
multi = h->d[0]&1;
tome = memcmp(h->d, macaddr, sizeof(macaddr)) == 0;
fromme = memcmp(h->s, macaddr, sizeof(macaddr)) == 0;
for(i=0; i<nconn; i++){ for(i=0; i<nconn; i++){
c = &conn[i]; c = &conn[i];
qlock(c); qlock(c);
if(!c->used) if(!c->used)
goto next; goto next;
if(c->type > 0) if(c->bridge && !wire && !fromme)
if(c->type != t) goto next;
goto next; if(c->type > 0 && c->type != t)
if(!c->prom && !(h->d[0]&1)) goto next;
if(memcmp(h->d, macaddr, sizeof(macaddr))) if(!c->prom && !multi && !tome)
goto next; goto next;
for(d=c->dq; d; d=d->next){ for(d=c->dq; d; d=d->next){
if(d->size > 100000) if(d->size > 100000)
continue; continue;