X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fvcom.c;h=82c65e854e038b6a179fe05bad4dd72cc10b3ca7;hb=c04cbf16ccfd9ef142937e4684af6093d812a866;hp=7558e775ed1f93139e124572e5d282b51f54a92c;hpb=8aaba56363f0cdf638f89c04f5110c24c5db1f3f;p=vpp.git

diff --git a/src/vcl/vcom.c b/src/vcl/vcom.c
index 7558e775ed1..82c65e854e0 100644
--- a/src/vcl/vcom.c
+++ b/src/vcl/vcom.c
@@ -1142,19 +1142,18 @@ socket (int domain, int type, int protocol)
       ((sock_type == SOCK_STREAM) || (sock_type == SOCK_DGRAM)))
     {
       int sid;
-      u32 vrf = VPPCOM_VRF_DEFAULT;
       u8 proto = ((sock_type == SOCK_DGRAM) ?
 		  VPPCOM_PROTO_UDP : VPPCOM_PROTO_TCP);
 
       func_str = "vppcom_session_create";
 
       if (VCOM_DEBUG > 0)
-	clib_warning ("LDP<%d>: : calling %s(): vrf %u, "
+	clib_warning ("LDP<%d>: : calling %s(): "
 		      "proto %u (%s), is_nonblocking %u",
-		      getpid (), func_str, vrf, proto,
+		      getpid (), func_str, proto,
 		      vppcom_proto_str (proto), is_nonblocking);
 
-      sid = vppcom_session_create (vrf, proto, is_nonblocking);
+      sid = vppcom_session_create (proto, is_nonblocking);
       if (sid < 0)
 	{
 	  errno = -sid;
@@ -1268,7 +1267,6 @@ bind (int fd, __CONST_SOCKADDR_ARG addr, socklen_t len)
 
       func_str = "vppcom_session_bind";
 
-      ep.vrf = VPPCOM_VRF_DEFAULT;
       switch (addr->sa_family)
 	{
 	case AF_INET:
@@ -1493,7 +1491,6 @@ connect (int fd, __CONST_SOCKADDR_ARG addr, socklen_t len)
 
       func_str = "vppcom_session_connect";
 
-      ep.vrf = VPPCOM_VRF_DEFAULT;
       switch (addr->sa_family)
 	{
 	case AF_INET:
@@ -1587,8 +1584,6 @@ getpeername (int fd, __SOCKADDR_ARG addr, socklen_t * __restrict len)
   if ((errno = -vcom_init ()))
     return -1;
 
-  clib_warning ("LDP<%d>: fd %d (0x%x) ", getpid (), fd, fd);
-
   if (sid != INVALID_SESSION_ID)
     {
       vppcom_endpt_t ep;
@@ -2021,7 +2016,6 @@ sendto (int fd, const void *buf, size_t n, int flags,
       if (addr)
 	{
 	  ep = &_ep;
-	  ep->vrf = VPPCOM_VRF_DEFAULT;
 	  switch (addr->sa_family)
 	    {
 	    case AF_INET:
@@ -2506,7 +2500,7 @@ getsockopt (int fd, int level, int optname,
 	      if (VCOM_DEBUG > 1)
 		clib_warning ("LDP<%d>: fd %d (0x%x): calling %s(): "
 			      "sid %u (0x%x), optlen %d",
-			      getpid (), fd, fd, func_str, sid, sid, *optlen);
+			      getpid (), fd, fd, func_str, sid, sid, buflen);
 	      rv = vppcom_session_attr (sid, VPPCOM_ATTR_GET_RX_FIFO_LEN,
 					optval, optlen);
 	      break;
@@ -3196,7 +3190,7 @@ vcom_epoll_pwait (int epfd, struct epoll_event *events,
 			  getpid (), epfd, epfd, func_str,
 			  libc_epfd, libc_epfd, events, maxevents, sigmask);
 
-	  rv = libc_epoll_pwait (epfd, events, maxevents, 1, sigmask);
+	  rv = libc_epoll_pwait (libc_epfd, events, maxevents, 1, sigmask);
 	  if (rv != 0)
 	    goto done;
 	}
@@ -3209,6 +3203,8 @@ vcom_epoll_pwait (int epfd, struct epoll_event *events,
 done:
   if (VCOM_DEBUG > 3)
     {
+      if (libc_epfd > 0)
+	epfd = libc_epfd;
       if (rv < 0)
 	{
 	  int errno_val = errno;