X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=util.h;h=1693d6097c72a93f84e130d3a3d32c824015cdc1;hp=878d6653e22fe824a03a8cf25f19f8d6d94d2d40;hb=edebfc87c0b1a0d151994497f8169fcf7494f154;hpb=ff05a229397c75142725f45cad191ce4a00625ce;ds=sidebyside

diff --git a/util.h b/util.h
index 878d665..1693d60 100644
--- a/util.h
+++ b/util.h
@@ -4,6 +4,8 @@
 #include "secnet.h"
 #include <gmp.h>
 
+#include "hackypar.h"
+
 #define BUF_ASSERT_FREE(buf) do { buffer_assert_free((buf), \
 						     __FILE__,__LINE__); } \
 while(0)
@@ -15,25 +17,58 @@ while(0)
 	 (buf)->size=0; } while(0)
 #define BUF_FREE(buf) do { (buf)->free=True; } while(0)
 
-extern void buffer_assert_free(struct buffer_if *buffer, string_t file,
-			       uint32_t line);
-extern void buffer_assert_used(struct buffer_if *buffer, string_t file,
-			       uint32_t line);
-extern void buffer_new(struct buffer_if *buffer, uint32_t len);
-extern void buffer_init(struct buffer_if *buffer, uint32_t max_start_pad);
-extern void *buf_append(struct buffer_if *buf, uint32_t amount);
-extern void *buf_prepend(struct buffer_if *buf, uint32_t amount);
-extern void *buf_unappend(struct buffer_if *buf, uint32_t amount);
-extern void *buf_unprepend(struct buffer_if *buf, uint32_t amount);
+extern void buffer_assert_free(struct buffer_if *buffer, cstring_t file,
+			       int line);
+extern void buffer_assert_used(struct buffer_if *buffer, cstring_t file,
+			       int line);
+extern void buffer_new(struct buffer_if *buffer, int32_t len);
+extern void buffer_init(struct buffer_if *buffer, int32_t max_start_pad);
+extern void buffer_copy(struct buffer_if *dst, const struct buffer_if *src);
+extern void *buf_append(struct buffer_if *buf, int32_t amount);
+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 buf_append_string(struct buffer_if *buf, string_t s);
+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.
+   * New buffer state (in n) before this can be undefined.  After use,
+   * it must NOT be freed. */
+
+extern void buf_append_string(struct buffer_if *buf, cstring_t s);
 
 extern void read_mpbin(MP_INT *a, uint8_t *bin, int binsize);
 
 extern char *write_mpstring(MP_INT *a);
 
-extern uint32_t write_mpbin(MP_INT *a, uint8_t *buffer, uint32_t buflen);
+extern int32_t write_mpbin(MP_INT *a, uint8_t *buffer, int32_t buflen);
 
 extern struct log_if *init_log(list_t *loglist);
 
+extern void send_nak(const struct comm_addr *dest, uint32_t our_index,
+		     uint32_t their_index, uint32_t msgtype,
+		     struct buffer_if *buf, const char *logwhy);
+
+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);			\
+	a op b ? a : b;				\
+    })
+#define MAX(a,b) MINMAX((a),(b),>)
+#define MIN(a,b) MINMAX((a),(b),<)
+
 #endif /* util_h */