diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 12:12:33 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 12:12:33 -0700 |
| commit | d3e384e4f00aa90db4310f82f3cbe6528e256334 (patch) | |
| tree | 716c9dfa64dd9fdc4b05b377a2a19b7b216c4856 /ospf6d/ospf6_neighbor.h | |
| parent | d0cee3d3d7267f8f5c1d1ffd5c5fd8802a9db987 (diff) | |
| parent | 41dc3488cf127a1e23333459a0c316ded67f7ff3 (diff) | |
| download | quagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.bz2 quagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.xz | |
Merge branch 'master' of /home/shemminger/src/quagga into upstream
Resolve all conflicts by using upstream version.
Diffstat (limited to 'ospf6d/ospf6_neighbor.h')
| -rw-r--r-- | ospf6d/ospf6_neighbor.h | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/ospf6d/ospf6_neighbor.h b/ospf6d/ospf6_neighbor.h index 8f94790d..b3bd173f 100644 --- a/ospf6d/ospf6_neighbor.h +++ b/ospf6d/ospf6_neighbor.h @@ -105,7 +105,7 @@ struct ospf6_neighbor #define OSPF6_NEIGHBOR_LOADING 7 #define OSPF6_NEIGHBOR_FULL 8 -const extern char *ospf6_neighbor_state_str[]; +extern const char *ospf6_neighbor_state_str[]; /* Function Prototypes */ @@ -119,20 +119,19 @@ struct ospf6_neighbor *ospf6_neighbor_create (u_int32_t, void ospf6_neighbor_delete (struct ospf6_neighbor *); /* Neighbor event */ -int hello_received (struct thread *); -int twoway_received (struct thread *); -int negotiation_done (struct thread *); -int exchange_done (struct thread *); -int loading_done (struct thread *); -int adj_ok (struct thread *); -int seqnumber_mismatch (struct thread *); -int bad_lsreq (struct thread *); -int oneway_received (struct thread *); -int inactivity_timer (struct thread *); - -void ospf6_neighbor_init (); -int config_write_ospf6_debug_neighbor (struct vty *vty); -void install_element_ospf6_debug_neighbor (); +extern int hello_received (struct thread *); +extern int twoway_received (struct thread *); +extern int negotiation_done (struct thread *); +extern int exchange_done (struct thread *); +extern int loading_done (struct thread *); +extern int adj_ok (struct thread *); +extern int seqnumber_mismatch (struct thread *); +extern int bad_lsreq (struct thread *); +extern int oneway_received (struct thread *); +extern int inactivity_timer (struct thread *); + +extern void ospf6_neighbor_init (void); +extern int config_write_ospf6_debug_neighbor (struct vty *vty); +extern void install_element_ospf6_debug_neighbor (void); #endif /* OSPF6_NEIGHBOR_H */ - |