resolver: Provide input name as argument to callback

[secnet.git] / util.h

diff --git a/util.h b/util.h
index c2f10f83d33e0fa697f09d7a43353f77dfeec417..1693d6097c72a93f84e130d3a3d32c824015cdc1 100644 (file)
--- a/util.h
+++ b/util.h
@@ -31,7 +31,7 @@ extern void *buf_unprepend(struct buffer_if *buf, int32_t amount);
 
 static inline int32_t buf_remaining_space(const struct buffer_if *buf)
 {
 
 static inline int32_t buf_remaining_space(const struct buffer_if *buf)
 {

-    return (buf->base + buf->len) - buf->start;
+    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_view(struct buffer_if *n, const void*, int32_t len);


@@ -56,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);
 
 
 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);                    \
 #define MINMAX(ae,be,op) ({                    \
        typeof((ae)) a=(ae);                    \
        typeof((be)) b=(be);                    \