comm, site: pass a new "struct comm_addr" rather than sockaddr_in

[secnet.git] / util.h

diff --git a/util.h b/util.h
index 0c661a8876a7e974efbd58ab022b31089e0d50ed..e40fb5400c731230b4d571f817dca134b18e2908 100644 (file)
--- a/util.h
+++ b/util.h
@@ -1,18 +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 bool_t secnet_is_daemon;
-extern struct log_if *system_log;
+#include "hackypar.h"
 
 #define BUF_ASSERT_FREE(buf) do { buffer_assert_free((buf), \
                                                     __FILE__,__LINE__); } \
@@ -25,26 +17,24 @@ 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 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 *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 enter_phase(uint32_t new_phase);
+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);