diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2013-11-25 18:42:47 +0100 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2013-11-25 18:42:47 +0100 |
| commit | 283c7dfada53a6dee6a8a17ecab492ffafd44b66 (patch) | |
| tree | 5edfb9df61c3b625967f3c65317f27c5051a8a4d /proto/bgp/config.Y | |
| parent | 736e143fa50607fcd88132291e96089b899af979 (diff) | |
| parent | 0bb4e37db317a1290bad24fe430cac6569a9bd8c (diff) | |
Merge branch 'master' into add-path
Diffstat (limited to 'proto/bgp/config.Y')
| -rw-r--r-- | proto/bgp/config.Y | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y index ab12fed5..76a76470 100644 --- a/proto/bgp/config.Y +++ b/proto/bgp/config.Y @@ -34,6 +34,7 @@ CF_ADDTO(proto, bgp_proto '}' { bgp_check_config(BGP_CFG); } ) bgp_proto_start: proto_start BGP { this_proto = proto_config_new(&proto_bgp, sizeof(struct bgp_config), $1); + BGP_CFG->multihop = -1; /* undefined */ BGP_CFG->hold_time = 240; BGP_CFG->connect_retry_time = 120; BGP_CFG->initial_hold_time = 240; @@ -74,6 +75,7 @@ bgp_proto: | bgp_proto STARTUP HOLD TIME expr ';' { BGP_CFG->initial_hold_time = $5; } | bgp_proto CONNECT RETRY TIME expr ';' { BGP_CFG->connect_retry_time = $5; } | bgp_proto KEEPALIVE TIME expr ';' { BGP_CFG->keepalive_time = $4; } + | bgp_proto DIRECT ';' { BGP_CFG->multihop = 0; } | bgp_proto MULTIHOP ';' { BGP_CFG->multihop = 64; } | bgp_proto MULTIHOP expr ';' { BGP_CFG->multihop = $3; if (($3<1) || ($3>255)) cf_error("Multihop must be in range 1-255"); } | bgp_proto NEXT HOP SELF ';' { BGP_CFG->next_hop_self = 1; BGP_CFG->next_hop_keep = 0; } |