summaryrefslogtreecommitdiffhomepage
path: root/server/fsm.go
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2015-03-03 12:23:43 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2015-03-03 12:23:43 +0900
commitf0ae221b894fdd02f697f4fb6994623082e2175e (patch)
treea75e87baad198d843e5201099563713886edfb28 /server/fsm.go
parentd387fd92e71a42e243cedef32f0812c72474c418 (diff)
update the whole code for the latest openconfig yang files
The modified openconfig yang files are available at: https://github.com/osrg/yang/tree/gobgp Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to 'server/fsm.go')
-rw-r--r--server/fsm.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/server/fsm.go b/server/fsm.go
index 547eafb6..94bfc85d 100644
--- a/server/fsm.go
+++ b/server/fsm.go
@@ -61,8 +61,8 @@ func (s AdminState) String() string {
}
type FSM struct {
- globalConfig *config.GlobalType
- peerConfig *config.NeighborType
+ globalConfig *config.Global
+ peerConfig *config.Neighbor
keepaliveTicker *time.Ticker
state bgp.FSMState
passiveConn net.Conn
@@ -122,7 +122,7 @@ func (fsm *FSM) bgpMessageStateUpdate(MessageType uint8, isIn bool) {
}
}
-func NewFSM(gConfig *config.GlobalType, pConfig *config.NeighborType, connCh chan net.Conn) *FSM {
+func NewFSM(gConfig *config.Global, pConfig *config.Neighbor, connCh chan net.Conn) *FSM {
return &FSM{
globalConfig: gConfig,
peerConfig: pConfig,
@@ -287,7 +287,7 @@ func (h *FSMHandler) active() bgp.FSMState {
}
}
-func buildopen(global *config.GlobalType, peerConf *config.NeighborType) *bgp.BGPMessage {
+func buildopen(global *config.Global, peerConf *config.Neighbor) *bgp.BGPMessage {
var afi int
if peerConf.NeighborAddress.To4() != nil {
afi = bgp.AFI_IP