Revision: 588
          http://sourceforge.net/p/vde/svn/588
Author:   rd235
Date:     2017-03-23 07:11:19 +0000 (Thu, 23 Mar 2017)
Log Message:
-----------
bugfis: portgroup syntax err was deadlock: fixed.

Modified Paths:
--------------
    branches/rd235/vde-2/src/Makefile.am
    branches/rd235/vde-2/src/vde_plug.c
    branches/rd235/vde-2/src/vde_switch/port.c

Modified: branches/rd235/vde-2/src/Makefile.am
===================================================================
--- branches/rd235/vde-2/src/Makefile.am        2014-11-12 14:23:16 UTC (rev 
587)
+++ branches/rd235/vde-2/src/Makefile.am        2017-03-23 07:11:19 UTC (rev 
588)
@@ -18,6 +18,7 @@
        vdeterm
 
 #DIST_SUBDIRS = $(SUBDIRS) vdetaplib vde_cryptcab kvde_switch
+DIST_SUBDIRS = $(SUBDIRS) vdetaplib vde_cryptcab
 
 if CAN_MAKE_VDETUNCTL
   sbin_PROGRAMS = vde_tunctl

Modified: branches/rd235/vde-2/src/vde_plug.c
===================================================================
--- branches/rd235/vde-2/src/vde_plug.c 2014-11-12 14:23:16 UTC (rev 587)
+++ branches/rd235/vde-2/src/vde_plug.c 2017-03-23 07:11:19 UTC (rev 588)
@@ -193,7 +193,7 @@
        va_list args;
 
        if (isatty(STDERR_FILENO)) {
-               fprintf(stderr, "%s: Packet length error",myname);
+               fprintf(stderr, "%s: Packet length error ",myname);
                va_start(args, format);
                vfprintf(stderr, format, args);
                va_end(args);
@@ -480,7 +480,7 @@
                        /*fprintf(stderr,"%s: RECV %d %x %x 
\n",myname,nx,bufin[0],bufin[1]);*/
                        if (nx==0)
                                break;
-                               vdestream_recv(vdestream, bufin, nx);
+                       vdestream_recv(vdestream, bufin, nx);
                }
                if (pollv[1].revents & POLLIN) {
                        nx=vde_recv(conn,bufin,BUFSIZE-2,0);

Modified: branches/rd235/vde-2/src/vde_switch/port.c
===================================================================
--- branches/rd235/vde-2/src/vde_switch/port.c  2014-11-12 14:23:16 UTC (rev 
587)
+++ branches/rd235/vde-2/src/vde_switch/port.c  2017-03-23 07:11:19 UTC (rev 
588)
@@ -1506,15 +1506,20 @@
                if (*setup == ',') setup++;
                switch (*setup) {
                        case 'u':
+                       case 'U':
                                rv=portsetvlan_nocheck(portno,atoi(++setup));
                                break;
                        case 't':
+                       case 'T':
                                rv=vlanaddport_nocheck(portno,atoi(++setup));
                                break;
                        case 'q':
+                       case 'Q':
                                portv[portno]->flag |= ALLOWQINQ;
                                ++setup;
                                break;
+                       default:
+                               return EINVAL;
                }
                if (rv != 0) break;
                while (*setup && (*setup == ',' || isdigit(*setup)))

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
vde-users mailing list
vde-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vde-users

Reply via email to