mirror of
https://github.com/hansjone/netx.git
synced 2026-10-10 03:30:49 +08:00
Fix VPNv6 wrap parsing and expand global BGP peer-group members.
Join IPv6 summary/route continuations; reject false FSM hits. For non-VRF AF activates, expand peer-group to member Neighbor IPs (VRF stays direct-only). Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
parent
e89427297d
commit
0aa2bcbbe6
7 changed files with 295 additions and 62 deletions
|
|
@ -1,5 +1,5 @@
|
|||
Value NETWORK (\S+)
|
||||
Value NEXT_HOP (\S+)
|
||||
Value NETWORK (\d{1,3}(?:\.\d{1,3}){3}/\d{1,2}|[0-9A-Fa-f:]+/\d{1,3})
|
||||
Value NEXT_HOP (\d{1,3}(?:\.\d{1,3}){3}|[0-9A-Fa-f:]+)
|
||||
Value METRIC (\S*)
|
||||
Value LOC_PRF (\S*)
|
||||
Value TAG (\S*)
|
||||
|
|
@ -26,8 +26,13 @@ Routes
|
|||
^\s*\*?\s*Network\s+Next
|
||||
^Network\s+Next
|
||||
^\s*Dest\s+Next
|
||||
# One-line IPv4-style
|
||||
^\s*\*?\s*>?\s*${NETWORK}\s+${NEXT_HOP}\s+${METRIC}\s+${LOC_PRF}\s+${TAG}\s+${PATH}\s*$$ -> Record
|
||||
^\s*\*?\s*>?\s*${NETWORK}\s+${NEXT_HOP}\s+${PATH}\s*$$ -> Record
|
||||
# IPv6 wrap: network / next-hop / metrics+path on separate lines
|
||||
^\s*\*?\s*>?\s*${NETWORK}\s*$$
|
||||
^\s+${NEXT_HOP}\s*$$
|
||||
^\s+${PATH}\s*$$ -> Record
|
||||
^\s*$$
|
||||
^\S+\s*#\s*$$ -> End
|
||||
^.*#\s*$$ -> End
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Value NEIGHBOR (\S+)
|
||||
Value NEIGHBOR ([0-9]{1,3}(?:\.[0-9]{1,3}){3}|[0-9A-Fa-f]*:[0-9A-Fa-f:]+)
|
||||
Value VER (\d+)
|
||||
Value ASN (\S+)
|
||||
Value MSG_RCVD (\d+)
|
||||
|
|
@ -12,7 +12,11 @@ Start
|
|||
^.* -> Start
|
||||
|
||||
Peers
|
||||
# Single-line IPv4 (or short IPv6) peer
|
||||
^${NEIGHBOR}\s+${VER}\s+${ASN}\s+${MSG_RCVD}\s+${MSG_SEND}\s+${UP_DOWN}\s+${STATE_PFX}\s*$$ -> Record
|
||||
# IPv6 / long neighbor alone; stats on the next indented line
|
||||
^${NEIGHBOR}\s*$$
|
||||
^\s+${VER}\s+${ASN}\s+${MSG_RCVD}\s+${MSG_SEND}\s+${UP_DOWN}\s+${STATE_PFX}\s*$$ -> Record
|
||||
^All\s+
|
||||
^BGP\s+
|
||||
^Local\s+
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue