From dbbee1a3ea7fbd26c528eb96ebe0dbfd7075e292 Mon Sep 17 00:00:00 2001
From: Garrett D'Amore <garrett@damore.org>
Date: Thu, 10 Aug 2017 18:14:27 -0700
Subject: Unify the msg API.

This makes the operations that work on headers start with
nni_msg_header or nng_msg_header.  It also renames _trunc to
_chop (same strlen as _trim), and renames prepend to insert.

We add a shorthand for clearing message content, and make
better use of the endian safe 32-bit accessors too.

This also fixes a bug in inserting large headers into messages.

A test suite for message handling is included.
---
 src/nng.c | 58 ++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 44 insertions(+), 14 deletions(-)

(limited to 'src/nng.c')

diff --git a/src/nng.c b/src/nng.c
index 815fb2b8..50f323fd 100644
--- a/src/nng.c
+++ b/src/nng.c
@@ -486,7 +486,7 @@ nng_msg_body(nng_msg *msg)
 }
 
 size_t
-nng_msg_len(nng_msg *msg)
+nng_msg_len(const nng_msg *msg)
 {
 	return (nni_msg_len(msg));
 }
@@ -498,7 +498,7 @@ nng_msg_header(nng_msg *msg)
 }
 
 size_t
-nng_msg_header_len(nng_msg *msg)
+nng_msg_header_len(const nng_msg *msg)
 {
 	return (nni_msg_header_len(msg));
 }
@@ -510,21 +510,21 @@ nng_msg_append(nng_msg *msg, const void *data, size_t sz)
 }
 
 int
-nng_msg_prepend(nng_msg *msg, const void *data, size_t sz)
+nng_msg_insert(nng_msg *msg, const void *data, size_t sz)
 {
-	return (nni_msg_prepend(msg, data, sz));
+	return (nni_msg_insert(msg, data, sz));
 }
 
 int
-nng_msg_append_header(nng_msg *msg, const void *data, size_t sz)
+nng_msg_header_append(nng_msg *msg, const void *data, size_t sz)
 {
-	return (nni_msg_append_header(msg, data, sz));
+	return (nni_msg_header_append(msg, data, sz));
 }
 
 int
-nng_msg_prepend_header(nng_msg *msg, const void *data, size_t sz)
+nng_msg_header_insert(nng_msg *msg, const void *data, size_t sz)
 {
-	return (nni_msg_prepend_header(msg, data, sz));
+	return (nni_msg_header_insert(msg, data, sz));
 }
 
 int
@@ -534,21 +534,51 @@ nng_msg_trim(nng_msg *msg, size_t sz)
 }
 
 int
-nng_msg_trunc(nng_msg *msg, size_t sz)
+nng_msg_chop(nng_msg *msg, size_t sz)
 {
-	return (nni_msg_trunc(msg, sz));
+	return (nni_msg_chop(msg, sz));
 }
 
 int
-nng_msg_trim_header(nng_msg *msg, size_t sz)
+nng_msg_header_trim(nng_msg *msg, size_t sz)
 {
-	return (nni_msg_trim_header(msg, sz));
+	return (nni_msg_header_trim(msg, sz));
 }
 
 int
-nng_msg_trunc_header(nng_msg *msg, size_t sz)
+nng_msg_header_chop(nng_msg *msg, size_t sz)
 {
-	return (nni_msg_trunc_header(msg, sz));
+	return (nni_msg_header_chop(msg, sz));
+}
+
+void
+nng_msg_clear(nng_msg *msg)
+{
+	nni_msg_clear(msg);
+}
+
+void
+nng_msg_header_clear(nng_msg *msg)
+{
+	nni_msg_header_clear(msg);
+}
+
+int
+nng_msg_dup(nng_msg **dup, const nng_msg *src)
+{
+	return (nni_msg_dup(dup, src));
+}
+
+nng_pipe
+nng_msg_get_pipe(const nng_msg *msg)
+{
+	return (nni_msg_get_pipe(msg));
+}
+
+void
+nng_msg_set_pipe(nng_msg *msg, nng_pipe p)
+{
+	nni_msg_set_pipe(msg, p);
 }
 
 int
-- 
cgit v1.2.3-70-g09d2