diff options
| author | Garrett D'Amore <garrett@damore.org> | 2017-08-08 21:19:09 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2017-08-09 02:38:55 -0700 |
| commit | d64f12553eb6ceb67ed6f6a5b2ceb6c061d375ba (patch) | |
| tree | f6bdac79578176f0d00528d191f862009e761eac /src/core/device.c | |
| parent | 5f0398de8edd1ed4ddbf6455c66273a6608aad9a (diff) | |
| download | nng-d64f12553eb6ceb67ed6f6a5b2ceb6c061d375ba.tar.gz nng-d64f12553eb6ceb67ed6f6a5b2ceb6c061d375ba.tar.bz2 nng-d64f12553eb6ceb67ed6f6a5b2ceb6c061d375ba.zip | |
fixes #44 open protocol by "name" (symbol) instead number
fixes #38 Make protocols "pluggable", or at least optional
This is a breaking change, as we've done away with the central
registered list of protocols, and instead demand the user call
nng_xxx_open() where xxx is a protocol name. (We did keep a
table around in the compat framework though.)
There is a nice way for protocols to plug in via
an nni_proto_open(), where they can use a generic constructor
that they use to build a protocol specific constructor (passing
their ops vector in.)
Diffstat (limited to 'src/core/device.c')
| -rw-r--r-- | src/core/device.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/device.c b/src/core/device.c index cd0c8dfc..81aafc3d 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -80,8 +80,8 @@ nni_device(nni_sock *sock1, nni_sock *sock2) rv = NNG_EINVAL; goto out; } - if ((sock1->s_peer != sock2->s_protocol) || - (sock2->s_peer != sock1->s_protocol)) { + if ((sock1->s_peer_id.p_id != sock2->s_self_id.p_id) || + (sock2->s_peer_id.p_id != sock1->s_self_id.p_id)) { rv = NNG_EINVAL; goto out; } |