X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=util.h;h=1693d6097c72a93f84e130d3a3d32c824015cdc1;hp=1f43c5ea5caf34dbcf9a7da2e11cab8d5464b8f6;hb=edebfc87c0b1a0d151994497f8169fcf7494f154;hpb=ceb05e5ddbc5f140b1320c29a8b5841e61bc8250 diff --git a/util.h b/util.h index 1f43c5e..1693d60 100644 --- a/util.h +++ b/util.h @@ -29,6 +29,11 @@ extern void *buf_prepend(struct buffer_if *buf, int32_t amount); extern void *buf_unappend(struct buffer_if *buf, int32_t amount); extern void *buf_unprepend(struct buffer_if *buf, int32_t amount); +static inline int32_t buf_remaining_space(const struct buffer_if *buf) +{ + return (buf->base + buf->alloclen) - (buf->start + buf->size); +} + extern void buffer_readonly_view(struct buffer_if *n, const void*, int32_t len); extern void buffer_readonly_clone(struct buffer_if *n, const struct buffer_if*); /* Caller must only use unappend, unprepend et al. on n. @@ -51,6 +56,13 @@ extern void send_nak(const struct comm_addr *dest, uint32_t our_index, extern int consttime_memeq(const void *s1, const void *s2, size_t n); +const char *iaddr_to_string(const union iaddr *ia); +bool_t iaddr_equal(const union iaddr *ia, const union iaddr *ib); +int iaddr_socklen(const union iaddr *ia); + +void text2iaddr(const item_t *item, uint16_t port, union iaddr *ia, + const char *desc); + #define MINMAX(ae,be,op) ({ \ typeof((ae)) a=(ae); \ typeof((be)) b=(be); \