diff options
author | Hiroki Sato <hrs@FreeBSD.org> | 2009-11-02 07:09:37 +0000 |
---|---|---|
committer | Hiroki Sato <hrs@FreeBSD.org> | 2009-11-02 07:09:37 +0000 |
commit | dfb37f5194640d9659c92db8e16c0bd4c15e39ca (patch) | |
tree | ddf8dc54b4f130691e5d3297526db8e1170b4e33 /net/openbgpd/files/patch-bgpd_session.h | |
parent | Update dictionary as of Nov/1/2009. (diff) |
Update to 20091022 snapshot.
Notes
Notes:
svn path=/head/; revision=243629
Diffstat (limited to 'net/openbgpd/files/patch-bgpd_session.h')
-rw-r--r-- | net/openbgpd/files/patch-bgpd_session.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/net/openbgpd/files/patch-bgpd_session.h b/net/openbgpd/files/patch-bgpd_session.h index ddd590114c1f..b7d84da0b6d2 100644 --- a/net/openbgpd/files/patch-bgpd_session.h +++ b/net/openbgpd/files/patch-bgpd_session.h @@ -2,10 +2,10 @@ Index: bgpd/session.h =================================================================== RCS file: /home/cvs/private/hrs/openbgpd/bgpd/session.h,v retrieving revision 1.1.1.1 -retrieving revision 1.1.1.2 -diff -u -p -r1.1.1.1 -r1.1.1.2 +retrieving revision 1.1.1.3 +diff -u -p -r1.1.1.1 -r1.1.1.3 --- bgpd/session.h 30 Jun 2009 05:46:15 -0000 1.1.1.1 -+++ bgpd/session.h 9 Jul 2009 16:49:54 -0000 1.1.1.2 ++++ bgpd/session.h 22 Oct 2009 14:24:02 -0000 1.1.1.3 @@ -1,4 +1,4 @@ -/* $OpenBSD: session.h,v 1.98 2008/05/08 09:53:12 henning Exp $ */ +/* $OpenBSD: session.h,v 1.101 2009/06/05 20:26:38 claudio Exp $ */ @@ -20,7 +20,7 @@ diff -u -p -r1.1.1.1 -r1.1.1.2 Timer_Max }; -@@ -227,7 +228,8 @@ struct ctl_timer { +@@ -227,13 +228,15 @@ struct ctl_timer { void session_socket_blockmode(int, enum blockmodes); pid_t session_main(struct bgpd_config *, struct peer *, struct network_head *, struct filter_head *, @@ -30,7 +30,14 @@ diff -u -p -r1.1.1.1 -r1.1.1.2 void bgp_fsm(struct peer *, enum session_events); int session_neighbor_rrefresh(struct peer *p); struct peer *getpeerbyaddr(struct bgpd_addr *); -@@ -254,8 +256,8 @@ void prepare_listeners(struct bgpd_conf + struct peer *getpeerbydesc(const char *); + int imsg_compose_parent(int, pid_t, void *, u_int16_t); + int imsg_compose_rde(int, pid_t, void *, u_int16_t); ++void session_stop(struct peer *, u_int8_t); + + /* log.c */ + char *log_fmt_peer(const struct peer_config *); +@@ -254,8 +257,8 @@ void prepare_listeners(struct bgpd_conf /* rde.c */ pid_t rde_main(struct bgpd_config *, struct peer *, struct network_head *, @@ -41,7 +48,7 @@ diff -u -p -r1.1.1.1 -r1.1.1.2 /* control.c */ int control_init(int, char *); -@@ -270,8 +272,9 @@ int pfkey_remove(struct peer *); +@@ -270,8 +273,9 @@ int pfkey_remove(struct peer *); int pfkey_init(struct bgpd_sysdep *); /* printconf.c */ |