author | Rishi Srivatsavai <Rishi.Srivatsavai@oracle.com> |
Mon, 29 Aug 2011 19:48:54 -0700 | |
changeset 499 | fea5d407097b |
parent 417 | 7c10b5cba79b |
permissions | -rw-r--r-- |
417
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
1 |
commit 7b87b33fa53254f14b79e95bb8a0b24f8ef9e1c1 |
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
2 |
Author: Paul Jakma <[email protected]> |
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
3 |
Date: Mon Sep 17 13:51:28 2007 +0100 |
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
4 |
|
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
5 |
[bgpd] Fix typo, which prevented advertisement of MP (non-IPv4) prefixes |
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
6 |
|
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
7 |
2007-09-17 Paul Jakma <[email protected]> |
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
8 |
|
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
9 |
* bgp_open.c: (bgp_capability_mp) We were setting |
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
10 |
afc_nego[safi][safi] rather than afc_nego[afi][safi], thus |
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
11 |
failling to announce any non-IPv4 prefixes. Remove the extra, |
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
12 |
typo-ed character. |
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
13 |
* tests/bgp_capability_test.c: Test that peer's adv_recv and |
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
14 |
adv_nego get set correctly for MP capability and given AFI/SAFI. |
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
15 |
Colour OK/failed result so it's easier to find them. |
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
16 |
|
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
17 |
--- bgpd/bgp_open.c |
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
18 |
+++ bgpd/bgp_open.c |
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
19 |
@@ -177,7 +177,7 @@ bgp_capability_mp (struct peer *peer, struct capability_header *hdr) |
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
20 |
peer->afc_recv[mpc.afi][mpc.safi] = 1; |
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
21 |
|
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
22 |
if (peer->afc[mpc.afi][mpc.safi]) |
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
23 |
- peer->afc_nego[mpc.safi][mpc.safi] = 1; |
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
24 |
+ peer->afc_nego[mpc.afi][mpc.safi] = 1; |
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
25 |
else |
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
26 |
return -1; |
7c10b5cba79b
7066915 Move Quagga to Userland
Brian Utterback <Brian.Utterback@Oracle.COM>
parents:
diff
changeset
|
27 |