diff options
| -rw-r--r-- | gobgp/cmd/mrt.go | 2 | ||||
| -rw-r--r-- | gobgp/cmd/policy.go | 2 | ||||
| -rw-r--r-- | packet/mrt/mrt.go | 4 | ||||
| -rw-r--r-- | server/peer.go | 2 | ||||
| -rw-r--r-- | server/sockopt_openbsd.go | 4 | ||||
| -rw-r--r-- | table/path.go | 2 | ||||
| -rw-r--r-- | tools/route-server/quagga-rsconfig.go | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/gobgp/cmd/mrt.go b/gobgp/cmd/mrt.go index 1f8d6694..b64adb6b 100644 --- a/gobgp/cmd/mrt.go +++ b/gobgp/cmd/mrt.go @@ -152,7 +152,7 @@ func injectMrt() error { stream, err := client.AddPathByStream() if err != nil { - return fmt.Errorf("failed to modpath: %s", err) + return fmt.Errorf("failed to add path: %s", err) } for paths := range ch { diff --git a/gobgp/cmd/policy.go b/gobgp/cmd/policy.go index 4592c4e9..8c57b3a3 100644 --- a/gobgp/cmd/policy.go +++ b/gobgp/cmd/policy.go @@ -269,7 +269,7 @@ func parseDefinedSet(settype string, args []string) (table.DefinedSet, error) { case CMD_LARGECOMMUNITY: return parseLargeCommunitySet(args) default: - return nil, fmt.Errorf("invalid setype: %s", settype) + return nil, fmt.Errorf("invalid defined set type: %s", settype) } } diff --git a/packet/mrt/mrt.go b/packet/mrt/mrt.go index 1b7c3e05..0c009e80 100644 --- a/packet/mrt/mrt.go +++ b/packet/mrt/mrt.go @@ -443,9 +443,9 @@ func NewRibEntry(index uint16, time uint32, pathId uint32, pathAttrs []bgp.PathA func (e *RibEntry) String() string { if e.isAddPath { - return fmt.Sprintf("RIB_ENTRY: PeerIndex [%d] OriginatedTime [%d] PathIdentifier[%d] PathAttrs [%v]", e.PeerIndex, e.OriginatedTime, e.PathIdentifier, e.PathAttributes) + return fmt.Sprintf("RIB_ENTRY: PeerIndex [%d] OriginatedTime [%d] PathIdentifier[%d] PathAttributes [%v]", e.PeerIndex, e.OriginatedTime, e.PathIdentifier, e.PathAttributes) } else { - return fmt.Sprintf("RIB_ENTRY: PeerIndex [%d] OriginatedTime [%d] PathAttrs [%v]", e.PeerIndex, e.OriginatedTime, e.PathAttributes) + return fmt.Sprintf("RIB_ENTRY: PeerIndex [%d] OriginatedTime [%d] PathAttributes [%v]", e.PeerIndex, e.OriginatedTime, e.PathAttributes) } } diff --git a/server/peer.go b/server/peer.go index 04ca0de6..84b7268f 100644 --- a/server/peer.go +++ b/server/peer.go @@ -192,7 +192,7 @@ func (peer *Peer) toGlobalFamilies(families []bgp.RouteFamily) []bgp.RouteFamily "Key": peer.ID(), "Family": f, "VRF": peer.fsm.pConf.Config.Vrf, - }).Warn("invalid family configured for vrfed neighbor") + }).Warn("invalid family configured for neighbor with vrf") } } families = fs diff --git a/server/sockopt_openbsd.go b/server/sockopt_openbsd.go index 5ce1b7ef..f52c1447 100644 --- a/server/sockopt_openbsd.go +++ b/server/sockopt_openbsd.go @@ -164,7 +164,7 @@ var spiOutMap map[string]uint32 = map[string]uint32{} func pfkeyReply() (spi uint32, err error) { buf := make([]byte, SADB_MSG_SIZE) if count, _, _, _, _ := syscall.Recvmsg(fd, buf, nil, syscall.MSG_PEEK); count != len(buf) { - return spi, fmt.Errorf("incomplete sadbmsg %d %d", len(buf), count) + return spi, fmt.Errorf("incomplete sadb msg %d %d", len(buf), count) } h := sadbMsg{} h.DecodeFromBytes(buf) @@ -182,7 +182,7 @@ func pfkeyReply() (spi uint32, err error) { buf = make([]byte, int(8*h.sadbMsgLen)) if count, _, _, _, _ := syscall.Recvmsg(fd, buf, nil, 0); count != len(buf) { - return spi, fmt.Errorf("incomplete sadbmsg body %d %d", len(buf), count) + return spi, fmt.Errorf("incomplete sadb msg body %d %d", len(buf), count) } buf = buf[SADB_MSG_SIZE:] diff --git a/table/path.go b/table/path.go index 01a85f00..e192a770 100644 --- a/table/path.go +++ b/table/path.go @@ -168,7 +168,7 @@ func NewPath(source *PeerInfo, nlri bgp.AddrPrefixInterface, isWithdraw bool, pa log.WithFields(log.Fields{ "Topic": "Table", "Key": nlri.String(), - }).Error("Need to provide patattrs for the path that is not withdraw.") + }).Error("Need to provide path attributes for non-withdrawn path.") return nil } diff --git a/tools/route-server/quagga-rsconfig.go b/tools/route-server/quagga-rsconfig.go index dfd086e7..80b9a9d0 100644 --- a/tools/route-server/quagga-rsconfig.go +++ b/tools/route-server/quagga-rsconfig.go @@ -56,7 +56,7 @@ func create_config_files(nr int, outputDir string) { c := config.Neighbor{} c.Config.PeerAs = 65000 + uint32(i) c.Config.NeighborAddress = fmt.Sprintf("10.0.0.%d", i) - c.Config.AuthPassword = fmt.Sprintf("hoge%d", i) + c.Config.AuthPassword = fmt.Sprintf("password%d", i) gobgpConf.Neighbors = append(gobgpConf.Neighbors, c) q := NewQuaggaConfig(i, &gobgpConf.Global, &c, net.ParseIP("10.0.255.1")) |