diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-03-08 07:38:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-08 07:38:21 -0500 |
| commit | 790c77ed025f2d71d0aed1f0183bbedbbc1799e6 (patch) | |
| tree | 08ce899248d37a102c3be14136ec7103c59b37a8 /ospfd/ospf_ism.c | |
| parent | ae6ba9ba043652bde3b0000f5299eff31d351ee3 (diff) | |
| parent | 2fcc7988ea09b8505c0fbf134ecffe98e4c026b6 (diff) | |
Merge pull request #261 from opensourcerouting/lib_cleanup
startup, option parsing & logging refactor
Diffstat (limited to 'ospfd/ospf_ism.c')
| -rw-r--r-- | ospfd/ospf_ism.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/ospfd/ospf_ism.c b/ospfd/ospf_ism.c index ae6d0cdbc5..9630616acc 100644 --- a/ospfd/ospf_ism.c +++ b/ospfd/ospf_ism.c @@ -255,8 +255,7 @@ ospf_hello_timer (struct thread *thread) oi->t_hello = NULL; if (IS_DEBUG_OSPF (ism, ISM_TIMERS)) - zlog (NULL, LOG_DEBUG, "ISM[%s]: Timer (Hello timer expire)", - IF_NAME (oi)); + zlog_debug("ISM[%s]: Timer (Hello timer expire)", IF_NAME(oi)); /* Sending hello packet. */ ospf_hello_send (oi); @@ -276,8 +275,7 @@ ospf_wait_timer (struct thread *thread) oi->t_wait = NULL; if (IS_DEBUG_OSPF (ism, ISM_TIMERS)) - zlog (NULL, LOG_DEBUG, "ISM[%s]: Timer (Wait timer expire)", - IF_NAME (oi)); + zlog_debug("ISM[%s]: Timer (Wait timer expire)", IF_NAME(oi)); OSPF_ISM_EVENT_SCHEDULE (oi, ISM_WaitTimer); @@ -418,7 +416,7 @@ static int ism_ignore (struct ospf_interface *oi) { if (IS_DEBUG_OSPF (ism, ISM_EVENTS)) - zlog (NULL, LOG_DEBUG, "ISM[%s]: ism_ignore called", IF_NAME (oi)); + zlog_debug("ISM[%s]: ism_ignore called", IF_NAME(oi)); return 0; } @@ -539,9 +537,9 @@ ism_change_state (struct ospf_interface *oi, int state) /* Logging change of state. */ if (IS_DEBUG_OSPF (ism, ISM_STATUS)) - zlog (NULL, LOG_DEBUG, "ISM[%s]: State change %s -> %s", IF_NAME (oi), - LOOKUP (ospf_ism_state_msg, oi->state), - LOOKUP (ospf_ism_state_msg, state)); + zlog_debug("ISM[%s]: State change %s -> %s", IF_NAME(oi), + LOOKUP(ospf_ism_state_msg, oi->state), + LOOKUP(ospf_ism_state_msg, state)); old_state = oi->state; oi->state = state; @@ -617,9 +615,9 @@ ospf_ism_event (struct thread *thread) next_state = ISM [oi->state][event].next_state; if (IS_DEBUG_OSPF (ism, ISM_EVENTS)) - zlog (NULL, LOG_DEBUG, "ISM[%s]: %s (%s)", IF_NAME (oi), - LOOKUP (ospf_ism_state_msg, oi->state), - ospf_ism_event_str[event]); + zlog_debug("ISM[%s]: %s (%s)", IF_NAME(oi), + LOOKUP(ospf_ism_state_msg, oi->state), + ospf_ism_event_str[event]); /* If state is changed. */ if (next_state != oi->state) |