diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2020-06-10 13:02:59 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2020-06-10 13:02:59 +0100 |
| commit | 980d8b7d6b4369491bd99df633a8ad88100e9986 (patch) | |
| tree | 37508d45f5c2056861edcbd760bc666cae8a90a6 /src/libutil | |
| parent | 5dac1cff96ff04cc43d690d3cbaf7ba23b8abaa7 (diff) | |
| download | rspamd-980d8b7d6b4369491bd99df633a8ad88100e9986.tar.gz rspamd-980d8b7d6b4369491bd99df633a8ad88100e9986.zip | |
[Minor] Explicitly specify af for socketpair
Diffstat (limited to 'src/libutil')
| -rw-r--r-- | src/libutil/util.c | 14 | ||||
| -rw-r--r-- | src/libutil/util.h | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/libutil/util.c b/src/libutil/util.c index 3dc1adea1..60328df32 100644 --- a/src/libutil/util.c +++ b/src/libutil/util.c @@ -442,23 +442,21 @@ rspamd_socket (const gchar *credits, guint16 port, } gboolean -rspamd_socketpair (gint pair[2], gboolean is_stream) +rspamd_socketpair (gint pair[2], gint af) { - gint r, serrno; + gint r = -1, serrno; - if (!is_stream) { #ifdef HAVE_SOCK_SEQPACKET + if (af == SOCK_SEQPACKET) { r = socketpair (AF_LOCAL, SOCK_SEQPACKET, 0, pair); if (r == -1) { r = socketpair (AF_LOCAL, SOCK_DGRAM, 0, pair); } -#else - r = socketpair (AF_LOCAL, SOCK_DGRAM, 0, pair); -#endif } - else { - r = socketpair (AF_LOCAL, SOCK_STREAM, 0, pair); +#endif + if (r == -1) { + r = socketpair (AF_LOCAL, af, 0, pair); } if (r == -1) { diff --git a/src/libutil/util.h b/src/libutil/util.h index 367e280f1..c1c29ab30 100644 --- a/src/libutil/util.h +++ b/src/libutil/util.h @@ -66,7 +66,7 @@ gint rspamd_socket (const gchar *credits, guint16 port, gint type, /* * Create socketpair */ -gboolean rspamd_socketpair (gint pair[2], gboolean is_stream); +gboolean rspamd_socketpair (gint pair[2], gint af); /* * Make specified socket non-blocking |