proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 12:36:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: Use enum bgp_fsm_state_progress for bgp_stop()

Browse Source 
```
bgpd/bgp_fsm.c:1360:29: warning: conflicting types for ‘bgp_stop’ due to enum/integer mismatch; have ‘enum bgp_fsm_state_progress(struct peer *)’ [-Wenum-int-mismatch]
 1360 | enum bgp_fsm_state_progress bgp_stop(struct peer *peer)
      |                             ^~~~~~~~
In file included from bgpd/bgp_fsm.c:29:
./bgpd/bgp_fsm.h:111:12: note: previous declaration of ‘bgp_stop’ with type ‘int(struct peer *)’
  111 | extern int bgp_stop(struct peer *peer);
      |            ^~~~~~~~
```

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
This commit is contained in:
Donatas Abraitis 2023-06-13 16:01:40 +03:00
parent 5b28833d38
commit 58a92cb810
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bgpd/bgp_fsm.c
View File

@ -46,13 +46,6 @@
DEFINE_HOOK(peer_backward_transition, (struct peer * peer), (peer)); DEFINE_HOOK(peer_backward_transition, (struct peer * peer), (peer));
DEFINE_HOOK(peer_status_changed, (struct peer * peer), (peer)); DEFINE_HOOK(peer_status_changed, (struct peer * peer), (peer));
enum bgp_fsm_state_progress {
BGP_FSM_FAILURE_AND_DELETE = -2,
BGP_FSM_FAILURE = -1,
BGP_FSM_SUCCESS = 0,
BGP_FSM_SUCCESS_STATE_TRANSFER = 1,
};
/* Definition of display strings corresponding to FSM events. This should be /* Definition of display strings corresponding to FSM events. This should be
* kept consistent with the events defined in bgpd.h * kept consistent with the events defined in bgpd.h
*/ */

9
bgpd/bgp_fsm.h
View File

@ -7,6 +7,13 @@
#ifndef _QUAGGA_BGP_FSM_H #ifndef _QUAGGA_BGP_FSM_H
#define _QUAGGA_BGP_FSM_H #define _QUAGGA_BGP_FSM_H
enum bgp_fsm_state_progress {
BGP_FSM_FAILURE_AND_DELETE = -2,
BGP_FSM_FAILURE = -1,
BGP_FSM_SUCCESS = 0,
BGP_FSM_SUCCESS_STATE_TRANSFER = 1,
};
/* Macro for BGP read, write and timer thread. */ /* Macro for BGP read, write and timer thread. */
#define BGP_TIMER_ON(T, F, V) \ #define BGP_TIMER_ON(T, F, V) \
do { \ do { \
@ -108,7 +115,7 @@
extern void bgp_fsm_nht_update(struct peer *peer, bool has_valid_nexthops); extern void bgp_fsm_nht_update(struct peer *peer, bool has_valid_nexthops);
extern void bgp_event(struct event *event); extern void bgp_event(struct event *event);
extern int bgp_event_update(struct peer *, enum bgp_fsm_events event); extern int bgp_event_update(struct peer *, enum bgp_fsm_events event);
extern int bgp_stop(struct peer *peer); extern enum bgp_fsm_state_progress bgp_stop(struct peer *peer);
extern void bgp_timer_set(struct peer *); extern void bgp_timer_set(struct peer *);
extern void bgp_routeadv_timer(struct event *event); extern void bgp_routeadv_timer(struct event *event);
extern void bgp_fsm_change_status(struct peer *peer, extern void bgp_fsm_change_status(struct peer *peer,