]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge pull request #12248 from pguibert6WIND/bgpasdot
authorRuss White <russ@riw.us>
Tue, 21 Feb 2023 13:01:03 +0000 (08:01 -0500)
committerGitHub <noreply@github.com>
Tue, 21 Feb 2023 13:01:03 +0000 (08:01 -0500)
lib, bgp: add initial support for asdot format

48 files changed:
1  2 
bgpd/bgp_aspath.c
bgpd/bgp_aspath.h
bgpd/bgp_attr.c
bgpd/bgp_btoa.c
bgpd/bgp_debug.c
bgpd/bgp_evpn.c
bgpd/bgp_evpn_mh.c
bgpd/bgp_evpn_private.h
bgpd/bgp_evpn_vty.c
bgpd/bgp_mplsvpn.c
bgpd/bgp_mplsvpn_snmp.c
bgpd/bgp_network.c
bgpd/bgp_nexthop.c
bgpd/bgp_nht.c
bgpd/bgp_rd.c
bgpd/bgp_rd.h
bgpd/bgp_route.c
bgpd/bgp_route.h
bgpd/bgp_routemap.c
bgpd/bgp_rpki.c
bgpd/bgp_script.c
bgpd/bgp_vty.c
bgpd/bgp_vty.h
bgpd/bgpd.c
bgpd/bgpd.h
bgpd/rfapi/bgp_rfapi_cfg.c
bgpd/rfapi/rfapi.c
bgpd/rfapi/rfapi_import.c
bgpd/rfapi/rfapi_rib.c
bgpd/rfapi/rfapi_vty.c
doc/user/bgp.rst
lib/command.c
lib/command.h
lib/command_graph.c
lib/command_graph.h
lib/command_lex.l
lib/command_match.c
lib/command_parse.y
lib/command_py.c
lib/prefix.h
lib/subdir.am
python/clidef.py
tests/bgpd/test_aspath.c
tests/bgpd/test_capability.c
tests/bgpd/test_mp_attr.c
tests/bgpd/test_packet.c
tests/lib/test_printfrr.c
vtysh/vtysh.c

Simple merge
Simple merge
diff --cc bgpd/bgp_attr.c
Simple merge
diff --cc bgpd/bgp_btoa.c
Simple merge
Simple merge
diff --cc bgpd/bgp_evpn.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc bgpd/bgp_nht.c
Simple merge
diff --cc bgpd/bgp_rd.c
Simple merge
diff --cc bgpd/bgp_rd.h
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc bgpd/bgp_rpki.c
Simple merge
Simple merge
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc bgpd/bgp_vty.h
Simple merge
diff --cc bgpd/bgpd.c
Simple merge
diff --cc bgpd/bgpd.h
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/command.c
Simple merge
diff --cc lib/command.h
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/prefix.h
Simple merge
diff --cc lib/subdir.am
index 8d00668c8c0fdc5e5479049adfd0ac547b71c345,9a00cd01b1692ce683267d66440ff06f0aac01bb..beef8675aaba28b5dc1755b0a9e0164f3fe3e549
@@@ -7,12 -7,9 +7,13 @@@ lib_libfrr_la_LDFLAGS = $(LIB_LDFLAGS) 
  lib_libfrr_la_LIBADD = $(LIBCAP) $(UNWIND_LIBS) $(LIBYANG_LIBS) $(LUA_LIB) $(UST_LIBS) $(LIBCRYPT) $(LIBDL) $(LIBM)
  
  lib_libfrr_la_SOURCES = \
 +      lib/admin_group.c \
 +      lib/affinitymap.c \
 +      lib/affinitymap_cli.c \
 +      lib/affinitymap_northbound.c \
        lib/agg_table.c \
        lib/atomlist.c \
+       lib/asn.c \
        lib/base64.c \
        lib/bfd.c \
        lib/buffer.c \
@@@ -166,9 -160,8 +167,10 @@@ clippy_scan += 
        # end
  
  pkginclude_HEADERS += \
 +      lib/admin_group.h \
 +      lib/affinitymap.h \
        lib/agg_table.h \
+       lib/asn.h \
        lib/atomlist.h \
        lib/base64.h \
        lib/bfd.h \
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc vtysh/vtysh.c
Simple merge