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_message.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_message.h')
| -rw-r--r-- | ospf6d/ospf6_message.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/ospf6d/ospf6_message.h b/ospf6d/ospf6_message.h index 95b07ced..ebb6308e 100644 --- a/ospf6d/ospf6_message.h +++ b/ospf6d/ospf6_message.h @@ -116,26 +116,26 @@ struct ospf6_lsupdate /* It is just a sequence of LSA Headers */ /* Function definition */ -void ospf6_hello_print (struct ospf6_header *); -void ospf6_dbdesc_print (struct ospf6_header *); -void ospf6_lsreq_print (struct ospf6_header *); -void ospf6_lsupdate_print (struct ospf6_header *); -void ospf6_lsack_print (struct ospf6_header *); - -int ospf6_iobuf_size (unsigned int size); -int ospf6_receive (struct thread *thread); - -int ospf6_hello_send (struct thread *thread); -int ospf6_dbdesc_send (struct thread *thread); -int ospf6_dbdesc_send_newone (struct thread *thread); -int ospf6_lsreq_send (struct thread *thread); -int ospf6_lsupdate_send_interface (struct thread *thread); -int ospf6_lsupdate_send_neighbor (struct thread *thread); -int ospf6_lsack_send_interface (struct thread *thread); -int ospf6_lsack_send_neighbor (struct thread *thread); - -int config_write_ospf6_debug_message (struct vty *); -void install_element_ospf6_debug_message (); +extern void ospf6_hello_print (struct ospf6_header *); +extern void ospf6_dbdesc_print (struct ospf6_header *); +extern void ospf6_lsreq_print (struct ospf6_header *); +extern void ospf6_lsupdate_print (struct ospf6_header *); +extern void ospf6_lsack_print (struct ospf6_header *); + +extern int ospf6_iobuf_size (unsigned int size); +extern int ospf6_receive (struct thread *thread); + +extern int ospf6_hello_send (struct thread *thread); +extern int ospf6_dbdesc_send (struct thread *thread); +extern int ospf6_dbdesc_send_newone (struct thread *thread); +extern int ospf6_lsreq_send (struct thread *thread); +extern int ospf6_lsupdate_send_interface (struct thread *thread); +extern int ospf6_lsupdate_send_neighbor (struct thread *thread); +extern int ospf6_lsack_send_interface (struct thread *thread); +extern int ospf6_lsack_send_neighbor (struct thread *thread); + +extern int config_write_ospf6_debug_message (struct vty *); +extern void install_element_ospf6_debug_message (void); #endif /* OSPF6_MESSAGE_H */ |