Revision: 553
http://vde.svn.sourceforge.net/vde/?rev=553&view=rev
Author: rd235
Date: 2012-08-03 15:01:30 +0000 (Fri, 03 Aug 2012)
Log Message:
-----------
some bugfixes (including 3548041)
Modified Paths:
--------------
trunk/vde-2/src/vde_pcapplug.c
trunk/vde-2/src/vde_plug.c
trunk/vde-2/src/vde_plug2tap.c
trunk/vde-2/src/vdeterm.c
Modified: trunk/vde-2/src/vde_pcapplug.c
===================================================================
--- trunk/vde-2/src/vde_pcapplug.c 2012-07-15 15:33:09 UTC (rev 552)
+++ trunk/vde-2/src/vde_pcapplug.c 2012-08-03 15:01:30 UTC (rev 553)
@@ -259,7 +259,6 @@
static char *sockname=NULL;
static char *ifname=NULL;
int daemonize=0;
- int result;
char errbuf[PCAP_ERRBUF_SIZE];
int pcapfd;
register ssize_t nx;
@@ -332,6 +331,13 @@
exit(1);
}
strcat(pidfile_path, "/");
+
+ conn=vde_open(sockname,"vde_pcapplug:",&open_args);
+ if (conn == NULL) {
+ printlog(LOG_ERR,"vde_open %s:
%s",sockname?sockname:"DEF_SWITCH",strerror(errno));
+ exit(1);
+ }
+
if (daemonize && daemon(0, 0)) {
printlog(LOG_ERR,"daemon: %s",strerror(errno));
exit(1);
@@ -365,16 +371,12 @@
}
setup_fd(pcapfd);
- conn=vde_open(sockname,"vde_pcapplug:",&open_args);
- if (conn == NULL)
- exit(1);
-
pollv[0].fd=pcapfd;
pollv[1].fd=vde_datafd(conn);
pollv[2].fd=vde_ctlfd(conn);
for(;;) {
- result=poll(pollv,3,-1);
+ poll(pollv,3,-1);
if ((pollv[0].revents | pollv[1].revents | pollv[2].revents) &
POLLHUP ||
pollv[2].revents & POLLIN)
break;
Modified: trunk/vde-2/src/vde_plug.c
===================================================================
--- trunk/vde-2/src/vde_plug.c 2012-07-15 15:33:09 UTC (rev 552)
+++ trunk/vde-2/src/vde_plug.c 2012-08-03 15:01:30 UTC (rev 553)
@@ -373,8 +373,10 @@
atexit(cleanup);
setsighandlers();
conn=vde_open(sockname,"vde_plug:",&open_args);
- if (conn == NULL)
+ if (conn == NULL) {
+ fprintf(stderr,"vde_open %s:
%s\n",sockname?sockname:"DEF_SWITCH",strerror(errno));
exit(1);
+ }
vdestream=vdestream_open(conn,STDOUT_FILENO,vdeplug_recv,vdeplug_err);
Modified: trunk/vde-2/src/vde_plug2tap.c
===================================================================
--- trunk/vde-2/src/vde_plug2tap.c 2012-07-15 15:33:09 UTC (rev 552)
+++ trunk/vde-2/src/vde_plug2tap.c 2012-08-03 15:01:30 UTC (rev 553)
@@ -344,9 +344,11 @@
pollv[0].fd=tapfd;
if (sockname==NULL || strcmp(sockname,"-") != 0) {
- conn=vde_open(sockname,"vde_plug:",&open_args);
- if (conn == NULL)
+ conn=vde_open(sockname,"vde_plug2tap:",&open_args);
+ if (conn == NULL) {
+ printlog(LOG_ERR,"vde_open %s:
%s",sockname?sockname:"DEF_SWITCH",strerror(errno));
exit(1);
+ }
pollv[1].fd=vde_datafd(conn);
pollv[2].fd=vde_ctlfd(conn);
npollv=3;
Modified: trunk/vde-2/src/vdeterm.c
===================================================================
--- trunk/vde-2/src/vdeterm.c 2012-07-15 15:33:09 UTC (rev 552)
+++ trunk/vde-2/src/vdeterm.c 2012-08-03 15:01:30 UTC (rev 553)
@@ -116,6 +116,7 @@
//static int fileout[]={STDOUT_FILENO,STDOUT_FILENO};
struct vdehiststat *vdehst;
setsighandlers();
+ tcgetattr(STDIN_FILENO,&tiop);
atexit(cleanup);
sun.sun_family=PF_UNIX;
snprintf(sun.sun_path,sizeof(sun.sun_path),"%s",argv[1]);
@@ -128,7 +129,6 @@
perror("Socket connecting error");
exit(-1);
}
- tcgetattr(STDIN_FILENO,&tiop);
newtiop=tiop;
newtiop.c_cc[VMIN]=1;
newtiop.c_cc[VTIME]=0;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
vde-users mailing list
vde-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vde-users
