vppinfra: make _vec_len() read-only

[vpp.git] / src / vlib / unix / mc_socket.c

diff --git a/src/vlib/unix/mc_socket.c b/src/vlib/unix/mc_socket.c
index d4f4a7f..1f3b4e9 100644 (file)
--- a/src/vlib/unix/mc_socket.c
+++ b/src/vlib/unix/mc_socket.c
@@ -90,12 +90,12 @@ sendmsg_helper (mc_socket_main_t * msm,
   h.msg_namelen = sizeof (tx_addr[0]);
 
   if (msm->iovecs)
-    _vec_len (msm->iovecs) = 0;
+    vec_set_len (msm->iovecs, 0);
 
   n_bytes = append_buffer_index_to_iovec (vm, buffer_index, &msm->iovecs);
   ASSERT (n_bytes <= msm->mc_main.transport.max_packet_size);
   if (n_bytes > msm->mc_main.transport.max_packet_size)
-    clib_error ("sending packet larger than interace MTU %d bytes", n_bytes);
+    clib_error ("sending packet larger than interface MTU %d bytes", n_bytes);
 
   h.msg_iov = msm->iovecs;
   h.msg_iovlen = vec_len (msm->iovecs);
@@ -165,7 +165,7 @@ recvmsg_helper (mc_socket_main_t * msm,
   vlib_main_t *vm = msm->mc_main.vlib_main;
   vlib_buffer_t *b;
   uword n_left, n_alloc, n_mtu, i, i_rx;
-  const uword buffer_size = vlib_bufer_get_default_size (vm);
+  const uword buffer_size = vlib_buffer_get_default_data_size (vm);
   word n_bytes_left;
 
   /* Make sure we have at least a MTU worth of buffers. */
@@ -177,7 +177,7 @@ recvmsg_helper (mc_socket_main_t * msm,
       vec_validate (msm->rx_buffers, max_alloc - 1);
       n_alloc =
        vlib_buffer_alloc (vm, msm->rx_buffers + n_left, max_alloc - n_left);
-      _vec_len (msm->rx_buffers) = n_left + n_alloc;
+      vec_set_len (msm->rx_buffers, n_left + n_alloc);
     }
 
   ASSERT (vec_len (msm->rx_buffers) >= n_mtu);
@@ -192,7 +192,7 @@ recvmsg_helper (mc_socket_main_t * msm,
       msm->iovecs[i].iov_base = b->data;
       msm->iovecs[i].iov_len = buffer_size;
     }
-  _vec_len (msm->iovecs) = n_mtu;
+  vec_set_len (msm->iovecs, n_mtu);
 
   {
     struct msghdr h;
@@ -237,7 +237,7 @@ recvmsg_helper (mc_socket_main_t * msm,
       b->next_buffer = msm->rx_buffers[i_rx];
     }
 
-  _vec_len (msm->rx_buffers) = i_rx;
+  vec_set_len (msm->rx_buffers, i_rx);
 
   return 0 /* no error */ ;
 }
@@ -418,7 +418,7 @@ catchup_socket_read_ready (clib_file_t * uf, int is_server)
        }
     }
 
-  _vec_len (c->input_vector) = l + n;
+  vec_set_len (c->input_vector, l + n);
 
   if (is_eof && vec_len (c->input_vector) > 0)
     {
@@ -426,7 +426,7 @@ catchup_socket_read_ready (clib_file_t * uf, int is_server)
        {
          mc_msg_catchup_request_handler (mcm, (void *) c->input_vector,
                                          c - msm->catchups);
-         _vec_len (c->input_vector) = 0;
+         vec_set_len (c->input_vector, 0);
        }
       else
        {
@@ -616,6 +616,7 @@ catchup_listen_read_ready (clib_file_t * uf)
   template.write_function = catchup_server_write_ready;
   template.error_function = catchup_socket_error_ready;
   template.file_descriptor = c->socket;
+  template.description = format (0, "multicast catchup socket");
   template.private_data = pointer_to_uword (msm);
   c->clib_file_index = clib_file_add (&file_main, &template);
   hash_set (msm->catchup_index_by_file_descriptor, c->socket,
@@ -786,6 +787,7 @@ socket_setup (mc_socket_main_t * msm)
     template.file_descriptor =
       msm->multicast_sockets[MC_TRANSPORT_USER_REQUEST_TO_RELAY].socket;
     template.private_data = (uword) msm;
+    template.description = format (0, "multicast to_relay socket");
     clib_file_add (&file_main, &template);
 
     /* epoll setup for multicast from_relay socket */
@@ -793,24 +795,28 @@ socket_setup (mc_socket_main_t * msm)
     template.file_descriptor =
       msm->multicast_sockets[MC_TRANSPORT_USER_REQUEST_FROM_RELAY].socket;
     template.private_data = (uword) msm;
+    template.description = format (0, "multicast from_relay socket");
     clib_file_add (&file_main, &template);
 
     template.read_function = join_socket_read_ready;
     template.file_descriptor =
       msm->multicast_sockets[MC_TRANSPORT_JOIN].socket;
     template.private_data = (uword) msm;
+    template.description = format (0, "multicast join socket");
     clib_file_add (&file_main, &template);
 
     /* epoll setup for ack rx socket */
     template.read_function = ack_socket_read_ready;
     template.file_descriptor = msm->ack_socket;
     template.private_data = (uword) msm;
+    template.description = format (0, "multicast ack rx socket");
     clib_file_add (&file_main, &template);
 
     /* epoll setup for TCP catchup server */
     template.read_function = catchup_listen_read_ready;
     template.file_descriptor = msm->catchup_server_socket;
     template.private_data = (uword) msm;
+    template.description = format (0, "multicast tcp catchup socket");
     clib_file_add (&file_main, &template);
   }
 
@@ -903,6 +909,7 @@ catchup_request_fun (void *transport_main,
     template.error_function = catchup_socket_error_ready;
     template.file_descriptor = c->socket;
     template.private_data = (uword) msm;
+    template.description = format (0, "multicast socket");
     c->clib_file_index = clib_file_add (um, &template);
 
     hash_set (msm->catchup_index_by_file_descriptor, c->socket,
@@ -1012,9 +1019,9 @@ mc_socket_main_init (mc_socket_main_t * msm, char **intfc_probe_list,
 
   msm->rx_mtu_n_bytes = mtu;
   msm->rx_mtu_n_buffers =
-    msm->rx_mtu_n_bytes / vlib_bufer_get_default_size (vm);
+    msm->rx_mtu_n_bytes / vlib_buffer_get_default_data_size (vm);
   msm->rx_mtu_n_buffers +=
-    (msm->rx_mtu_n_bytes % vlib_bufer_get_default_size (vm)) != 0;
+    (msm->rx_mtu_n_bytes % vlib_buffer_get_default_data_size (vm)) != 0;
 
   error = socket_setup (msm);
   if (error)