Re: [Qemu-devel] [patch] problems with dual ethernet networking

[renzo@cs.unibo.it (Renzo Davoli)]

[-- Attachment #1: Type: text/plain, Size: 1078 bytes --]

On Wed, Nov 03, 2004 at 10:35:53AM +0100, Renzo Davoli wrote:
> Actually, it was implemented in qemu and vdeq used the multiple  
> -tun-fd  option provided bu qemu.
> 
qemu has changed recently the option management, now it wants multiple 
-tun-fd options for several tun interfaces (previously it accepted several 
comma separated numbers).

I have just committed on cvs an updated version of vde that should be able 
to work with multiple interfaces.
the -nics option should not be needed.

Sourceforge sometimes is late in updating the public access cvs, thus I
am sending here enclosed the patch for vdeq.c.

I have had no time to test it personally, please let me know if it works
correctly.

BTW: if you are connecting also several qemu machines on the same vde
network remember to change the MAC addresses!
The default configuration MAC is 52:54:00:12:34:56. (for eth0,
52:54:00:12:34:57 for eth1 etc.).
Several machines on the same network using the standard configuration 
end up having the same MAC: networking does not work. i.e. it is a 
net-does-not-work.


renzo

[-- Attachment #2: vdeq.diff --]
[-- Type: text/plain, Size: 1556 bytes --]

--- vde-1.5.7/qemu/vdeq.c	2004-11-03 12:57:35.185373176 +0100
+++ vde-1.5.8/qemu/vdeq.c	2004-11-03 13:11:43.333435072 +0100
@@ -78,12 +78,10 @@
 
 unsigned char bufin[BUFSIZE];
 
-//struct pollfd pollv[]={{STDIN_FILENO,POLLIN|POLLHUP,0},{0,POLLIN|POLLHUP,0}};
 struct pollfd *pollv;
 
 char *filename;
 char *vdeqname;
-char *numfd;
 #define NUMW 10
 
 static int countnics(const char *s)
@@ -169,19 +167,12 @@
 	  perror("malloc nics");
 	  exit(1);
   }
-  if ((numfd= (char *) malloc(nb_nics * NUMW * sizeof (char)))<0) {
-	  perror("malloc numfd");
-	  exit(1);
-  }
 
   for (i=0; i<nb_nics; i++) {
-	char curfd[NUMW];
   	if (socketpair(AF_UNIX, SOCK_DGRAM, 0, sp[i]) < 0){
 	  	perror("socketpair");
 	  	exit(1);
 	}
-	snprintf(curfd,NUMW,"%d%c",sp[i][0],(i<nb_nics-1)?',':0);
-	strcat(numfd,curfd);
   }
 
   if ((sockname= (char **) malloc(sizeof(char *) * nb_nics))<0) {
@@ -207,17 +198,21 @@
   printf("as %s\n",argsock);
 	    for (i=0; i<nb_nics; i++)
 		    printf("%d -> %s\n",i,sockname[i]); */
-  newargc=argc+3-args;
+  newargc=argc+1+(2*nb_nics)-args;
   if ((newargv=(char **) malloc ((newargc+1)* sizeof(char *))) <0) {
 	  perror("malloc");
 	  exit(1);
   }
 
   newargv[0]=filename;
-  newargv[1]="-tun-fd";
-  newargv[2]=numfd;
+  for (i=0; i<nb_nics; i++) {
+	char numfd[10];
+	sprintf(numfd,"%d",sp[i][0]);
+  	newargv[2*i+1]="-tun-fd";
+  	newargv[2*i+2]=strdup(numfd);
+  }
    
-  for (i=3;args<argc;i++,args++) newargv[i]=argv[args];
+  for (i=(2*nb_nics)+1;args<argc;i++,args++) newargv[i]=argv[args];
 
   newargv[i]=0;