diff options
Diffstat (limited to 'ospfd/ospf_ism.h')
| -rw-r--r-- | ospfd/ospf_ism.h | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/ospfd/ospf_ism.h b/ospfd/ospf_ism.h index fa8e6d70f6..f099fe8759 100644 --- a/ospfd/ospf_ism.h +++ b/ospfd/ospf_ism.h @@ -15,10 +15,9 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with GNU Zebra; see the file COPYING. If not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with this program; see the file COPYING; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef _ZEBRA_OSPF_ISM_H @@ -48,30 +47,23 @@ #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; \ - } \ - if ((O)->t_write == NULL) \ - (O)->t_write = \ - thread_add_write (master, ospf_write, (O), (O)->fd); \ - } 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) \ - do { \ - if (!(T)) \ - (T) = thread_add_timer (master, (F), oi, (V)); \ - } while (0) + thread_add_timer (master, (F), oi, (V), &(T)) + #define OSPF_ISM_TIMER_MSEC_ON(T,F,V) \ - do { \ - if (!(T)) \ - (T) = thread_add_timer_msec (master, (F), oi, (V)); \ - } while (0) + 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 @@ -98,7 +90,7 @@ /* Macro for OSPF schedule event. */ #define OSPF_ISM_EVENT_SCHEDULE(I,E) \ - thread_add_event (master, ospf_ism_event, (I), (E)) + thread_add_event (master, ospf_ism_event, (I), (E), NULL) /* Macro for OSPF execute event. */ #define OSPF_ISM_EVENT_EXECUTE(I,E) \ |