diff options
Diffstat (limited to 'usr.sbin/bgpd')
| -rw-r--r-- | usr.sbin/bgpd/control.c | 4 | ||||
| -rw-r--r-- | usr.sbin/bgpd/session.c | 7 | ||||
| -rw-r--r-- | usr.sbin/bgpd/session.h | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/usr.sbin/bgpd/control.c b/usr.sbin/bgpd/control.c index 27866a16c2c..01dd6ba8085 100644 --- a/usr.sbin/bgpd/control.c +++ b/usr.sbin/bgpd/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.50 2006/05/23 12:11:38 henning Exp $ */ +/* $OpenBSD: control.c,v 1.51 2006/05/27 15:43:13 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -111,7 +111,7 @@ control_cleanup(const char *path) unlink(path); } -int +unsigned int control_accept(int listenfd, int restricted) { int connfd; diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c index 5aa9a11676c..f537113c18e 100644 --- a/usr.sbin/bgpd/session.c +++ b/usr.sbin/bgpd/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.247 2006/05/23 12:11:38 henning Exp $ */ +/* $OpenBSD: session.c,v 1.248 2006/05/27 15:43:13 claudio Exp $ */ /* * Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org> @@ -76,7 +76,6 @@ int parse_open(struct peer *); int parse_update(struct peer *); int parse_refresh(struct peer *); int parse_notification(struct peer *); -int parse_keepalive(struct peer *); int parse_capabilities(struct peer *, u_char *, u_int16_t); void session_dispatch_imsg(struct imsgbuf *, int, u_int *); void session_up(struct peer *); @@ -164,8 +163,8 @@ session_main(struct bgpd_config *config, struct peer *cpeers, struct network_head *net_l, struct filter_head *rules, struct mrt_head *m_l, int pipe_m2s[2], int pipe_s2r[2], int pipe_m2r[2]) { - int nfds, i, j, timeout; - int idx_peers, idx_listeners, idx_mrts; + int nfds, timeout; + unsigned int i, j, idx_peers, idx_listeners, idx_mrts; pid_t pid; time_t nextaction; u_int pfd_elms = 0, peer_l_elms = 0, mrt_l_elms = 0; diff --git a/usr.sbin/bgpd/session.h b/usr.sbin/bgpd/session.h index 6f9673bfbf0..38fc2f5584e 100644 --- a/usr.sbin/bgpd/session.h +++ b/usr.sbin/bgpd/session.h @@ -1,4 +1,4 @@ -/* $OpenBSD: session.h,v 1.82 2006/05/23 12:11:38 henning Exp $ */ +/* $OpenBSD: session.h,v 1.83 2006/05/27 15:43:13 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -220,7 +220,7 @@ int control_init(int, char *); int control_listen(int); void control_shutdown(int); int control_dispatch_msg(struct pollfd *, u_int *); -int control_accept(int, int); +unsigned int control_accept(int, int); /* pfkey.c */ int pfkey_establish(struct peer *); |