changelog: start 0.6.8

[secnet.git] / util.h

diff --git a/util.h b/util.h
index eddb06db3f57667ca1a9506db6076726110c73e7..f28a00da7c538823e22957cbf52f06cf121a811b 100644 (file)
--- a/util.h
+++ b/util.h
@@ -81,6 +81,9 @@ const char *priomsg_getmessage(const struct priomsg *pm, const char *defmsg);
   /* return value is null-terminated, valid until next call
    * or until defmsg is no longer valid                                ZM */
 
+bool_t priomsg_update_fixed(struct priomsg *pm, int prio, const char *m);
+  /* convenience combination of _update_p and truncmsg_add_string */
+
 /*
  * void BUF_ADD_BYTES(append,    struct buffer_if*, const void*, int32_t size);
  * void BUF_ADD_BYTES(prepend,   struct buffer_if*, const void*, int32_t size);
@@ -145,9 +148,6 @@ extern void read_mpbin(MP_INT *a, uint8_t *bin, int binsize);
 extern char *write_mpstring(MP_INT *a);
   /* Convert a MP_INT into a hex string */
 
-extern int32_t write_mpbin(MP_INT *a, uint8_t *buffer, int32_t buflen);
-  /* Convert a MP_INT into a buffer; return length; truncate if necessary */
-
 extern struct log_if *init_log(list_t *loglist);
 
 extern void send_nak(const struct comm_addr *dest, uint32_t our_index,
@@ -166,6 +166,20 @@ void string_item_to_iaddr(const item_t *item, uint16_t port, union iaddr *ia,
                          const char *desc);
 
 
+/*----- pathprefix_template -----*/
+
+struct pathprefix_template {
+    char *buffer;
+    char *write_here;
+};
+
+void pathprefix_template_init(struct pathprefix_template *out,
+                             const char *prefix, int maxsuffix);
+static inline void pathprefix_template_setsuffix
+   (struct pathprefix_template *upd, const char *suffix)
+   { strcpy(upd->write_here,suffix); }
+
+
 /*
  * SBUF_DEFINE(int nbufs, size_t size);
  *   // Generates a number of definitions and statements organising
@@ -248,6 +262,13 @@ async_linebuf_read(struct pollfd *pfd, struct buffer_if *buf,
 
 /*----- some handy macros -----*/
 
+#define CL_GET_STR_ARG(ix,vn,what)                                     \
+    item_t *vn##_i=list_elem(args,ix);                                 \
+    if (!vn##_i) cfgfatal(loc,"make-public","need " what);             \
+    if (vn##_i->type!=t_string) cfgfatal(vn##_i->loc,"make-public",    \
+                                   what "must be string");             \
+    const char *vn=vn##_i->data.string
+
 #define MINMAX(ae,be,op) ({                    \
        typeof((ae)) a=(ae);                    \
        typeof((be)) b=(be);                    \