From 475f4c8abfdd9c88b585105c48839f51d7523d57 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Tue, 31 Oct 2017 00:47:21 -0700 Subject: fixes #137 Remove public access to numeric protocols --- src/protocol/pipeline/pull.c | 4 ++-- src/protocol/pipeline/push.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/protocol/pipeline') diff --git a/src/protocol/pipeline/pull.c b/src/protocol/pipeline/pull.c index 267352c5..9685f0a1 100644 --- a/src/protocol/pipeline/pull.c +++ b/src/protocol/pipeline/pull.c @@ -228,8 +228,8 @@ static nni_proto_sock_ops pull_sock_ops = { static nni_proto pull_proto = { .proto_version = NNI_PROTOCOL_VERSION, - .proto_self = { NNG_PROTO_PULL_V0, "pull" }, - .proto_peer = { NNG_PROTO_PUSH_V0, "push" }, + .proto_self = { NNI_PROTO_PULL_V0, "pull" }, + .proto_peer = { NNI_PROTO_PUSH_V0, "push" }, .proto_flags = NNI_PROTO_FLAG_RCV, .proto_pipe_ops = &pull_pipe_ops, .proto_sock_ops = &pull_sock_ops, diff --git a/src/protocol/pipeline/push.c b/src/protocol/pipeline/push.c index 995ac56d..9ff74558 100644 --- a/src/protocol/pipeline/push.c +++ b/src/protocol/pipeline/push.c @@ -114,7 +114,7 @@ push_pipe_start(void *arg) push_pipe *p = arg; push_sock *s = p->push; - if (nni_pipe_peer(p->pipe) != NNG_PROTO_PULL) { + if (nni_pipe_peer(p->pipe) != NNI_PROTO_PULL_V0) { return (NNG_EPROTO); } @@ -245,8 +245,8 @@ static nni_proto_sock_ops push_sock_ops = { static nni_proto push_proto = { .proto_version = NNI_PROTOCOL_VERSION, - .proto_self = { NNG_PROTO_PUSH_V0, "push" }, - .proto_peer = { NNG_PROTO_PULL_V0, "pull" }, + .proto_self = { NNI_PROTO_PUSH_V0, "push" }, + .proto_peer = { NNI_PROTO_PULL_V0, "pull" }, .proto_flags = NNI_PROTO_FLAG_SND, .proto_pipe_ops = &push_pipe_ops, .proto_sock_ops = &push_sock_ops, -- cgit v1.2.3-70-g09d2