From 2da40f4919f6268d4935c42a358739ffdf3a48dc Mon Sep 17 00:00:00 2001 From: ajs Date: Wed, 30 Mar 2005 16:33:13 +0000 Subject: 2005-03-30 Andrew J. Schorr * irdp.h: Add prototype for irdp_sock_init, and fix protos for other irdp_* functions. * irdp_interface.c: (irdp_if_start) If irdp_sock is negative, call irdp_sock_init to create the IRDP socket. (irdp_if_init) Rename to irdp_init(). (get_iflist_ifp) Remove function that is a duplicate of if_lookup_by_index. (*) Make many functions static. And remove superfluous "\n" from several zlog messages. * irdp_main.c: (irdp_init) Remove function that used to call irdp_if_init() and irdp_sock_init(), since we will now create the socket only upon first use. (irdp_sock_init) Do not update global irdp_sock variable, just return the fd and assume that the caller will do so. If setsockopt calls fail, close the socket before returning -1. (*) Make many functions static. * irdp_packet.c: Initialize irdp_sock to -1. (irdp_read_raw) Call standard library function if_lookup_by_index instead of get_iflist_ifp. (irdp_recvmsg) Should be static, not global. --- zebra/irdp.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'zebra/irdp.h') diff --git a/zebra/irdp.h b/zebra/irdp.h index 88453e98..1f0c1ecd 100644 --- a/zebra/irdp.h +++ b/zebra/irdp.h @@ -142,12 +142,9 @@ struct Adv int pref; }; -void irdp_init(); -void irdp_finish(); -void irdp_config_write (struct vty *, struct interface *); -#endif /* _IRDP_H */ - - - - +extern void irdp_init(void); +extern int irdp_sock_init(void); +extern void irdp_finish(void); +extern void irdp_config_write (struct vty *, struct interface *); +#endif /* _IRDP_H */ -- cgit v1.2.1