vppinfra: Improve code portability

[vpp.git] / src / vnet / syslog / syslog.c

diff --git a/src/vnet/syslog/syslog.c b/src/vnet/syslog/syslog.c
index f104691..caa5583 100644 (file)
--- a/src/vnet/syslog/syslog.c
+++ b/src/vnet/syslog/syslog.c
@@ -13,7 +13,8 @@
  * limitations under the License.
  */
 /**
- * @file RFC5424 syslog protocol implementation
+ * @file syslog.c
+ * RFC5424 syslog protocol implementation
  */
 
 #include <unistd.h>
@@ -142,8 +143,7 @@ void
 syslog_msg_init (syslog_msg_t * syslog_msg, syslog_facility_t facility,
                 syslog_severity_t severity, char *app_name, char *msgid)
 {
-  syslog_main_t *sm = &syslog_main;
-  vlib_main_t *vm = sm->vlib_main;
+  vlib_main_t *vm = vlib_get_main ();
 
   syslog_msg->header.facility = facility;
   syslog_msg->header.severity = severity;
@@ -159,7 +159,7 @@ int
 syslog_msg_send (syslog_msg_t * syslog_msg)
 {
   syslog_main_t *sm = &syslog_main;
-  vlib_main_t *vm = sm->vlib_main;
+  vlib_main_t *vm = vlib_get_main ();
   u32 bi, msg_len, *to_next;
   u8 *tmp;
   vlib_buffer_t *b;
@@ -170,7 +170,6 @@ syslog_msg_send (syslog_msg_t * syslog_msg)
     return -1;
 
   b = vlib_get_buffer (vm, bi);
-  VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b);
 
   /* one message per UDP datagram RFC5426 3.1. */
   tmp = format (0, "%U", format_syslog_msg, syslog_msg);
@@ -507,7 +506,6 @@ show_syslog_filter_command_fn (vlib_main_t * vm, unformat_input_t * input,
   return 0;
 }
 
-/* *INDENT-OFF* */
 /*?
  * Set syslog sender configuration.
  *
@@ -600,7 +598,6 @@ VLIB_CLI_COMMAND (show_syslog_filter_command, static) = {
     .short_help = "show syslog filter",
     .function = show_syslog_filter_command_fn,
 };
-/* *INDENT-ON* */
 
 static clib_error_t *
 syslog_init (vlib_main_t * vm)
@@ -610,7 +607,6 @@ syslog_init (vlib_main_t * vm)
   struct timeval timeval_0;
   vlib_node_t *ip4_lookup_node;
 
-  sm->vlib_main = vm;
   sm->vnet_main = vnet_get_main ();
 
   sm->procid = getpid ();