mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-10-31 10:56:49 +00:00
4173cc8e23
I am rarely seeing this crash: r2: ospfd crashed. Core file found - Backtrace follows: [New LWP 32748] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/aarch64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/lib/frr/ospfd'. Program terminated with signal SIGABRT, Aborted. 2019-08-29 15:59:36,149 ERROR: assert failed at "test_ospf_sr_topo1/test_memory_leak": Which translates to this code: node = listhead(ospf->oi_write_q); assert(node); oi = listgetdata(node); assert(oi); So if we get into ospf_write without anything on the oi_write_q we are stopping the program. This is happening because in ospf_ls_upd_queue_send we are calling ospf_write. Imagine that we have a interface already on the on_write_q and then ospf_write handles the packet send for all functions. We are not clearing the t_write thread and we are popping and causing a crash. Additionally modify OSPF_ISM_WRITE_ON(O) to not just blindly turn on the t_write thread. Only do so if we have data. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com> ospfd: Remove redundant asserts assert(oi) is impossible all listgetdata(node) directly proceeding it already asserts here, besides a node cannot be created with a null pointer! If list_isempty is called directly before the listhead call it is impossilbe that we do not have a valid pointer here. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
108 lines
4.4 KiB
C
108 lines
4.4 KiB
C
/*
|
|
* OSPF version 2 Interface State Machine.
|
|
* From RFC2328 [OSPF Version 2]
|
|
* Copyright (C) 1999 Toshiaki Takada
|
|
*
|
|
* This file is part of GNU Zebra.
|
|
*
|
|
* GNU Zebra is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2, or (at your option) any
|
|
* later version.
|
|
*
|
|
* GNU Zebra is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* 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 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
|
|
#define _ZEBRA_OSPF_ISM_H
|
|
|
|
#include "hook.h"
|
|
|
|
/* OSPF Interface State Machine Status. */
|
|
#define ISM_DependUpon 0
|
|
#define ISM_Down 1
|
|
#define ISM_Loopback 2
|
|
#define ISM_Waiting 3
|
|
#define ISM_PointToPoint 4
|
|
#define ISM_DROther 5
|
|
#define ISM_Backup 6
|
|
#define ISM_DR 7
|
|
#define OSPF_ISM_STATE_MAX 8
|
|
|
|
/* OSPF Interface State Machine Event. */
|
|
#define ISM_NoEvent 0
|
|
#define ISM_InterfaceUp 1
|
|
#define ISM_WaitTimer 2
|
|
#define ISM_BackupSeen 3
|
|
#define ISM_NeighborChange 4
|
|
#define ISM_LoopInd 5
|
|
#define ISM_UnloopInd 6
|
|
#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 (!list_isempty((O)->oi_write_q)) \
|
|
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_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)
|
|
|
|
/* Macro for OSPF ISM timer turn off. */
|
|
#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)
|
|
|
|
/* Macro for OSPF execute event. */
|
|
#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);
|
|
|
|
DECLARE_HOOK(ospf_ism_change,
|
|
(struct ospf_interface * oi, int state, int oldstate),
|
|
(oi, state, oldstate))
|
|
|
|
#endif /* _ZEBRA_OSPF_ISM_H */
|