diff options
| author | Garrett D'Amore <garrett@damore.org> | 2018-03-14 15:40:46 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2018-03-14 17:16:39 -0700 |
| commit | 85ccb0066a86a3558ae81cd357463f8dc631f94b (patch) | |
| tree | 15838902439f6ed188ffb70fe2170605f26894bc /src/transport/ipc | |
| parent | f4de6b5302df8befbd2b229b701d0bf9ca81a5fb (diff) | |
| download | nng-85ccb0066a86a3558ae81cd357463f8dc631f94b.tar.gz nng-85ccb0066a86a3558ae81cd357463f8dc631f94b.tar.bz2 nng-85ccb0066a86a3558ae81cd357463f8dc631f94b.zip | |
fixes #289 nng_sockaddr could just be a union
fixes #290 sockaddr improvements
Diffstat (limited to 'src/transport/ipc')
| -rw-r--r-- | src/transport/ipc/ipc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/transport/ipc/ipc.c b/src/transport/ipc/ipc.c index 41498ca3..fa59f0fe 100644 --- a/src/transport/ipc/ipc.c +++ b/src/transport/ipc/ipc.c @@ -120,11 +120,11 @@ nni_ipc_pipe_init(nni_ipc_pipe **pipep, nni_ipc_ep *ep, void *ipp) return (rv); } - p->proto = ep->proto; - p->rcvmax = ep->rcvmax; - p->ipp = ipp; - p->sa.s_un.s_path.sa_family = NNG_AF_IPC; - p->sa = ep->sa; + p->proto = ep->proto; + p->rcvmax = ep->rcvmax; + p->ipp = ipp; + p->sa.s_ipc.sa_family = NNG_AF_IPC; + p->sa = ep->sa; *pipep = p; return (0); @@ -524,10 +524,10 @@ nni_ipc_ep_init(void **epp, nni_url *url, nni_sock *sock, int mode) } nni_mtx_init(&ep->mtx); - sz = sizeof(ep->sa.s_un.s_path.sa_path); - ep->sa.s_un.s_path.sa_family = NNG_AF_IPC; + sz = sizeof(ep->sa.s_ipc.sa_path); + ep->sa.s_ipc.sa_family = NNG_AF_IPC; - if (nni_strlcpy(ep->sa.s_un.s_path.sa_path, url->u_path, sz) >= sz) { + if (nni_strlcpy(ep->sa.s_ipc.sa_path, url->u_path, sz) >= sz) { nni_ipc_ep_fini(ep); return (NNG_EADDRINVAL); } |