zebra: Allow ns delete to happen after under/over flow checks

[mirror_frr.git] / ospfd / ospf_ism.h

diff --git a/ospfd/ospf_ism.h b/ospfd/ospf_ism.h
index f099fe8759b3da366772b29dac4602db9210ce8d..5ae99ab32070b2d87b0c944b6d62fb4aafb0f828 100644 (file)
--- a/ospfd/ospf_ism.h
+++ b/ospfd/ospf_ism.h
@@ -47,62 +47,60 @@
 #define ISM_InterfaceDown                 7
 #define OSPF_ISM_EVENT_MAX                8
 
-#define OSPF_ISM_WRITE_ON(O) \
-  do \
-    { \
-      if (oi->on_write_q == 0) \
-        { \
-          listnode_add ((O)->oi_write_q, oi); \
-          oi->on_write_q = 1; \
-        } \
-      thread_add_write (master, ospf_write, (O), (O)->fd, &(O)->t_write); \
-    } while (0)
-     
+#define OSPF_ISM_WRITE_ON(O)                                                   \
+       do {                                                                   \
+               if (oi->on_write_q == 0) {                                     \
+                       listnode_add((O)->oi_write_q, oi);                     \
+                       oi->on_write_q = 1;                                    \
+               }                                                              \
+               thread_add_write(master, ospf_write, (O), (O)->fd,             \
+                                &(O)->t_write);                               \
+       } while (0)
+
 /* Macro for OSPF ISM timer turn on. */
-#define OSPF_ISM_TIMER_ON(T,F,V) \
-    thread_add_timer (master, (F), oi, (V), &(T))
+#define OSPF_ISM_TIMER_ON(T, F, V) thread_add_timer(master, (F), oi, (V), &(T))
 
-#define OSPF_ISM_TIMER_MSEC_ON(T,F,V) \
-    thread_add_timer_msec (master, (F), oi, (V), &(T))
+#define OSPF_ISM_TIMER_MSEC_ON(T, F, V)                                        \
+       thread_add_timer_msec(master, (F), oi, (V), &(T))
 
 /* convenience macro to set hello timer correctly, according to
  * whether fast-hello is set or not
  */
-#define OSPF_HELLO_TIMER_ON(O) \
-  do { \
-    if (OSPF_IF_PARAM ((O), fast_hello)) \
-        OSPF_ISM_TIMER_MSEC_ON ((O)->t_hello, ospf_hello_timer, \
-                                1000 / OSPF_IF_PARAM ((O), fast_hello)); \
-    else \
-        OSPF_ISM_TIMER_ON ((O)->t_hello, ospf_hello_timer, \
-                                OSPF_IF_PARAM ((O), v_hello)); \
-  } while (0)
+#define OSPF_HELLO_TIMER_ON(O)                                                 \
+       do {                                                                   \
+               if (OSPF_IF_PARAM((O), fast_hello))                            \
+                       OSPF_ISM_TIMER_MSEC_ON(                                \
+                               (O)->t_hello, ospf_hello_timer,                \
+                               1000 / OSPF_IF_PARAM((O), fast_hello));        \
+               else                                                           \
+                       OSPF_ISM_TIMER_ON((O)->t_hello, ospf_hello_timer,      \
+                                         OSPF_IF_PARAM((O), v_hello));        \
+       } while (0)
 
 /* Macro for OSPF ISM timer turn off. */
-#define OSPF_ISM_TIMER_OFF(X) \
-  do { \
-    if (X) \
-      { \
-       thread_cancel (X); \
-       (X) = NULL; \
-      } \
-  } while (0)
+#define OSPF_ISM_TIMER_OFF(X)                                                  \
+       do {                                                                   \
+               if (X) {                                                       \
+                       thread_cancel(X);                                      \
+                       (X) = NULL;                                            \
+               }                                                              \
+       } while (0)
 
 /* Macro for OSPF schedule event. */
-#define OSPF_ISM_EVENT_SCHEDULE(I,E) \
-      thread_add_event (master, ospf_ism_event, (I), (E), NULL)
+#define OSPF_ISM_EVENT_SCHEDULE(I, E)                                          \
+       thread_add_event(master, ospf_ism_event, (I), (E), NULL)
 
 /* Macro for OSPF execute event. */
-#define OSPF_ISM_EVENT_EXECUTE(I,E) \
-      thread_execute (master, ospf_ism_event, (I), (E))
+#define OSPF_ISM_EVENT_EXECUTE(I, E)                                           \
+       thread_execute(master, ospf_ism_event, (I), (E))
 
 /* Prototypes. */
-extern int ospf_ism_event (struct thread *);
-extern void ism_change_status (struct ospf_interface *, int);
-extern int ospf_hello_timer (struct thread *thread);
+extern int ospf_ism_event(struct thread *);
+extern void ism_change_status(struct ospf_interface *, int);
+extern int ospf_hello_timer(struct thread *thread);
 
 DECLARE_HOOK(ospf_ism_change,
-               (struct ospf_interface *oi, int state, int oldstate),
-               (oi, state, oldstate))
+            (struct ospf_interface * oi, int state, int oldstate),
+            (oi, state, oldstate))
 
 #endif /* _ZEBRA_OSPF_ISM_H */