prop340: Implement useful helper functions

Author: David Goulet <dgoulet@torproject.org>

(modified by nickm: no longer refers to codecs.)

diff --git a/src/core/or/relay_msg.c b/src/core/or/relay_msg.c
index 2fe1d1c62271586c9f61e75cca40d401655cbf3d..97091dcd59bc8f052068eb2757591f673d1c28ee 100644 (file)
--- a/src/core/or/relay_msg.c
+++ b/src/core/or/relay_msg.c
@@ -8,13 +8,20 @@
 
 #define RELAY_MSG_PRIVATE
 
-#include "core/or/relay_msg.h"
+#include "app/config/config.h"
 
+#include "core/or/cell_st.h"
+#include "core/or/circuitlist.h"
+#include "core/or/relay.h"
+#include "core/or/relay_cell.h"
+#include "core/or/relay_msg.h"
 #include "core/or/relay_cell.h"
 #include "lib/crypt_ops/crypto_rand.h"
 
 #include "core/or/cell_st.h"
 #include "core/or/relay_msg_st.h"
+#include "core/or/crypt_path_st.h"
+#include "core/or/or_circuit_st.h"
 
 /*
  * Public API
@@ -54,6 +61,36 @@ relay_msg_clear(relay_msg_t *msg)
 #define V1_PAYLOAD_OFFSET_NO_STREAM_ID 19
 #define V1_PAYLOAD_OFFSET_WITH_STREAM_ID 21
 
+/** Allocate a new relay message and copy the content of the given message. */
+relay_msg_t *
+relay_msg_copy(const relay_msg_t *msg)
+{
+  relay_msg_t *new = tor_malloc_zero(sizeof(*msg));
+
+  memcpy(new, msg, sizeof(*msg));
+  new->body = tor_memdup_nulterm(msg->body, msg->length);
+  memcpy(new->body, msg->body, new->length);
+
+  return new;
+}
+
+/** Set a relay message data into the given message. Useful for stack allocated
+ * messages. */
+void
+relay_msg_set(const uint8_t relay_cell_proto, const uint8_t cmd,
+              const streamid_t stream_id, const uint8_t *payload,
+              const uint16_t payload_len, relay_msg_t *msg)
+{
+  // TODO #41051: Should this free msg->body?
+  msg->relay_cell_proto = relay_cell_proto;
+  msg->command = cmd;
+  msg->stream_id = stream_id;
+
+  msg->length = payload_len;
+  msg->body = tor_malloc_zero(msg->length);
+  memcpy(msg->body, payload, msg->length);
+}
+
 /* Add random bytes to the unused portion of the payload, to foil attacks
  * where the other side can predict all of the bytes in the payload and thus
  * compute the authenticated SENDME cells without seeing the traffic. See
@@ -245,3 +282,21 @@ relay_msg_decode_cell(relay_cell_fmt_t format,
       return NULL;
   }
 }
+
+/** Return the format to use.
+ *
+ * NULL can be passed but not for both. */
+/* TODO #41051: Rename this. */
+relay_cell_fmt_t
+relay_msg_get_format(const circuit_t *circ, const crypt_path_t *cpath)
+{
+  if (circ && CIRCUIT_IS_ORCIRC(circ)) {
+    return CONST_TO_OR_CIRCUIT(circ)->relay_cell_format;
+  } else if (cpath) {
+    return cpath->relay_cell_format;
+  } else {
+    /* We end up here when both params are NULL, which is not allowed, or when
+     * only an origin circuit is given (which again is not allowed). */
+    tor_assert_unreached();
+  }
+}

diff --git a/src/core/or/relay_msg.h b/src/core/or/relay_msg.h
index a0647330e7118c4ed3fd34c54d97550ad44c94fc..b52123ab68fa1479c8e26bb31c3944e008fe7deb 100644 (file)
--- a/src/core/or/relay_msg.h
+++ b/src/core/or/relay_msg.h
@@ -16,6 +16,10 @@
 /* Relay message */
 void relay_msg_free_(relay_msg_t *msg);
 void relay_msg_clear(relay_msg_t *msg);
+relay_msg_t *relay_msg_copy(const relay_msg_t *msg);
+void relay_msg_set(const uint8_t relay_cell_proto, const uint8_t cmd,
+                   const streamid_t streamd_id, const uint8_t *payload,
+                   const uint16_t payload_len, relay_msg_t *msg);
 
 int relay_msg_encode_cell(relay_cell_fmt_t format,
                           const relay_msg_t *msg,
@@ -27,6 +31,10 @@ relay_msg_t *relay_msg_decode_cell(
 #define relay_msg_free(msg) \
   FREE_AND_NULL(relay_msg_t, relay_msg_free_, (msg))
 
+/* Getters */
+relay_cell_fmt_t relay_msg_get_format(const circuit_t *circ,
+                                      const crypt_path_t *cpath);
+
 #ifdef RELAY_MSG_PRIVATE
 
 #endif /* RELAY_MSG_PRIVATE */