X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=util.h;h=1f43c5ea5caf34dbcf9a7da2e11cab8d5464b8f6;hp=bb298f6d3aa151cc23e74404ca39cc782c1debc9;hb=7d8d39dc3418b0e709b76f08eb08ab7668239207;hpb=8689b3a94c043f04e334a7b181a7250ad5940616

diff --git a/util.h b/util.h
index bb298f6..1f43c5e 100644
--- a/util.h
+++ b/util.h
@@ -1,17 +1,10 @@
-/* $Log: util.h,v $
- * Revision 1.1  1996/03/14 17:05:12  sde1000
- * Initial revision
- *
- */
-
 #ifndef util_h
 #define util_h
 
 #include "secnet.h"
 #include <gmp.h>
 
-extern uint32_t message_level;
-extern uint32_t syslog_level;
+#include "hackypar.h"
 
 #define BUF_ASSERT_FREE(buf) do { buffer_assert_free((buf), \
 						     __FILE__,__LINE__); } \
@@ -24,27 +17,46 @@ 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 buf_append_string(struct buffer_if *buf, string_t s);
-
-extern void enter_phase(uint32_t new_phase);
+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);
+
+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);
+
+#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 */