Project

General

Profile

Download (6.99 KB)

Vde switch virtual network » vde2-2.3.1_colour.patch

updated patch from Martin Hundebøll - thx - Simon Wunderlich, 03/17/2011 03:17 PM

View differences:

vde2-2.3.1/src/vde_switch/port.c 2011-03-17 11:54:46.000000000 +0100
int fd_data;
struct endpoint *ep;
int flag;
int colour;
/* sender is already inside ms, but it needs one more memaccess */
int (*sender)(int fd, int fd_ctl, void *packet, int len, void *data, int port);
struct mod_support *ms;
......
EVENTOUT(DBGPORTNEW,i);
portv[i]=port;
port->colour=0;
port->fd_data=-1;
port->ep=NULL;
port->user=port->group=port->curuser=-1;
......
if (pflag & HUB_TAG) { /* this is a HUB */
register int i;
for(i = 1; i < numports; i++)
if((i != port) && (portv[i] != NULL))
if((i != port) && (portv[i] != NULL) && (!(pflag & COLOURFUL_TAG) || portv[i]->colour != portv[port]->colour))
SEND_PACKET_PORT(portv[i],i,packet,len);
} else { /* This is a switch, not a HUB! */
if (packet->header.proto[0] == 0x81 && packet->header.proto[1] == 0x00) {
......
if (tagged) {
register int i;
ba_FORALL(vlant[vlan].bctag,numports,
({if (i != port) SEND_PACKET_PORT(portv[i],i,packet,len);}),i);
({if (i != port && (!(pflag & COLOURFUL_TAG) || portv[i]->colour != portv[port]->colour)) SEND_PACKET_PORT(portv[i],i,packet,len);}),i);
packet=TAG2UNTAG(packet,len);
ba_FORALL(vlant[vlan].bcuntag,numports,
({if (i != port) SEND_PACKET_PORT(portv[i],i,packet,len);}),i);
({if (i != port && (!(pflag & COLOURFUL_TAG) || portv[i]->colour != portv[port]->colour)) SEND_PACKET_PORT(portv[i],i,packet,len);}),i);
} else { /* untagged */
register int i;
ba_FORALL(vlant[vlan].bcuntag,numports,
({if (i != port) SEND_PACKET_PORT(portv[i],i,packet,len);}),i);
({if (i != port && (!(pflag & COLOURFUL_TAG) || portv[i]->colour != portv[port]->colour)) SEND_PACKET_PORT(portv[i],i,packet,len);}),i);
packet=UNTAG2TAG(packet,vlan,len);
ba_FORALL(vlant[vlan].bctag,numports,
({if (i != port) SEND_PACKET_PORT(portv[i],i,packet,len);}),i);
({if (i != port && (!(pflag & COLOURFUL_TAG) || portv[i]->colour != portv[port]->colour)) SEND_PACKET_PORT(portv[i],i,packet,len);}),i);
}
}
else {
......
return; /*do not loop!*/
if (tagged) {
if (portv[tarport]->vlanuntag==vlan) { /* TAG->UNTAG */
packet = TAG2UNTAG(packet,len);
SEND_PACKET_PORT(portv[tarport],tarport,packet,len);
if (!(pflag & COLOURFUL_TAG) || portv[tarport]->colour != portv[port]->colour) {
packet = TAG2UNTAG(packet,len);
SEND_PACKET_PORT(portv[tarport],tarport,packet,len);
}
} else { /* TAG->TAG */
SEND_PACKET_PORT(portv[tarport],tarport,packet,len);
if (!(pflag & COLOURFUL_TAG) || portv[tarport]->colour != portv[port]->colour)
SEND_PACKET_PORT(portv[tarport],tarport,packet,len);
}
} else {
if (portv[tarport]->vlanuntag==vlan) { /* UNTAG->UNTAG */
SEND_PACKET_PORT(portv[tarport],tarport,packet,len);
if (!(pflag & COLOURFUL_TAG) || portv[tarport]->colour != portv[port]->colour)
SEND_PACKET_PORT(portv[tarport],tarport,packet,len);
} else { /* UNTAG->TAG */
packet = UNTAG2TAG(packet,vlan,len);
SEND_PACKET_PORT(portv[tarport],tarport,packet,len);
if (!(pflag & COLOURFUL_TAG) || portv[tarport]->colour != portv[port]->colour) {
packet = UNTAG2TAG(packet,vlan,len);
SEND_PACKET_PORT(portv[tarport],tarport,packet,len);
}
}
}
} /* if(BROADCAST) */
......
{
printoutc(fd,"Numports=%d",numports);
printoutc(fd,"HUB=%s",(pflag & HUB_TAG)?"true":"false");
printoutc(fd,"COLOURFUL=%s",(pflag & COLOURFUL_TAG)?"true":"false");
#ifdef PORTCOUNTERS
printoutc(fd,"counters=true");
#else
......
return close_ep(port,id);
}
static int portsetcolour(char *arg)
{
int port,colour;
if (sscanf(arg,"%i %i",&port,&colour) != 2)
return EINVAL;
if (port < 0 || port >= numports)
return EINVAL;
if (portv[port] == NULL)
return ENXIO;
portv[port]->colour= colour;
return 0;
}
static char *port_getuser(uid_t uid)
{
static char buf[6];
......
printoutc(fd," IN: pkts %10lld bytes %20lld",portv[i]->pktsin,portv[i]->bytesin);
printoutc(fd," OUT: pkts %10lld bytes %20lld",portv[i]->pktsout,portv[i]->bytesout);
#endif
printoutc(fd," colour: %10d",portv[i]->colour);
for (ep=portv[i]->ep; ep != NULL; ep=ep->next)
printoutc(fd," -- endpoint ID %04d module %-12s: %s",ep->fd_ctl,
portv[i]->ms->modname,(ep->descr)?ep->descr:"no endpoint description");
......
return 0;
}
static int portsetcolourful(int val)
{
if (val) {
portflag(P_SETFLAG,COLOURFUL_TAG);
} else
portflag(P_CLRFLAG,COLOURFUL_TAG);
return 0;
}
static int portsetvlan(char *arg)
{
int port,vlan;
......
{"port/setnumports","N","set the number of ports",portsetnumports,INTARG},
/*{"port/setmacaddr","MAC","set the switch MAC address",setmacaddr,STRARG},*/
{"port/sethub","0/1","1=HUB 0=switch",portsethub,INTARG},
{"port/setcolourful","0/1","1=colourful 0=no colour",portsetcolourful,INTARG},
{"port/setvlan","N VLAN","set port VLAN (untagged)",portsetvlan,STRARG},
{"port/createauto","","create a port with an automatically allocated id (inactive|notallocatable)",portcreateauto,NOARG|WITHFILE},
{"port/create","N","create the port N (inactive|notallocatable)",portcreate,INTARG},
......
{"port/allocatable","N 0/1","Is the port allocatable as unnamed? 1=Y 0=N",portallocatable,STRARG},
{"port/setuser","N user","access control: set user",portsetuser,STRARG},
{"port/setgroup","N user","access control: set group",portsetgroup,STRARG},
{"port/setcolour","N COLOUR","change colour of port",portsetcolour,STRARG},
{"port/epclose","N ID","remove the endpoint port N/id ID",epclose,STRARG},
#ifdef PORTCOUNTERS
{"port/resetcounter","[N]","reset the port (N) counters",portresetcounters,STRARG},
vde2-2.3.1/src/vde_switch/port.h 2011-03-17 11:54:46.000000000 +0100
#define P_CLRFLAG 3
#define HUB_TAG 0x1
#define COLOURFUL_TAG 0x2
void port_init(int numports);
(4-4/8)