diff options
| author | Stefan Walter <stefan@FreeBSD.org> | 2008-12-17 15:58:32 +0000 |
|---|---|---|
| committer | Stefan Walter <stefan@FreeBSD.org> | 2008-12-17 15:58:32 +0000 |
| commit | 073943d1f3f2c04207ec379472ca1706d3dda456 (patch) | |
| tree | dc44970c08bfca82825739873773caf8ca19acea /net/openbgpd/files/patch-bgpd_carp.c | |
| parent | - Update to 2.6.12 (diff) | |
- Update to 4.2.
- Provide LINK_STATE_IS_UP macros that is missing in FreeBSD.
- Disable CARP demotion: FreeBSD has no support for it.
- Disable check for the routing table number: FreeBSD has single routing table
now.
- Disable route labeling: FreeBSD has no support for it.
PR: 121831
Submitted by: Matthieu Guegan <matthieu@virtua.ch>
Approved by: maintainer timeout (9 months)
Notes
Notes:
svn path=/head/; revision=224336
Diffstat (limited to 'net/openbgpd/files/patch-bgpd_carp.c')
| -rw-r--r-- | net/openbgpd/files/patch-bgpd_carp.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/net/openbgpd/files/patch-bgpd_carp.c b/net/openbgpd/files/patch-bgpd_carp.c index eb6c4e3b10cb..fee9e485761e 100644 --- a/net/openbgpd/files/patch-bgpd_carp.c +++ b/net/openbgpd/files/patch-bgpd_carp.c @@ -1,6 +1,6 @@ ---- bgpd/carp.c 19 Jun 2006 12:06:24 -0000 1.3 -+++ bgpd/carp.c 8 Feb 2007 10:31:16 -0000 -@@ -102,28 +102,7 @@ carp_demote_shutdown(void) +--- bgpd/carp.c 2007-04-23 16:52:28.000000000 +0200 ++++ bgpd/carp.c 2008-03-18 13:27:29.000000000 +0100 +@@ -102,28 +102,7 @@ int carp_demote_get(char *group) { @@ -21,16 +21,15 @@ - else - log_warn("carp_demote_get: ioctl"); - close(s); -- return (-1); + return (-1); - } - - close(s); - return ((int)ifgr.ifgr_attrib.ifg_carp_demoted); -+ return (-1); } int -@@ -156,26 +135,5 @@ carp_demote_set(char *group, int demote) +@@ -156,26 +135,5 @@ int carp_demote_ioctl(char *group, int demote) { @@ -39,7 +38,7 @@ - - if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) { - log_warn("carp_demote_get: socket"); -- return (-1); + return (-1); - } - - bzero(&ifgr, sizeof(ifgr)); @@ -54,12 +53,6 @@ - log_info("%s the demote state of group '%s'", - (demote > 0) ? "incremented" : "decremented", group); - -- close (s); +- close(s); - return (res); -+ return (-1); } -Index: kroute.c -=================================================================== -RCS file: /cvs/src/usr.sbin/bgpd/kroute.c,v -retrieving revision 1.147 -diff -u -p -r1.147 kroute.c |