X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fvppcom.c;h=29e5a108d0e9b466caf05d956756191bca16375d;hb=refs%2Fchanges%2F09%2F10109%2F17;hp=aa149b76a9b492ce3ec3bfc4f0e5e8b1ed455854;hpb=9b95425de61d9f1c4b8bb7490b1250ac03fd8243;p=vpp.git

diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c
index aa149b76a9b..29e5a108d0e 100644
--- a/src/vcl/vppcom.c
+++ b/src/vcl/vppcom.c
@@ -1633,7 +1633,6 @@ vppcom_session_disconnect (u32 session_index)
     {
       if (is_server)
 	{
-	  svm_fifo_segment_main_t *sm = &svm_fifo_segment_main;
 	  svm_fifo_segment_private_t *seg;
 
 	  VCL_LOCK_AND_GET_SESSION (session_index, &session);
@@ -1649,7 +1648,7 @@ vppcom_session_disconnect (u32 session_index)
 			  session->server_tx_fifo,
 			  session->server_tx_fifo->refcnt);
 
-	  seg = vec_elt_at_index (sm->segments, session->sm_seg_index);
+	  seg = svm_fifo_segment_get_segment (session->sm_seg_index);
 	  svm_fifo_segment_free_fifo (seg, session->server_rx_fifo,
 				      FIFO_SEGMENT_RX_FREELIST);
 	  svm_fifo_segment_free_fifo (seg, session->server_tx_fifo,
@@ -5067,6 +5066,25 @@ vppcom_session_attr (uint32_t session_index, uint32_t op,
 			  VCL_SESS_ATTR_TEST (session->attr,
 					      VCL_SESS_ATTR_BROADCAST),
 			  *buflen);
+	  if (VPPCOM_DEBUG > 0)
+	    {
+	      /* *INDENT-OFF* */
+	      ELOG_TYPE_DECLARE (e) =
+		{
+		  .format = "VPPCOM_ATTR_SET_BROADCAST: %d buflen=%d",
+		  .format_args = "i4i4",
+		};
+
+	      struct {
+		u32 data[2];
+	      } * ed;
+
+	      ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
+	      ed->data[0] = VCL_SESS_ATTR_TEST (session->attr,
+						VCL_SESS_ATTR_BROADCAST);
+	      ed->data[1] = *buflen;
+	      /* *INDENT-ON* */
+	    }
 	}
       else
 	rv = VPPCOM_EINVAL;
@@ -5084,6 +5102,24 @@ vppcom_session_attr (uint32_t session_index, uint32_t op,
 	    clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_V6ONLY: %d, "
 			  "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer,
 			  *buflen);
+	  if (VPPCOM_DEBUG > 0)
+	    {
+	      /* *INDENT-OFF* */
+	      ELOG_TYPE_DECLARE (e) =
+		{
+		  .format = "VPPCOM_ATTR_GET_V6ONLY: %d buflen=%d",
+		  .format_args = "i4i4",
+		};
+
+	      struct {
+		u32 data[2];
+	      } * ed;
+
+	      ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
+	      ed->data[0] = *(int *) buffer;
+	      ed->data[1] = *buflen;
+	      /* *INDENT-ON* */
+	    }
 	}
       else
 	rv = VPPCOM_EINVAL;
@@ -5103,6 +5139,25 @@ vppcom_session_attr (uint32_t session_index, uint32_t op,
 			  "buflen %d, #VPP-TBD#", getpid (),
 			  VCL_SESS_ATTR_TEST (session->attr,
 					      VCL_SESS_ATTR_V6ONLY), *buflen);
+	  if (VPPCOM_DEBUG > 0)
+	    {
+	      /* *INDENT-OFF* */
+	      ELOG_TYPE_DECLARE (e) =
+		{
+		  .format = "VPPCOM_ATTR_SET_V6ONLY: %d buflen=%d",
+		  .format_args = "i4i4",
+		};
+
+	      struct {
+		u32 data[2];
+	      } * ed;
+
+	      ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
+	      ed->data[0] = VCL_SESS_ATTR_TEST (session->attr,
+						VCL_SESS_ATTR_V6ONLY);
+	      ed->data[1] = *buflen;
+	      /* *INDENT-ON* */
+	    }
 	}
       else
 	rv = VPPCOM_EINVAL;
@@ -5120,6 +5175,24 @@ vppcom_session_attr (uint32_t session_index, uint32_t op,
 	    clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_KEEPALIVE: %d, "
 			  "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer,
 			  *buflen);
+	  if (VPPCOM_DEBUG > 0)
+	    {
+	      /* *INDENT-OFF* */
+	      ELOG_TYPE_DECLARE (e) =
+		{
+		  .format = "VPPCOM_ATTR_GET_KEEPALIVE: %d buflen=%d",
+		  .format_args = "i4i4",
+		};
+
+	      struct {
+		u32 data[2];
+	      } * ed;
+
+	      ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
+	      ed->data[0] = *(int *) buffer;
+	      ed->data[1] = *buflen;
+	      /* *INDENT-ON* */
+	    }
 	}
       else
 	rv = VPPCOM_EINVAL;
@@ -5140,6 +5213,25 @@ vppcom_session_attr (uint32_t session_index, uint32_t op,
 			  VCL_SESS_ATTR_TEST (session->attr,
 					      VCL_SESS_ATTR_KEEPALIVE),
 			  *buflen);
+	  if (VPPCOM_DEBUG > 0)
+	    {
+	      /* *INDENT-OFF* */
+	      ELOG_TYPE_DECLARE (e) =
+		{
+		  .format = "VPPCOM_ATTR_SET_KEEPALIVE: %d buflen=%d",
+		  .format_args = "i4i4",
+		};
+
+	      struct {
+		u32 data[2];
+	      } * ed;
+
+	      ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
+	      ed->data[0] = VCL_SESS_ATTR_TEST (session->attr,
+						VCL_SESS_ATTR_KEEPALIVE);
+	      ed->data[1] = *buflen;
+	      /* *INDENT-ON* */
+	    }
 	}
       else
 	rv = VPPCOM_EINVAL;
@@ -5157,6 +5249,24 @@ vppcom_session_attr (uint32_t session_index, uint32_t op,
 	    clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_TCP_NODELAY: %d, "
 			  "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer,
 			  *buflen);
+	  if (VPPCOM_DEBUG > 0)
+	    {
+	      /* *INDENT-OFF* */
+	      ELOG_TYPE_DECLARE (e) =
+		{
+		  .format = "VPPCOM_ATTR_GET_TCP_NODELAY: %d buflen=%d",
+		  .format_args = "i4i4",
+		};
+
+	      struct {
+		u32 data[2];
+	      } * ed;
+
+	      ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
+	      ed->data[0] = *(int *) buffer;
+	      ed->data[1] = *buflen;
+	      /* *INDENT-ON* */
+	    }
 	}
       else
 	rv = VPPCOM_EINVAL;
@@ -5177,6 +5287,25 @@ vppcom_session_attr (uint32_t session_index, uint32_t op,
 			  VCL_SESS_ATTR_TEST (session->attr,
 					      VCL_SESS_ATTR_TCP_NODELAY),
 			  *buflen);
+	  if (VPPCOM_DEBUG > 0)
+	    {
+	      /* *INDENT-OFF* */
+	      ELOG_TYPE_DECLARE (e) =
+		{
+		  .format = "VPPCOM_ATTR_SET_TCP_NODELAY: %d buflen=%d",
+		  .format_args = "i4i4",
+		};
+
+	      struct {
+		u32 data[2];
+	      } * ed;
+
+	      ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
+	      ed->data[0] = VCL_SESS_ATTR_TEST (session->attr,
+						VCL_SESS_ATTR_TCP_NODELAY);
+	      ed->data[1] = *buflen;
+	      /* *INDENT-ON* */
+	    }
 	}
       else
 	rv = VPPCOM_EINVAL;
@@ -5194,6 +5323,24 @@ vppcom_session_attr (uint32_t session_index, uint32_t op,
 	    clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_TCP_KEEPIDLE: %d, "
 			  "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer,
 			  *buflen);
+	  if (VPPCOM_DEBUG > 0)
+	    {
+	      /* *INDENT-OFF* */
+	      ELOG_TYPE_DECLARE (e) =
+		{
+		  .format = "VPPCOM_ATTR_GET_TCP_KEEPIDLE: %d buflen=%d",
+		  .format_args = "i4i4",
+		};
+
+	      struct {
+		u32 data[2];
+	      } * ed;
+
+	      ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
+	      ed->data[0] = *(int *) buffer;
+	      ed->data[1] = *buflen;
+	      /* *INDENT-ON* */
+	    }
 	}
       else
 	rv = VPPCOM_EINVAL;
@@ -5214,6 +5361,25 @@ vppcom_session_attr (uint32_t session_index, uint32_t op,
 			  VCL_SESS_ATTR_TEST (session->attr,
 					      VCL_SESS_ATTR_TCP_KEEPIDLE),
 			  *buflen);
+	  if (VPPCOM_DEBUG > 0)
+	    {
+	      /* *INDENT-OFF* */
+	      ELOG_TYPE_DECLARE (e) =
+		{
+		  .format = "VPPCOM_ATTR_SET_TCP_KEEPIDLE: %d buflen=%d",
+		  .format_args = "i4i4",
+		};
+
+	      struct {
+		u32 data[2];
+	      } * ed;
+
+	      ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
+	      ed->data[0] = VCL_SESS_ATTR_TEST (session->attr,
+						VCL_SESS_ATTR_TCP_KEEPIDLE);
+	      ed->data[1] = *buflen;
+	      /* *INDENT-ON* */
+	    }
 	}
       else
 	rv = VPPCOM_EINVAL;
@@ -5231,6 +5397,24 @@ vppcom_session_attr (uint32_t session_index, uint32_t op,
 	    clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_TCP_KEEPINTVL: %d, "
 			  "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer,
 			  *buflen);
+	  if (VPPCOM_DEBUG > 0)
+	    {
+	      /* *INDENT-OFF* */
+	      ELOG_TYPE_DECLARE (e) =
+		{
+		  .format = "VPPCOM_ATTR_GET_TCP_KEEPIDLE: %d buflen=%d",
+		  .format_args = "i4i4",
+		};
+
+	      struct {
+		u32 data[2];
+	      } * ed;
+
+	      ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
+	      ed->data[0] = *(int *) buffer;
+	      ed->data[1] = *buflen;
+	      /* *INDENT-ON* */
+	    }
 	}
       else
 	rv = VPPCOM_EINVAL;
@@ -5251,6 +5435,25 @@ vppcom_session_attr (uint32_t session_index, uint32_t op,
 			  VCL_SESS_ATTR_TEST (session->attr,
 					      VCL_SESS_ATTR_TCP_KEEPINTVL),
 			  *buflen);
+	  if (VPPCOM_DEBUG > 0)
+	    {
+	      /* *INDENT-OFF* */
+	      ELOG_TYPE_DECLARE (e) =
+		{
+		  .format = "VPPCOM_ATTR_SET_TCP_KEEPINTVL: %d buflen=%d",
+		  .format_args = "i4i4",
+		};
+
+	      struct {
+		u32 data[2];
+	      } * ed;
+
+	      ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
+	      ed->data[0] = VCL_SESS_ATTR_TEST (session->attr,
+						VCL_SESS_ATTR_TCP_KEEPINTVL);
+	      ed->data[1] = *buflen;
+	      /* *INDENT-ON* */
+	    }
 	}
       else
 	rv = VPPCOM_EINVAL;
@@ -5267,6 +5470,24 @@ vppcom_session_attr (uint32_t session_index, uint32_t op,
 	    clib_warning ("VCL<%d>: VPPCOM_ATTR_GET_TCP_USER_MSS: %d, "
 			  "buflen %d, #VPP-TBD#", getpid (), *(int *) buffer,
 			  *buflen);
+	  if (VPPCOM_DEBUG > 0)
+	    {
+	      /* *INDENT-OFF* */
+	      ELOG_TYPE_DECLARE (e) =
+		{
+		  .format = "VPPCOM_ATTR_GET_TCP_USER_MSS: %d buflen=%d",
+		  .format_args = "i4i4",
+		};
+
+	      struct {
+		u32 data[2];
+	      } * ed;
+
+	      ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
+	      ed->data[0] = *(int *) buffer;
+	      ed->data[1] = *buflen;
+	      /* *INDENT-ON* */
+	    }
 	}
       else
 	rv = VPPCOM_EINVAL;
@@ -5279,9 +5500,27 @@ vppcom_session_attr (uint32_t session_index, uint32_t op,
 	  session->user_mss = *(u32 *) buffer;
 
 	  if (VPPCOM_DEBUG > 2)
-	    clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_TCP_KEEPINTVL: %u, "
+	    clib_warning ("VCL<%d>: VPPCOM_ATTR_SET_TCP_USER_MSS: %u, "
 			  "buflen %d, #VPP-TBD#", getpid (),
 			  session->user_mss, *buflen);
+	  if (VPPCOM_DEBUG > 0)
+	    {
+	      /* *INDENT-OFF* */
+	      ELOG_TYPE_DECLARE (e) =
+		{
+		  .format = "VPPCOM_ATTR_SET_TCP_USER_MSS: %d buflen=%d",
+		  .format_args = "i4i4",
+		};
+
+	      struct {
+		u32 data[2];
+	      } * ed;
+
+	      ed = ELOG_TRACK_DATA (&vcm->elog_main, e, session->elog_track);
+	      ed->data[0] = session->user_mss;
+	      ed->data[1] = *buflen;
+	      /* *INDENT-ON* */
+	    }
 	}
       else
 	rv = VPPCOM_EINVAL;
@@ -5315,6 +5554,23 @@ vppcom_session_recvfrom (uint32_t session_index, void *buffer,
 	    clib_warning ("VCL<%d>: invalid session, "
 			  "sid (%u) has been closed!",
 			  getpid (), session_index);
+	  if (VPPCOM_DEBUG > 0)
+	    {
+	      /* *INDENT-OFF* */
+	      ELOG_TYPE_DECLARE (e) =
+		{
+		  .format = "invalid session: %d closed",
+		  .format_args = "i4",
+		};
+
+	      struct {
+		u32 data;
+	      } * ed;
+
+	      ed = ELOG_TRACK_DATA (&vcm->elog_main, e, vcm->elog_track);
+	      ed->data = session_index;
+	      /* *INDENT-ON* */
+	    }
 	  rv = VPPCOM_EBADFD;
 	  clib_spinlock_unlock (&vcm->sessions_lockp);
 	  goto done;