Skip to content

Commit 25c2c6a

Browse files
committed
config: remove neighbors.transport.config.ttl option
use neighbors.ebgp-multihop.config.multihop-ttl or ttl-security. Signed-off-by: FUJITA Tomonori <[email protected]>
1 parent 6b9d9b1 commit 25c2c6a

File tree

4 files changed

+0
-16
lines changed

4 files changed

+0
-16
lines changed

docs/sources/configuration.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
passive-mode = true
8080
local-address = "192.168.10.1"
8181
remote-port = 2016
82-
ttl = 64 # default value on Linux
8382
[neighbors.ebgp-multihop.config]
8483
enabled = true #directly connection should be set false,if not ,peer will be deleted after hold-time
8584
multihop-ttl = 100

pkg/config/oc/bgp_configs.go

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/server/fsm.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -962,13 +962,9 @@ func setPeerConnTTL(fsm *fsm, conn net.Conn) error {
962962
} else if fsm.pConf.Config.PeerAs != 0 && fsm.pConf.Config.PeerType == oc.PEER_TYPE_EXTERNAL {
963963
if fsm.pConf.EbgpMultihop.Config.Enabled {
964964
ttl = int(fsm.pConf.EbgpMultihop.Config.MultihopTtl)
965-
} else if fsm.pConf.Transport.Config.Ttl != 0 {
966-
ttl = int(fsm.pConf.Transport.Config.Ttl)
967965
} else {
968966
ttl = 1
969967
}
970-
} else if fsm.pConf.Transport.Config.Ttl != 0 {
971-
ttl = int(fsm.pConf.Transport.Config.Ttl)
972968
}
973969

974970
if ttl != 0 {

tools/pyang_plugins/gobgp.yang

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -927,11 +927,6 @@ module gobgp {
927927
type inet:port-number;
928928
}
929929

930-
leaf ttl {
931-
description "TTL value for BGP packets";
932-
type uint8;
933-
}
934-
935930
leaf bind-interface {
936931
description "Interface name for binding.";
937932
type string;

0 commit comments

Comments
 (0)