diff options
| -rw-r--r-- | config/bgp_configs.go | 3 | ||||
| -rw-r--r-- | server/fsm.go | 10 | ||||
| -rw-r--r-- | tools/pyang_plugins/gobgp.yang | 8 |
3 files changed, 18 insertions, 3 deletions
diff --git a/config/bgp_configs.go b/config/bgp_configs.go index 3a5a1b6b..d5eb930d 100644 --- a/config/bgp_configs.go +++ b/config/bgp_configs.go @@ -1480,6 +1480,9 @@ type NeighborConfig struct { // original -> bgp:neighbor-address //bgp:neighbor-address's original type is inet:ip-address NeighborAddress string `mapstructure:"neighbor-address"` + // original -> gobgp:neighbor-port-number + //gobgp:neighbor-port-number's original type is inet:port-number + NeighborPortNumber uint16 `mapstructure:"neighbor-port-number"` } //struct for container bgp:neighbor diff --git a/server/fsm.go b/server/fsm.go index 01587668..487e80c3 100644 --- a/server/fsm.go +++ b/server/fsm.go @@ -300,7 +300,11 @@ func (fsm *FSM) connectLoop() error { connect := func() { if fsm.state == bgp.BGP_FSM_ACTIVE && !fsm.pConf.GracefulRestart.State.PeerRestarting { addr := fsm.pConf.Config.NeighborAddress - host := net.JoinHostPort(addr, strconv.Itoa(bgp.BGP_PORT)) + port := int(bgp.BGP_PORT) + if fsm.pConf.Config.NeighborPortNumber != 0 { + port = int(fsm.pConf.Config.NeighborPortNumber) + } + host := net.JoinHostPort(addr, strconv.Itoa(port)) // check if LocalAddress has been configured laddr := fsm.pConf.Transport.Config.LocalAddress var conn net.Conn @@ -308,7 +312,7 @@ func (fsm *FSM) connectLoop() error { if laddr != "" { if fsm.pConf.Config.AuthPassword != "" { deadline := (MIN_CONNECT_RETRY - 1) * 1000 // msec - conn, err = DialTCPTimeoutWithMD5Sig(addr, bgp.BGP_PORT, laddr, fsm.pConf.Config.AuthPassword, deadline) + conn, err = DialTCPTimeoutWithMD5Sig(addr, port, laddr, fsm.pConf.Config.AuthPassword, deadline) } else { lhost := net.JoinHostPort(laddr, "0") ltcpaddr, e := net.ResolveTCPAddr("tcp", lhost) @@ -325,7 +329,7 @@ func (fsm *FSM) connectLoop() error { } else { if fsm.pConf.Config.AuthPassword != "" { deadline := (MIN_CONNECT_RETRY - 1) * 1000 // msec - conn, err = DialTCPTimeoutWithMD5Sig(addr, bgp.BGP_PORT, "0.0.0.0", fsm.pConf.Config.AuthPassword, deadline) + conn, err = DialTCPTimeoutWithMD5Sig(addr, port, "0.0.0.0", fsm.pConf.Config.AuthPassword, deadline) } else { conn, err = net.DialTimeout("tcp", host, time.Duration(MIN_CONNECT_RETRY-1)*time.Second) } diff --git a/tools/pyang_plugins/gobgp.yang b/tools/pyang_plugins/gobgp.yang index d042792d..5b3702b5 100644 --- a/tools/pyang_plugins/gobgp.yang +++ b/tools/pyang_plugins/gobgp.yang @@ -574,6 +574,14 @@ module gobgp { description "The number of flip-flops"; } + + + } + + augment "/bgp:bgp/bgp:neighbors/bgp:neighbor/bgp:config" { + leaf neighbor-port-number { + type inet:port-number; + } } augment "/bgp:bgp/bgp:neighbors/bgp:neighbor/bgp:timers/bgp:config" { |