From 058b21100da6f65c30ed24d56fe3d33819dd0df8 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 27 八月 2019 15:06:20 +0800
Subject: [PATCH] recv2 ret len
---
nng.go | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/nng.go b/nng.go
index 751feac..32dffab 100644
--- a/nng.go
+++ b/nng.go
@@ -33,6 +33,9 @@
// Send impl interface Diliver
func (n *NNG) Send(data []byte) error {
+ if n == nil {
+ return errors.New("please init NNG first")
+ }
var err error
if n.sock == nil {
n.sock, err = n.makeNNG(agent)
@@ -54,6 +57,10 @@
// Recv impl interface Diliver
func (n *NNG) Recv() ([]byte, error) {
+ if n == nil {
+ return nil, errors.New("please init NNG first")
+ }
+
var err error
if n.sock == nil {
@@ -72,9 +79,16 @@
}
+// Recv2 impl interface
+func (n *NNG) Recv2(data []byte) (l int, err error) {
+ data, err = n.Recv()
+ l = len(data)
+ return l, err
+}
+
// Close impl interface Deliver
func (n *NNG) Close() {
- if n.sock != nil {
+ if n != nil && n.sock != nil {
n.sock.Close()
n.sock = nil
}
@@ -120,7 +134,7 @@
switch n.mode {
case Bus:
sock, err = n.busMakeNNG(typ)
- case ReqRep:
+ case ReqRep, SurvResp:
sock, err = n.rrMakeNNG(typ)
default:
sock, err = n.ppMakeNNG(typ)
--
Gitblit v1.8.0