From 69cffeb94386911fb47f5d043bfdf09a61091d42 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue, 3 Mar 2015 11:37:05 +0900
Subject: config: remove time.Time in BgpNeighborCommonStateType

This is part of work to remove time.Time in bgp_config.go since no
nice way to represent time.Time with yang. We replace time.Time with
int64.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
---
 server/fsm.go       |  2 +-
 server/peer.go      | 28 ++++++++++++++--------------
 server/peer_test.go |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'server')

diff --git a/server/fsm.go b/server/fsm.go
index acc4e3ec..547eafb6 100644
--- a/server/fsm.go
+++ b/server/fsm.go
@@ -91,7 +91,7 @@ func (fsm *FSM) bgpMessageStateUpdate(MessageType uint8, isIn bool) {
 	case bgp.BGP_MSG_UPDATE:
 		if isIn {
 			state.UpdateIn++
-			state.UpdateRecvTime = time.Now()
+			state.UpdateRecvTime = time.Now().Unix()
 		} else {
 			state.UpdateOut++
 		}
diff --git a/server/peer.go b/server/peer.go
index ad8a72f7..4e8f4ae8 100644
--- a/server/peer.go
+++ b/server/peer.go
@@ -80,7 +80,7 @@ func NewPeer(g config.GlobalType, peer config.NeighborType, serverMsgCh chan *se
 	}
 	p.fsm = NewFSM(&g, &peer, p.acceptedConnCh)
 	peer.BgpNeighborCommonState.State = uint32(bgp.BGP_FSM_IDLE)
-	peer.BgpNeighborCommonState.Downtime = time.Now()
+	peer.BgpNeighborCommonState.Downtime = time.Now().Unix()
 	if peer.NeighborAddress.To4() != nil {
 		p.rf = bgp.RF_IPv4_UC
 	} else {
@@ -143,7 +143,7 @@ func (peer *Peer) handleBGPmessage(m *bgp.BGPMessage) {
 			}).Warn("ROUTE_REFRESH received but the capability wasn't advertised")
 		}
 	case bgp.BGP_MSG_UPDATE:
-		peer.peerConfig.BgpNeighborCommonState.UpdateRecvTime = time.Now()
+		peer.peerConfig.BgpNeighborCommonState.UpdateRecvTime = time.Now().Unix()
 		body := m.Body.(*bgp.BGPUpdate)
 		_, err := bgp.ValidateUpdateMsg(body, []bgp.RouteFamily{peer.rf})
 		if err != nil {
@@ -366,10 +366,10 @@ func (peer *Peer) loop() error {
 		if peer.peerConfig.BgpNeighborCommonState.State == uint32(bgp.BGP_FSM_ESTABLISHED) {
 			pathList := peer.adjRib.GetOutPathList(peer.rf)
 			peer.sendMessages(table.CreateUpdateMsgFromPaths(pathList))
-			peer.fsm.peerConfig.BgpNeighborCommonState.Uptime = time.Now()
+			peer.fsm.peerConfig.BgpNeighborCommonState.Uptime = time.Now().Unix()
 			peer.fsm.peerConfig.BgpNeighborCommonState.EstablishedCount++
 		} else {
-			peer.fsm.peerConfig.BgpNeighborCommonState.Downtime = time.Now()
+			peer.fsm.peerConfig.BgpNeighborCommonState.Downtime = time.Now().Unix()
 		}
 
 		sameState := true
@@ -395,7 +395,7 @@ func (peer *Peer) loop() error {
 					sameState = false
 					if oldState == bgp.BGP_FSM_ESTABLISHED {
 						t := time.Now()
-						if t.Sub(peer.fsm.peerConfig.BgpNeighborCommonState.Uptime) < FLOP_THRESHOLD {
+						if t.Sub(time.Unix(peer.fsm.peerConfig.BgpNeighborCommonState.Uptime, 0)) < FLOP_THRESHOLD {
 							peer.fsm.peerConfig.BgpNeighborCommonState.Flops++
 						}
 						peer.adjRib.DropAllIn(peer.rf)
@@ -474,13 +474,13 @@ func (peer *Peer) MarshalJSON() ([]byte, error) {
 
 	s := c.BgpNeighborCommonState
 
-	uptime := float64(0)
-	if !s.Uptime.IsZero() {
-		uptime = time.Now().Sub(s.Uptime).Seconds()
+	uptime := int64(0)
+	if s.Uptime != 0 {
+		uptime = int64(time.Now().Sub(time.Unix(s.Uptime, 0)).Seconds())
 	}
-	downtime := float64(0)
-	if !s.Downtime.IsZero() {
-		downtime = time.Now().Sub(s.Downtime).Seconds()
+	downtime := int64(0)
+	if s.Downtime != 0 {
+		downtime = int64(time.Now().Sub(time.Unix(s.Downtime, 0)).Seconds())
 	}
 
 	advertized := uint32(0)
@@ -506,9 +506,9 @@ func (peer *Peer) MarshalJSON() ([]byte, error) {
 		RefreshMessageIn          uint32 `json:"refresh_message_in"`
 		DiscardedOut              uint32
 		DiscardedIn               uint32
-		Uptime                    float64 `json:"uptime"`
-		Downtime                  float64 `json:"downtime"`
-		LastError                 string  `json:"last_error"`
+		Uptime                    int64  `json:"uptime"`
+		Downtime                  int64  `json:"downtime"`
+		LastError                 string `json:"last_error"`
 		Received                  uint32
 		Accepted                  uint32
 		Advertized                uint32
diff --git a/server/peer_test.go b/server/peer_test.go
index 9aa892dd..c3612a6e 100644
--- a/server/peer_test.go
+++ b/server/peer_test.go
@@ -512,7 +512,7 @@ func makePeer(globalConfig config.GlobalType, peerConfig config.NeighborType) *P
 
 	p.fsm = NewFSM(&globalConfig, &peerConfig, p.acceptedConnCh)
 	peerConfig.BgpNeighborCommonState.State = uint32(bgp.BGP_FSM_IDLE)
-	peerConfig.BgpNeighborCommonState.Downtime = time.Now()
+	peerConfig.BgpNeighborCommonState.Downtime = time.Now().Unix()
 	if peerConfig.NeighborAddress.To4() != nil {
 		p.rf = bgp.RF_IPv4_UC
 	} else {
-- 
cgit v1.2.3