diff options
| -rw-r--r-- | api/rest.go | 10 | ||||
| -rw-r--r-- | server/peer.go | 21 | ||||
| -rw-r--r-- | server/server.go | 2 |
3 files changed, 32 insertions, 1 deletions
diff --git a/api/rest.go b/api/rest.go index 404a6bb5..bea5781b 100644 --- a/api/rest.go +++ b/api/rest.go @@ -111,6 +111,8 @@ func (rs *RestServer) Serve() { r.HandleFunc(neighbors, rs.Neighbors).Methods("GET") r.HandleFunc(neighbor+perPeerURL, rs.Neighbor).Methods("GET") r.HandleFunc(neighbor+perPeerURL+"/"+"local-rib", rs.NeighborLocalRib).Methods("GET") + r.HandleFunc(neighbor+perPeerURL+"/"+"adj-rib-in", rs.NeighborAdjRibIn).Methods("GET") + r.HandleFunc(neighbor+perPeerURL+"/"+"adj-rib-out", rs.NeighborAdjRibOut).Methods("GET") r.HandleFunc(neighbor+perPeerURL+"/"+"shutdown", rs.NeighborPostHandler).Methods("POST") r.HandleFunc(neighbor+perPeerURL+"/"+"reset", rs.NeighborPostHandler).Methods("POST") r.HandleFunc(neighbor+perPeerURL+"/"+"softreset", rs.NeighborPostHandler).Methods("POST") @@ -181,6 +183,14 @@ func (rs *RestServer) NeighborLocalRib(w http.ResponseWriter, r *http.Request) { rs.neighbor(w, r, REQ_LOCAL_RIB) } +func (rs *RestServer) NeighborAdjRibIn(w http.ResponseWriter, r *http.Request) { + rs.neighbor(w, r, REQ_ADJ_RIB_IN) +} + +func (rs *RestServer) NeighborAdjRibOut(w http.ResponseWriter, r *http.Request) { + rs.neighbor(w, r, REQ_ADJ_RIB_OUT) +} + func (rs *RestServer) Neighbors(w http.ResponseWriter, r *http.Request) { //Send channel of request parameter. req := NewRestRequest(REQ_NEIGHBORS, "") diff --git a/server/peer.go b/server/peer.go index 3b03046b..73aab7e6 100644 --- a/server/peer.go +++ b/server/peer.go @@ -189,6 +189,27 @@ func (peer *Peer) handleREST(restReq *api.RestRequest) { case api.REQ_NEIGHBOR_SOFT_RESET_OUT: pathList := peer.adjRib.GetOutPathList(peer.rf) peer.sendMessages(table.CreateUpdateMsgFromPaths(pathList)) + case api.REQ_ADJ_RIB_IN: + fallthrough + case api.REQ_ADJ_RIB_OUT: + rfs := []bgp.RouteFamily{bgp.RF_IPv4_UC, bgp.RF_IPv6_UC} + adjrib := make(map[string][]table.Path) + + if restReq.RequestType == api.REQ_ADJ_RIB_IN { + for _, rf := range rfs { + paths := peer.adjRib.GetInPathList(rf) + adjrib[rf.String()] = paths + log.Debugf("RouteFamily=%v adj-rib-in found : %d", rf.String(), len(paths)) + } + } else { + for _, rf := range rfs { + paths := peer.adjRib.GetOutPathList(rf) + adjrib[rf.String()] = paths + log.Debugf("RouteFamily=%v adj-rib-out found : %d", rf.String(), len(paths)) + } + } + j, _ := json.Marshal(adjrib) + result.Data = j } restReq.ResponseCh <- result close(restReq.ResponseCh) diff --git a/server/server.go b/server/server.go index cbd67732..14a1ac5f 100644 --- a/server/server.go +++ b/server/server.go @@ -241,7 +241,7 @@ func (server *BgpServer) handleRest(restReq *api.RestRequest) { } restReq.ResponseCh <- result close(restReq.ResponseCh) - case api.REQ_LOCAL_RIB, api.REQ_NEIGHBOR_SHUTDOWN, api.REQ_NEIGHBOR_RESET, api.REQ_NEIGHBOR_SOFT_RESET_IN, api.REQ_NEIGHBOR_SOFT_RESET_OUT: + case api.REQ_LOCAL_RIB, api.REQ_NEIGHBOR_SHUTDOWN, api.REQ_NEIGHBOR_RESET, api.REQ_NEIGHBOR_SOFT_RESET_IN, api.REQ_NEIGHBOR_SOFT_RESET_OUT, api.REQ_ADJ_RIB_IN, api.REQ_ADJ_RIB_OUT: remoteAddr := restReq.RemoteAddr result := &api.RestResponse{} info, found := server.peerMap[remoteAddr] |