diff options
| author | Avneesh Sachdev <avneesh@opensourcerouting.org> | 2012-04-11 23:51:08 -0700 |
|---|---|---|
| committer | Avneesh Sachdev <avneesh@opensourcerouting.org> | 2012-04-11 23:51:08 -0700 |
| commit | 14d2bbaa3f4aa53152472694c29f336808e47313 (patch) | |
| tree | e39bdddef4ea53207dd8fb61e1fd6b54d8c7721d /doc/BGP-TypeCode | |
| parent | 51d4ef832c1e58150325630e25c442866e5a6cf5 (diff) | |
| parent | e96b312150d8e376c1ef463793d1929eca3618d5 (diff) | |
Merge quagga mainline into the google ISIS code.
The steps were:
$ git checkout google-is-is
$ git merge quagga
$ git checkout google-is-is -- isisd
# Resolve conflicts in the following:
lib/md5.h
zebra/rt_netlink.c
zebra/zebra_rib.c
zebra/zserv.c
Note that the content in the isisd directory is left unchanged in the
merge. As a result, changes made to isisd as part of the following
commits on the quagga mainline are dropped.
# 8ced4e82 is the merge base, e96b3121 is the current quagga master
$ git log --oneline --reverse 8ced4e82..e96b3121 -- isisd
5574999 isisd: fix crash on "no router isis" (BZ#536)
8998075 isisd: raise hello rate for DIS (BZ#539)
306ca83 isisd: include hash.h, not hash.c
b82cdeb delete CVS keywords
2f65867 isisd: indent longopts array
b511468 quagga: option "-z" ("--socket <path>") added
05e54ee build: delete .cvsignore files
b4e45f6 fix zebra protocol after MP-BGP changes
7fd6cd8 isisd: fix circuit state machine
907fd95 isisd: send proper LSP after DIS election
d034aa0 isisd: fix wrong next-hops from SPF
c25eaff isisd: unexpected kernel routing table (BZ#544)
e6b03b7 isisd: implement MD5 circuit authentication
Diffstat (limited to 'doc/BGP-TypeCode')
| -rw-r--r-- | doc/BGP-TypeCode | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/doc/BGP-TypeCode b/doc/BGP-TypeCode index 5663c4d7..b3218079 100644 --- a/doc/BGP-TypeCode +++ b/doc/BGP-TypeCode @@ -3,24 +3,22 @@ Value Attribute References ========================================================================= - 1 ORIGIN [RFC 1771] - 2 AS_PATH [RFC 1771] - 3 NEXT_HOP [RFC 1771] - 4 MULTI_EXIT_DISC [RFC 1771] - 5 LOCAL_PREF [RFC 1771] - 6 ATOMIC_AGGREGATE [RFC 1771] - 7 AGGREGATOR [RFC 1771] + 1 ORIGIN [RFC 4271] + 2 AS_PATH [RFC 4271] + 3 NEXT_HOP [RFC 4271] + 4 MULTI_EXIT_DISC [RFC 4271] + 5 LOCAL_PREF [RFC 4271] + 6 ATOMIC_AGGREGATE [RFC 4271] + 7 AGGREGATOR [RFC 4271] 8 COMMUNITIES [RFC 1997] - 9 ORIGINATOR_ID [RFC 1966] - 10 CLUSTER_LIST [RFC 1966] + 9 ORIGINATOR_ID [RFC 4456] + 10 CLUSTER_LIST [RFC 4456] 11 DPA [draft-ietf-idr-bgp-dpa-05.txt(expired)] - 12 ADVERTISER [Changed from RFC 1863 bgp@ans.net ML?] - 13 RCID_PATH [Changed from RFC 1863 bgp@ans.net ML?] - 14 MP_REACH_NLRI [RFC 2283] - 15 MP_UNREACH_NLRI [RFC 2283] - 16 EXT_COMMUNITIES [draft-ramachandra-bgp-ext-communities-09.txt] + 12 ADVERTISER [RFC 1863] + 13 RCID_PATH [RFC 1863] + 14 MP_REACH_NLRI [RFC 4760] + 15 MP_UNREACH_NLRI [RFC 4760] + 16 EXT_COMMUNITIES [RFC 4360] 17 AS4_PATH [RFC 4893] 18 AS4_AGGREGATOR [RFC 4893] - 254 RCID_PATH [RFC 1863] - 255 ADVERTISER [RFC 1863] ========================================================================= |