diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-07-25 08:41:27 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-07-25 08:41:27 +0100 |
| commit | 29820f8a7bd23a446a5dee829d812295c254a487 (patch) | |
| tree | 6afb87c17f7382caa360c995d95bae2e148ca473 /src/libutil | |
| parent | d0a8583ef8638704aea83cdaa0bcdcce3656631b (diff) | |
| download | rspamd-29820f8a7bd23a446a5dee829d812295c254a487.tar.gz rspamd-29820f8a7bd23a446a5dee829d812295c254a487.zip | |
[Minor] Use rspamd_socketpair everywhere
Diffstat (limited to 'src/libutil')
| -rw-r--r-- | src/libutil/util.c | 23 | ||||
| -rw-r--r-- | src/libutil/util.h | 2 |
2 files changed, 15 insertions, 10 deletions
diff --git a/src/libutil/util.c b/src/libutil/util.c index 86f1f24f6..b94de00b9 100644 --- a/src/libutil/util.c +++ b/src/libutil/util.c @@ -604,22 +604,27 @@ err: } gboolean -rspamd_socketpair (gint pair[2]) +rspamd_socketpair (gint pair[2], gboolean is_stream) { gint r, serrno; + if (!is_stream) { #ifdef HAVE_SOCK_SEQPACKET - r = socketpair (AF_LOCAL, SOCK_SEQPACKET, 0, pair); + r = socketpair (AF_LOCAL, SOCK_SEQPACKET, 0, pair); - if (r == -1) { - msg_warn ("seqpacket socketpair failed: %d, '%s'", - errno, - strerror (errno)); - r = socketpair (AF_LOCAL, SOCK_DGRAM, 0, pair); - } + if (r == -1) { + msg_warn ("seqpacket socketpair failed: %d, '%s'", + errno, + strerror (errno)); + r = socketpair (AF_LOCAL, SOCK_DGRAM, 0, pair); + } #else - r = socketpair (AF_LOCAL, SOCK_DGRAM, 0, pair); + r = socketpair (AF_LOCAL, SOCK_DGRAM, 0, pair); #endif + } + else { + r = socketpair (AF_LOCAL, SOCK_STREAM, 0, pair); + } if (r == -1) { msg_warn ("socketpair failed: %d, '%s'", errno, strerror ( diff --git a/src/libutil/util.h b/src/libutil/util.h index 7f6ccc2f6..315554a4c 100644 --- a/src/libutil/util.h +++ b/src/libutil/util.h @@ -75,7 +75,7 @@ GList * rspamd_sockets_list (const gchar *credits, /* * Create socketpair */ -gboolean rspamd_socketpair (gint pair[2]); +gboolean rspamd_socketpair (gint pair[2], gboolean is_stream); /* * Write pid to file |