return safe_realloc_ary(0,size,count,message);
}
-/* Hex-encode a buffer, and return the hex in a freshly allocated string. */
-string_t hex_encode(const uint8_t *bin, int binsize)
+void hex_encode(const uint8_t *bin, int binsize, char *buff)
{
- char *buff;
int i;
- buff=safe_malloc(binsize*2 + 1,"hex_encode");
-
for (i=0; i<binsize; i++) {
buff[i*2]=hexdigits[(bin[i] & 0xf0) >> 4];
buff[i*2+1]=hexdigits[(bin[i] & 0xf)];
}
buff[binsize*2]=0;
+}
+
+string_t hex_encode_alloc(const uint8_t *bin, int binsize)
+{
+ char *buff;
+
+ buff=safe_malloc(hex_encode_size(binsize),"hex_encode");
+ hex_encode(bin,binsize,buff);
return buff;
}
return ok;
}
-/* Convert a buffer into its MP_INT representation */
void read_mpbin(MP_INT *a, uint8_t *bin, int binsize)
{
- char *buff = hex_encode(bin, binsize);
+ char *buff = hex_encode_alloc(bin, binsize);
mpz_set_str(a, buff, 16);
free(buff);
}
-/* Convert a MP_INT into a hex string */
char *write_mpstring(MP_INT *a)
{
char *buff;
return buff;
}
-/* Convert a MP_INT into a buffer; return length; truncate if necessary */
int32_t write_mpbin(MP_INT *a, uint8_t *buffer, int32_t buflen)
{
char *hb = write_mpstring(a);
return p;
}
-/* Append a two-byte length and the string to the buffer. Length is in
- network byte order. */
void buf_append_string(struct buffer_if *buf, cstring_t s)
{
size_t len;
BUF_ADD_BYTES(append,buf,s,len);
}
+void truncmsg_add_string(struct buffer_if *buf, cstring_t s)
+{
+ int32_t l = MIN((int32_t)strlen(s), buf_remaining_space(buf));
+ BUF_ADD_BYTES(append, buf, s, l);
+}
+void truncmsg_add_packet_string(struct buffer_if *buf, int32_t l,
+ const uint8_t *s)
+{
+ char c;
+ while (l-- > 0) {
+ c = *s++;
+ if (c >= ' ' && c <= 126 && c != '\\' && c != '"' && c != '\'') {
+ if (!buf_remaining_space(buf)) break;
+ buf->start[buf->size++] = c;
+ continue;
+ }
+ char quoted[5];
+ quoted[0] = '\\';
+ quoted[2] = 0;
+ switch (c) {
+ case '\n': quoted[1] = 'n'; break;
+ case '\r': quoted[1] = 'r'; break;
+ case '\t': quoted[1] = 't'; break;
+ case '\\': case '"': case '\'': quoted[1] = c; break;
+ default: sprintf(quoted, "\\x%02x", (unsigned)c);
+ }
+ truncmsg_add_string(buf, quoted);
+ }
+}
+const char *truncmsg_terminate(const struct buffer_if *buf)
+{
+ if (buf_remaining_space(buf)) {
+ buf->start[buf->size] = 0;
+ } else {
+ assert(buf->size >= 4);
+ strcpy(buf->start + buf->size - 4, "...");
+ }
+ return buf->start;
+}
+
+void priomsg_new(struct priomsg *pm, int32_t maxlen)
+{
+ buffer_new(&pm->m, maxlen);
+ pm->prio = INT_MIN;
+}
+void priomsg_reset(struct priomsg *pm)
+{
+ buffer_init(&pm->m, 0);
+ pm->prio = INT_MIN;
+}
+bool_t priomsg_update_p(struct priomsg *pm, int prio)
+{
+ if (!pm) return False;
+ if (prio <= pm->prio) return False;
+ buffer_init(&pm->m, 0);
+ pm->prio = prio;
+ return True;
+}
+const char *priomsg_getmessage(const struct priomsg *pm, const char *defmsg)
+{
+ if (pm->prio >= INT_MIN)
+ return truncmsg_terminate(&pm->m);
+ else
+ return defmsg;
+}
+
+bool_t priomsg_update_fixed(struct priomsg *pm, int prio, const char *m) {
+ if (!priomsg_update_p(pm, prio)) return False;
+ truncmsg_add_string(&pm->m, m);
+ return True;
+}
+
void buffer_new(struct buffer_if *buf, int32_t len)
{
buf->free=True;
buf->owner=NULL;
- buf->flags=0;
buf->loc.file=NULL;
buf->loc.line=0;
buf->size=0;
{
buf->free=False;
buf->owner="READONLY";
- buf->flags=0;
buf->loc.file=NULL;
buf->loc.line=0;
buf->size=buf->alloclen=len;
buf_append_uint32(buf,our_index);
buf_append_uint32(buf,LABEL_NAK);
if (logwhy)
- Message(M_INFO,"%s: %08"PRIx32"<-%08"PRIx32": %08"PRIx32":"
- " %s; sending NAK\n",
+ Message(M_INFO,"%s: sending NAK for"
+ " %08"PRIx32" %08"PRIx32"<-%08"PRIx32":"
+ " %s\n",
comm_addr_to_string(dest),
- our_index, their_index, msgtype, logwhy);
+ msgtype, our_index, their_index, logwhy);
dest->comm->sendmsg(dest->comm->st, buf, dest, 0);
}
return accumulator;
}
+void hash_hash(const struct hash_if *hashi, const void *msg, int32_t len,
+ uint8_t *digest) {
+ uint8_t hst[hashi->slen];
+ hashi->init(hst);
+ hashi->update(hst,msg,len);
+ hashi->final(hst,digest);
+}
+
void util_module(dict_t *dict)
{
add_closure(dict,"sysbuffer",buffer_apply);
int r = adns_addr2text(&ia->sa, 0, addrbuf, &addrbuflen, &port);
if (r) {
- const char fmt[]= "scoped IPv6 addr, error: %.*s";
+ const char fmt[]= "bad addr, error: %.*s";
sprintf(addrbuf, fmt,
(int)(ADNS_ADDR2TEXT_BUFLEN - sizeof(fmt)) /* underestimate */,
strerror(r));
return 0;
}
+void pathprefix_template_init(struct pathprefix_template *out,
+ const char *prefix, int maxsuffix)
+{
+ size_t l=strlen(prefix);
+ NEW_ARY(out->buffer,l+maxsuffix+1);
+ strcpy(out->buffer,prefix);
+ out->write_here=out->buffer+l;
+}
+
enum async_linebuf_result
async_linebuf_read(struct pollfd *pfd, struct buffer_if *buf,
const char **emsg_out)