sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 4.6.20100227. A small fix for 127/8 interface

Browse source 
handling.

Feature safe:	yes
This commit is contained in:
Hiroki Sato 2010-03-02 05:53:36 +00:00
parent dcdecb6a45
commit 12fcdc3c39
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=250493
3 changed files with 39 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/openbgpd/Makefile
View file

@ -6,8 +6,7 @@
# #
PORTNAME= openbgpd PORTNAME= openbgpd
PORTVERSION= 4.6.20100215 PORTVERSION= 4.6.20100227
PORTREVISION= 1
CATEGORIES= net CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_OPENBSD} MASTER_SITES= ${MASTER_SITE_OPENBSD}
MASTER_SITE_SUBDIR= OpenBGPD MASTER_SITE_SUBDIR= OpenBGPD

21
net/openbgpd/files/patch-bgpd_bgpd.8
View file

@ -2,10 +2,10 @@ Index: bgpd/bgpd.8
=================================================================== ===================================================================
RCS file: /home/cvs/private/hrs/openbgpd/bgpd/bgpd.8,v RCS file: /home/cvs/private/hrs/openbgpd/bgpd/bgpd.8,v
retrieving revision 1.1.1.8 retrieving revision 1.1.1.8
retrieving revision 1.7 retrieving revision 1.8
diff -u -p -r1.1.1.8 -r1.7 diff -u -p -r1.1.1.8 -r1.8
--- bgpd/bgpd.8 14 Feb 2010 20:19:57 -0000 1.1.1.8 --- bgpd/bgpd.8 14 Feb 2010 20:19:57 -0000 1.1.1.8
+++ bgpd/bgpd.8 4 Feb 2010 16:22:23 -0000 1.7 +++ bgpd/bgpd.8 2 Mar 2010 05:48:19 -0000 1.8
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-.\" $OpenBSD: bgpd.8,v 1.28 2009/01/13 23:01:36 sthen Exp $ -.\" $OpenBSD: bgpd.8,v 1.28 2009/01/13 23:01:36 sthen Exp $
+.\" $OpenBSD: bgpd.8,v 1.33 2009/12/16 15:40:55 claudio Exp $ +.\" $OpenBSD: bgpd.8,v 1.33 2009/12/16 15:40:55 claudio Exp $
@ -17,10 +17,23 @@ diff -u -p -r1.1.1.8 -r1.7
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\" .\"
-.Dd $Mdocdate: January 13 2009 $ -.Dd $Mdocdate: January 13 2009 $
+.Dd $Mdocdate: October 26 2009 $ +.Dd $Mdocdate: December 16 2009 $
.Dt BGPD 8 .Dt BGPD 8
.Os .Os
.Sh NAME .Sh NAME
@@ -24,9 +24,9 @@
.Nm bgpd
.Bk -words
.Op Fl cdnv
-.Oo Xo
-.Fl D Ar macro Ns = Ns Ar value Oc
-.Xc
+.Oo
+.Fl D Ar macro Ns = Ns Ar value
+.Oc
.Op Fl f Ar file
.Op Fl r Ar path
.Op Fl s Ar path
@@ -48,9 +48,9 @@ Please refer to that document for more i @@ -48,9 +48,9 @@ Please refer to that document for more i
.Nm .Nm
is usually started at boot time, and can be enabled by is usually started at boot time, and can be enabled by

24
net/openbgpd/files/patch-bgpd_kroute.c
View file

@ -2,10 +2,10 @@ Index: bgpd/kroute.c
=================================================================== ===================================================================
RCS file: /home/cvs/private/hrs/openbgpd/bgpd/kroute.c,v RCS file: /home/cvs/private/hrs/openbgpd/bgpd/kroute.c,v
retrieving revision 1.1.1.7 retrieving revision 1.1.1.7
retrieving revision 1.7 retrieving revision 1.8
diff -u -p -r1.1.1.7 -r1.7 diff -u -p -r1.1.1.7 -r1.8
--- bgpd/kroute.c 14 Feb 2010 20:19:57 -0000 1.1.1.7 --- bgpd/kroute.c 14 Feb 2010 20:19:57 -0000 1.1.1.7
+++ bgpd/kroute.c 19 Feb 2010 01:29:05 -0000 1.7 +++ bgpd/kroute.c 2 Mar 2010 05:48:19 -0000 1.8
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-/* $OpenBSD: kroute.c,v 1.169 2009/06/25 15:54:22 claudio Exp $ */ -/* $OpenBSD: kroute.c,v 1.169 2009/06/25 15:54:22 claudio Exp $ */
+/* $OpenBSD: kroute.c,v 1.173 2009/12/01 14:28:05 claudio Exp $ */ +/* $OpenBSD: kroute.c,v 1.173 2009/12/01 14:28:05 claudio Exp $ */
@ -255,6 +255,15 @@ diff -u -p -r1.1.1.7 -r1.7
k6 = kn->kroute; k6 = kn->kroute;
k6->r.flags &= ~F_NEXTHOP; k6->r.flags &= ~F_NEXTHOP;
break; break;
@@ -1675,7 +1684,7 @@ protect_lo(void)
log_warn("protect_lo");
return (-1);
}
- kr->r.prefix.s_addr = htonl(INADDR_LOOPBACK);
+ kr->r.prefix.s_addr = htonl(INADDR_LOOPBACK & IN_CLASSA_NET);
kr->r.prefixlen = 8;
kr->r.flags = F_KERNEL|F_CONNECTED;
@@ -1689,7 +1698,7 @@ protect_lo(void) @@ -1689,7 +1698,7 @@ protect_lo(void)
} }
memcpy(&kr6->r.prefix, &in6addr_loopback, sizeof(kr6->r.prefix)); memcpy(&kr6->r.prefix, &in6addr_loopback, sizeof(kr6->r.prefix));
@ -264,6 +273,15 @@ diff -u -p -r1.1.1.7 -r1.7
if (RB_INSERT(kroute6_tree, &krt6, kr6) != NULL) if (RB_INSERT(kroute6_tree, &krt6, kr6) != NULL)
free(kr6); /* kernel route already there, no problem */ free(kr6); /* kernel route already there, no problem */
@@ -1788,7 +1797,7 @@ prefixlen2mask6(u_int8_t prefixlen)
}
#define ROUNDUP(a) \
- (((a) & ((sizeof(long)) - 1)) ? (1 + ((a) | ((sizeof(long)) - 1))) : (a))
+ (((a) & (sizeof(long) - 1)) ? (1 + ((a) | (sizeof(long) - 1))) : (a))
void
get_rtaddrs(int addrs, struct sockaddr *sa, struct sockaddr **rti_info)
@@ -1849,7 +1858,7 @@ if_change(u_short ifindex, int flags, st @@ -1849,7 +1858,7 @@ if_change(u_short ifindex, int flags, st
nh.connected = 1; nh.connected = 1;
if ((nh.gateway.v4.s_addr = if ((nh.gateway.v4.s_addr =