commit 56dd5438b04b869065d8e901c315496bb6777455
author Damjan Marion <damarion@cisco.com> Fri Sep 08 19:52:02 2017 +0200
committer Florin Coras <florin.coras@gmail.com> Sat Sep 09 20:11:03 2017 +0000
tree 517190c53cfd2725d716eda6dddf9a64ad814084
parent 816122e303efb5012f6897bd53ff8fe28cd8fa1c

move unix_file_* code to vppinfra

This will allow us to use this code in client libraries without vlib.

Change-Id: I8557b752496841ba588aa36b6082cbe2cd1867fe
Signed-off-by: Damjan Marion <damarion@cisco.com>

src/vnet/ip/punt.c

diff --git a/src/vnet/ip/punt.c b/src/vnet/ip/punt.c
index 67c54c3..1ea32fa 100644
--- a/src/vnet/ip/punt.c
+++ b/src/vnet/ip/punt.c
@@ -550,7 +550,7 @@
     format_punt_trace,};
 
 static clib_error_t *
-punt_socket_read_ready (unix_file_t * uf)
+punt_socket_read_ready (clib_file_t * uf)
 {
   vlib_main_t *vm = vlib_get_main ();
   punt_main_t *pm = &punt_main;
@@ -790,11 +790,11 @@
     }
 
   /* Register socket */
-  unix_main_t *um = &unix_main;
-  unix_file_t template = { 0 };
+  clib_file_main_t *fm = &file_main;
+  clib_file_t template = { 0 };
   template.read_function = punt_socket_read_ready;
   template.file_descriptor = pm->socket_fd;
-  pm->unix_file_index = unix_file_add (um, &template);
+  pm->clib_file_index = clib_file_add (fm, &template);
 
   pm->is_configured = true;