From: Marco G. <mar...@po...> - 2015-11-11 10:28:23
|
--- vde-2/src/lib/libvdeplug.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vde-2/src/lib/libvdeplug.c b/vde-2/src/lib/libvdeplug.c index 20cb2de..e5b3d6a 100644 --- a/vde-2/src/lib/libvdeplug.c +++ b/vde-2/src/lib/libvdeplug.c @@ -600,7 +600,7 @@ ssize_t vde_recv(VDECONN *conn,void *buf,size_t len,int flags) #ifdef CONNECTED_P2P ssize_t retval; if (__builtin_expect(conn!=0,1)) { - if (__builtin_expect(((retval=recv(conn->fddata,buf,len,0)) > 0), 1)) + if (__builtin_expect(((retval=recv(conn->fddata,buf,len,flags)) > 0), 1)) return retval; else { if (retval == 0 && conn->outsock != NULL) { @@ -616,7 +616,7 @@ ssize_t vde_recv(VDECONN *conn,void *buf,size_t len,int flags) } #else if (__builtin_expect(conn!=0,1)) - return recv(conn->fddata,buf,len,0); + return recv(conn->fddata,buf,len,flags); else { errno=EBADF; return -1; @@ -629,13 +629,13 @@ ssize_t vde_send(VDECONN *conn,const void *buf,size_t len,int flags) #ifdef CONNECTED_P2P if (__builtin_expect(conn!=0,1)) { ssize_t retval; - if (__builtin_expect(((retval=send(conn->fddata,buf,len,0)) >= 0),1)) + if (__builtin_expect(((retval=send(conn->fddata,buf,len,flags)) >= 0),1)) return retval; else { if (__builtin_expect(errno == ENOTCONN || errno == EDESTADDRREQ,0)) { if (__builtin_expect(conn->outsock != NULL,1)) { connect(conn->fddata, conn->outsock,conn->outlen); - return send(conn->fddata,buf,len,0); + return send(conn->fddata,buf,len,flags); } else return retval; } else @@ -648,9 +648,9 @@ ssize_t vde_send(VDECONN *conn,const void *buf,size_t len,int flags) #else if (__builtin_expect(conn!=0,1)) { if (__builtin_expect(conn->outsock == NULL,1)) - return send(conn->fddata,buf,len,0); + return send(conn->fddata,buf,len,flags); else - return sendto(conn->fddata,buf,len,0, + return sendto(conn->fddata,buf,len,flags, conn->outsock,conn->outlen); } else { errno=EBADF; -- 2.1.4 |