fixup! bgp/attrs: Protocols print warnings when the size of memory they allocated...

diff --git a/doc/bird.sgml b/doc/bird.sgml
index 9d92848776ce109d197115bb442fc4f1e8366c3a..202c38a647538b3fa0f2a0b4ae99a6636fc7a3be 100644 (file)
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -3420,7 +3420,7 @@ using the following configuration parameters:
        in <rfc id="9234"> as "strict mode" and is used to enforce corresponding
        configuration at your conterpart side. Default: disabled.
 
-        <tag><label id="bgp-tx_size_warning">tx_size warning <m/switch/</tag>
+        <tag><label id="bgp-tx_size_warning">tx size warning <m/number/</tag>
         If this option is set, the bgp protocol prints warning when it consumes at least
         given size of memory.
 </descrip>

diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y
index 27ed3fc38f37e2f7185f7403884338ce0aefa252..4c6d5b2a6f81ca7aabf3f02c0214c1d97eca3ac8 100644 (file)
--- a/proto/bgp/config.Y
+++ b/proto/bgp/config.Y
@@ -31,7 +31,7 @@ CF_KEYWORDS(BGP, LOCAL, NEIGHBOR, AS, HOLD, TIME, CONNECT, RETRY, KEEPALIVE,
        LIVED, STALE, IMPORT, IBGP, EBGP, MANDATORY, INTERNAL, EXTERNAL, SETS,
        DYNAMIC, RANGE, NAME, DIGITS, AIGP, ORIGINATE, COST, ENFORCE,
        FIRST, FREE, VALIDATE, BASE, ROLE, ROLES, PEER, PROVIDER, CUSTOMER,
-       RS_SERVER, RS_CLIENT, REQUIRE, BGP_OTC, GLOBAL, SEND, TX_SIZE, WARNING)
+       RS_SERVER, RS_CLIENT, REQUIRE, BGP_OTC, GLOBAL, SEND, TX, SIZE, WARNING)
 
 CF_ENUM(T_ENUM_BGP_ORIGIN, ORIGIN_, IGP, EGP, INCOMPLETE)
 
@@ -80,7 +80,7 @@ bgp_proto_start: proto_start BGP {
      BGP_CFG->dynamic_name = "dynbgp";
      BGP_CFG->check_link = -1;
      BGP_CFG->send_hold_time = -1;
-     BGP_CFG->tx_size_warning = -1;
+     BGP_CFG->tx_size_warning = 16000000;
    }
  ;
 
@@ -228,7 +228,7 @@ bgp_proto:
  | bgp_proto LOCAL ROLE bgp_role_name ';' { BGP_CFG->local_role = $4; }
  | bgp_proto REQUIRE ROLES bool ';' { BGP_CFG->require_roles = $4; }
  | bgp_proto DISABLE RX bool ';' { BGP_CFG->disable_rx = $4; }
- | bgp_proto TX_SIZE WARNING expr ';' { BGP_CFG->tx_size_warning = $4; }
+ | bgp_proto TX SIZE WARNING expr ';' { BGP_CFG->tx_size_warning = $5; }
  ;
 
 bgp_afi: