From c660f6d13f4febd59a5ba5ad4f008d0dd78e0ecd Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 10 Dec 2021 21:04:15 +0100 Subject: Add liberror_send_require and liberror_send_short MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- liberror-libc.h | 3 +++ send.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/liberror-libc.h b/liberror-libc.h index ffdc127..8de6025 100644 --- a/liberror-libc.h +++ b/liberror-libc.h @@ -9,6 +9,7 @@ #define LIBERROR_LIBC_ERRROR_SHORT_READ -1 #define LIBERROR_LIBC_ERRROR_SHORT_SEEK -2 +#define LIBERROR_LIBC_ERRROR_SHORT_WRITE -3 typedef int64_t _liberror_off_t; @@ -49,7 +50,9 @@ void liberror_recv_failed(int, void *, size_t, int, const char *); void liberror_recv_short(int, void *, size_t, int, size_t min, size_t max, ssize_t returned, const char *); /* void *liberror_posix_memalign(void **, size_t, size_t); TODO */ ssize_t liberror_send(int, const void *, size_t, int, const char *); +ssize_t liberror_send_require(int, const void *, size_t, int, size_t min, size_t max, const char *); void liberror_send_failed(int, const void *, size_t, int, const char *); +void liberror_send_short(int, const void *, size_t, int, size_t min, size_t max, ssize_t returned, const char *); int liberror_setenv(const char *, const char *, int); int liberror_shutdown(int, int, const char *); void liberror_shutdown_failed(int, int, const char *); diff --git a/send.c b/send.c index b902dbe..e79f562 100644 --- a/send.c +++ b/send.c @@ -145,6 +145,30 @@ liberror_send_failed(int fd, const void *buf, size_t n, int flags, const char *f } +void +liberror_send_short(int fd, const void *buf, size_t n, int flags, size_t min, size_t max, ssize_t returned, const char *fname) +{ + const char *desc; + struct liberror_error *error; + int saved_errno = errno; + liberror_save_backtrace(NULL); + if (returned < 0 || (size_t)returned < min) { + desc = "Sent message was shorter than expected"; + } else if (returned > max) { + desc = "Sent message was larger than expected"; + } else { + desc = "Sent message was of an unexpected size"; + } + liberror_set_error(desc, "send", "liberror-libc", LIBERROR_LIBC_ERRROR_SHORT_WRITE); + error = liberror_get_error(); + error->details_type = LIBERROR_DETAILS_ONE_FILE; + error->details.one_file.fd = fd; + error->details.one_file.name = fname ? strdup(fname) : NULL; + error->details.one_file.role = "Socket file"; + errno = saved_errno; +} + + ssize_t liberror_send(int fd, const void *buf, size_t n, int flags, const char *fname) { @@ -155,3 +179,18 @@ liberror_send(int fd, const void *buf, size_t n, int flags, const char *fname) liberror_send_failed(fd, buf, n, flags, fname); return -1; } + + +ssize_t +liberror_send_require(int fd, const void *buf, size_t n, int flags, size_t min, size_t max, const char *fname) +{ + ssize_t r = send(fd, buf, n, flags); + if (r >= 0 && (size_t)r >= min && (size_t)r <= max) + return r; + liberror_save_backtrace(NULL); + if (r < 0) + liberror_send_failed(fd, buf, n, flags, fname); + else + liberror_send_short(fd, buf, n, flags, min, max, r, fname); + return -1; +} -- cgit v1.2.3-70-g09d2