diff options
| -rw-r--r-- | zebra/zapi.go | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/zebra/zapi.go b/zebra/zapi.go index 09b9107a..189b5733 100644 --- a/zebra/zapi.go +++ b/zebra/zapi.go @@ -220,6 +220,15 @@ func NewClient(network, address string, typ ROUTE_TYPE) (*Client, error) { return nil, err } outgoing := make(chan *Message) + incoming := make(chan *Message, 64) + + c := &Client{ + outgoing: outgoing, + incoming: incoming, + redistDefault: typ, + conn: conn, + } + go func() { for { m, more := <-outgoing @@ -232,8 +241,8 @@ func NewClient(network, address string, typ ROUTE_TYPE) (*Client, error) { _, err = conn.Write(b) if err != nil { - log.Errorf("failed to write: ", err) - return + log.Errorf("failed to write: %s", err) + close(outgoing) } } else { log.Debug("finish outgoing loop") @@ -242,26 +251,25 @@ func NewClient(network, address string, typ ROUTE_TYPE) (*Client, error) { } }() - incoming := make(chan *Message, 64) - go func() error { + go func() { for { headerBuf, err := readAll(conn, HEADER_SIZE) if err != nil { log.Error("failed to read header: ", err) - return err + return } log.Debugf("read header from zebra: %v", headerBuf) hd := &Header{} err = hd.DecodeFromBytes(headerBuf) if err != nil { log.Error("failed to decode header: ", err) - return err + return } bodyBuf, err := readAll(conn, int(hd.Len-HEADER_SIZE)) if err != nil { log.Error("failed to read body: ", err) - return err + return } log.Debugf("read body from zebra: %v", bodyBuf) m, err := ParseMessage(hd, bodyBuf) @@ -273,12 +281,8 @@ func NewClient(network, address string, typ ROUTE_TYPE) (*Client, error) { incoming <- m } }() - return &Client{ - outgoing: outgoing, - incoming: incoming, - redistDefault: typ, - conn: conn, - }, nil + + return c, nil } func readAll(conn net.Conn, length int) ([]byte, error) { @@ -292,6 +296,11 @@ func (c *Client) Receive() chan *Message { } func (c *Client) Send(m *Message) { + defer func() { + if err := recover(); err != nil { + log.Debugf("recovered: %s", err) + } + }() c.outgoing <- m } |