site: Force use of configured name only if we are mobile

[secnet.git] / util.h

diff --git a/util.h b/util.h
index f1be586bb179a7600e3a32b16d4c667cf7a417e1..1f43c5ea5caf34dbcf9a7da2e11cab8d5464b8f6 100644 (file)
--- a/util.h
+++ b/util.h
@@ -18,15 +18,22 @@ while(0)
 #define BUF_FREE(buf) do { (buf)->free=True; } while(0)
 
 extern void buffer_assert_free(struct buffer_if *buffer, cstring_t file,
 #define BUF_FREE(buf) do { (buf)->free=True; } while(0)
 
 extern void buffer_assert_free(struct buffer_if *buffer, cstring_t file,

-                              uint32_t line);
+                              int line);

 extern void buffer_assert_used(struct buffer_if *buffer, cstring_t file,
 extern void buffer_assert_used(struct buffer_if *buffer, cstring_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);
+                              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 buf_append_string(struct buffer_if *buf, cstring_t s);
 


@@ -34,8 +41,22 @@ extern void read_mpbin(MP_INT *a, uint8_t *bin, int binsize);
 
 extern char *write_mpstring(MP_INT *a);
 
 
 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 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 */
 #endif /* util_h */