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_network.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_network.h')
| -rw-r--r-- | ospf6d/ospf6_network.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/ospf6d/ospf6_network.h b/ospf6d/ospf6_network.h index 9a4d795e..fd8758e8 100644 --- a/ospf6d/ospf6_network.h +++ b/ospf6d/ospf6_network.h @@ -29,22 +29,22 @@ extern struct in6_addr allspfrouters6; extern struct in6_addr alldrouters6; /* Function Prototypes */ -void ospf6_set_reuseaddr (); -void ospf6_reset_mcastloop (); -void ospf6_set_pktinfo (); -void ospf6_set_checksum (); - -int ospf6_serv_sock (); - -void ospf6_join_allspfrouters (u_int); -void ospf6_leave_allspfrouters (u_int); -void ospf6_join_alldrouters (u_int); -void ospf6_leave_alldrouters (u_int); - -int ospf6_sendmsg (struct in6_addr *, struct in6_addr *, - unsigned int *, struct iovec *); -int ospf6_recvmsg (struct in6_addr *, struct in6_addr *, - unsigned int *, struct iovec *); +extern void ospf6_set_reuseaddr (void); +extern void ospf6_reset_mcastloop (void); +extern void ospf6_set_pktinfo (void); +extern void ospf6_set_checksum (void); + +extern int ospf6_serv_sock (void); + +extern void ospf6_join_allspfrouters (u_int); +extern void ospf6_leave_allspfrouters (u_int); +extern void ospf6_join_alldrouters (u_int); +extern void ospf6_leave_alldrouters (u_int); + +extern int ospf6_sendmsg (struct in6_addr *, struct in6_addr *, + unsigned int *, struct iovec *); +extern int ospf6_recvmsg (struct in6_addr *, struct in6_addr *, + unsigned int *, struct iovec *); #endif /* OSPF6_NETWORK_H */ |