|
@@ -36,6 +36,185 @@ ssize_t trn_cell_extension_encoded_len(const trn_cell_extension_t *obj);
|
|
|
ssize_t trn_cell_extension_encode(uint8_t *output, size_t avail, const trn_cell_extension_t *input);
|
|
|
const char *trn_cell_extension_check(const trn_cell_extension_t *obj);
|
|
|
int trn_cell_extension_clear_errors(trn_cell_extension_t *obj);
|
|
|
+trn_cell_extension_dos_param_t *
|
|
|
+trn_cell_extension_dos_param_new(void)
|
|
|
+{
|
|
|
+ trn_cell_extension_dos_param_t *val = trunnel_calloc(1, sizeof(trn_cell_extension_dos_param_t));
|
|
|
+ if (NULL == val)
|
|
|
+ return NULL;
|
|
|
+ return val;
|
|
|
+}
|
|
|
+
|
|
|
+/** Release all storage held inside 'obj', but do not free 'obj'.
|
|
|
+ */
|
|
|
+static void
|
|
|
+trn_cell_extension_dos_param_clear(trn_cell_extension_dos_param_t *obj)
|
|
|
+{
|
|
|
+ (void) obj;
|
|
|
+}
|
|
|
+
|
|
|
+void
|
|
|
+trn_cell_extension_dos_param_free(trn_cell_extension_dos_param_t *obj)
|
|
|
+{
|
|
|
+ if (obj == NULL)
|
|
|
+ return;
|
|
|
+ trn_cell_extension_dos_param_clear(obj);
|
|
|
+ trunnel_memwipe(obj, sizeof(trn_cell_extension_dos_param_t));
|
|
|
+ trunnel_free_(obj);
|
|
|
+}
|
|
|
+
|
|
|
+uint8_t
|
|
|
+trn_cell_extension_dos_param_get_type(const trn_cell_extension_dos_param_t *inp)
|
|
|
+{
|
|
|
+ return inp->type;
|
|
|
+}
|
|
|
+int
|
|
|
+trn_cell_extension_dos_param_set_type(trn_cell_extension_dos_param_t *inp, uint8_t val)
|
|
|
+{
|
|
|
+ inp->type = val;
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+uint64_t
|
|
|
+trn_cell_extension_dos_param_get_value(const trn_cell_extension_dos_param_t *inp)
|
|
|
+{
|
|
|
+ return inp->value;
|
|
|
+}
|
|
|
+int
|
|
|
+trn_cell_extension_dos_param_set_value(trn_cell_extension_dos_param_t *inp, uint64_t val)
|
|
|
+{
|
|
|
+ inp->value = val;
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+const char *
|
|
|
+trn_cell_extension_dos_param_check(const trn_cell_extension_dos_param_t *obj)
|
|
|
+{
|
|
|
+ if (obj == NULL)
|
|
|
+ return "Object was NULL";
|
|
|
+ if (obj->trunnel_error_code_)
|
|
|
+ return "A set function failed on this object";
|
|
|
+ return NULL;
|
|
|
+}
|
|
|
+
|
|
|
+ssize_t
|
|
|
+trn_cell_extension_dos_param_encoded_len(const trn_cell_extension_dos_param_t *obj)
|
|
|
+{
|
|
|
+ ssize_t result = 0;
|
|
|
+
|
|
|
+ if (NULL != trn_cell_extension_dos_param_check(obj))
|
|
|
+ return -1;
|
|
|
+
|
|
|
+
|
|
|
+ /* Length of u8 type */
|
|
|
+ result += 1;
|
|
|
+
|
|
|
+ /* Length of u64 value */
|
|
|
+ result += 8;
|
|
|
+ return result;
|
|
|
+}
|
|
|
+int
|
|
|
+trn_cell_extension_dos_param_clear_errors(trn_cell_extension_dos_param_t *obj)
|
|
|
+{
|
|
|
+ int r = obj->trunnel_error_code_;
|
|
|
+ obj->trunnel_error_code_ = 0;
|
|
|
+ return r;
|
|
|
+}
|
|
|
+ssize_t
|
|
|
+trn_cell_extension_dos_param_encode(uint8_t *output, const size_t avail, const trn_cell_extension_dos_param_t *obj)
|
|
|
+{
|
|
|
+ ssize_t result = 0;
|
|
|
+ size_t written = 0;
|
|
|
+ uint8_t *ptr = output;
|
|
|
+ const char *msg;
|
|
|
+#ifdef TRUNNEL_CHECK_ENCODED_LEN
|
|
|
+ const ssize_t encoded_len = trn_cell_extension_dos_param_encoded_len(obj);
|
|
|
+#endif
|
|
|
+
|
|
|
+ if (NULL != (msg = trn_cell_extension_dos_param_check(obj)))
|
|
|
+ goto check_failed;
|
|
|
+
|
|
|
+#ifdef TRUNNEL_CHECK_ENCODED_LEN
|
|
|
+ trunnel_assert(encoded_len >= 0);
|
|
|
+#endif
|
|
|
+
|
|
|
+ /* Encode u8 type */
|
|
|
+ trunnel_assert(written <= avail);
|
|
|
+ if (avail - written < 1)
|
|
|
+ goto truncated;
|
|
|
+ trunnel_set_uint8(ptr, (obj->type));
|
|
|
+ written += 1; ptr += 1;
|
|
|
+
|
|
|
+ /* Encode u64 value */
|
|
|
+ trunnel_assert(written <= avail);
|
|
|
+ if (avail - written < 8)
|
|
|
+ goto truncated;
|
|
|
+ trunnel_set_uint64(ptr, trunnel_htonll(obj->value));
|
|
|
+ written += 8; ptr += 8;
|
|
|
+
|
|
|
+
|
|
|
+ trunnel_assert(ptr == output + written);
|
|
|
+#ifdef TRUNNEL_CHECK_ENCODED_LEN
|
|
|
+ {
|
|
|
+ trunnel_assert(encoded_len >= 0);
|
|
|
+ trunnel_assert((size_t)encoded_len == written);
|
|
|
+ }
|
|
|
+
|
|
|
+#endif
|
|
|
+
|
|
|
+ return written;
|
|
|
+
|
|
|
+ truncated:
|
|
|
+ result = -2;
|
|
|
+ goto fail;
|
|
|
+ check_failed:
|
|
|
+ (void)msg;
|
|
|
+ result = -1;
|
|
|
+ goto fail;
|
|
|
+ fail:
|
|
|
+ trunnel_assert(result < 0);
|
|
|
+ return result;
|
|
|
+}
|
|
|
+
|
|
|
+/** As trn_cell_extension_dos_param_parse(), but do not allocate the
|
|
|
+ * output object.
|
|
|
+ */
|
|
|
+static ssize_t
|
|
|
+trn_cell_extension_dos_param_parse_into(trn_cell_extension_dos_param_t *obj, const uint8_t *input, const size_t len_in)
|
|
|
+{
|
|
|
+ const uint8_t *ptr = input;
|
|
|
+ size_t remaining = len_in;
|
|
|
+ ssize_t result = 0;
|
|
|
+ (void)result;
|
|
|
+
|
|
|
+ /* Parse u8 type */
|
|
|
+ CHECK_REMAINING(1, truncated);
|
|
|
+ obj->type = (trunnel_get_uint8(ptr));
|
|
|
+ remaining -= 1; ptr += 1;
|
|
|
+
|
|
|
+ /* Parse u64 value */
|
|
|
+ CHECK_REMAINING(8, truncated);
|
|
|
+ obj->value = trunnel_ntohll(trunnel_get_uint64(ptr));
|
|
|
+ remaining -= 8; ptr += 8;
|
|
|
+ trunnel_assert(ptr + remaining == input + len_in);
|
|
|
+ return len_in - remaining;
|
|
|
+
|
|
|
+ truncated:
|
|
|
+ return -2;
|
|
|
+}
|
|
|
+
|
|
|
+ssize_t
|
|
|
+trn_cell_extension_dos_param_parse(trn_cell_extension_dos_param_t **output, const uint8_t *input, const size_t len_in)
|
|
|
+{
|
|
|
+ ssize_t result;
|
|
|
+ *output = trn_cell_extension_dos_param_new();
|
|
|
+ if (NULL == *output)
|
|
|
+ return -1;
|
|
|
+ result = trn_cell_extension_dos_param_parse_into(*output, input, len_in);
|
|
|
+ if (result < 0) {
|
|
|
+ trn_cell_extension_dos_param_free(*output);
|
|
|
+ *output = NULL;
|
|
|
+ }
|
|
|
+ return result;
|
|
|
+}
|
|
|
trn_cell_establish_intro_t *
|
|
|
trn_cell_establish_intro_new(void)
|
|
|
{
|
|
@@ -561,6 +740,296 @@ trn_cell_establish_intro_parse(trn_cell_establish_intro_t **output, const uint8_
|
|
|
}
|
|
|
return result;
|
|
|
}
|
|
|
+trn_cell_extension_dos_t *
|
|
|
+trn_cell_extension_dos_new(void)
|
|
|
+{
|
|
|
+ trn_cell_extension_dos_t *val = trunnel_calloc(1, sizeof(trn_cell_extension_dos_t));
|
|
|
+ if (NULL == val)
|
|
|
+ return NULL;
|
|
|
+ return val;
|
|
|
+}
|
|
|
+
|
|
|
+/** Release all storage held inside 'obj', but do not free 'obj'.
|
|
|
+ */
|
|
|
+static void
|
|
|
+trn_cell_extension_dos_clear(trn_cell_extension_dos_t *obj)
|
|
|
+{
|
|
|
+ (void) obj;
|
|
|
+ {
|
|
|
+
|
|
|
+ unsigned idx;
|
|
|
+ for (idx = 0; idx < TRUNNEL_DYNARRAY_LEN(&obj->params); ++idx) {
|
|
|
+ trn_cell_extension_dos_param_free(TRUNNEL_DYNARRAY_GET(&obj->params, idx));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ TRUNNEL_DYNARRAY_WIPE(&obj->params);
|
|
|
+ TRUNNEL_DYNARRAY_CLEAR(&obj->params);
|
|
|
+}
|
|
|
+
|
|
|
+void
|
|
|
+trn_cell_extension_dos_free(trn_cell_extension_dos_t *obj)
|
|
|
+{
|
|
|
+ if (obj == NULL)
|
|
|
+ return;
|
|
|
+ trn_cell_extension_dos_clear(obj);
|
|
|
+ trunnel_memwipe(obj, sizeof(trn_cell_extension_dos_t));
|
|
|
+ trunnel_free_(obj);
|
|
|
+}
|
|
|
+
|
|
|
+uint8_t
|
|
|
+trn_cell_extension_dos_get_n_params(const trn_cell_extension_dos_t *inp)
|
|
|
+{
|
|
|
+ return inp->n_params;
|
|
|
+}
|
|
|
+int
|
|
|
+trn_cell_extension_dos_set_n_params(trn_cell_extension_dos_t *inp, uint8_t val)
|
|
|
+{
|
|
|
+ inp->n_params = val;
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+size_t
|
|
|
+trn_cell_extension_dos_getlen_params(const trn_cell_extension_dos_t *inp)
|
|
|
+{
|
|
|
+ return TRUNNEL_DYNARRAY_LEN(&inp->params);
|
|
|
+}
|
|
|
+
|
|
|
+struct trn_cell_extension_dos_param_st *
|
|
|
+trn_cell_extension_dos_get_params(trn_cell_extension_dos_t *inp, size_t idx)
|
|
|
+{
|
|
|
+ return TRUNNEL_DYNARRAY_GET(&inp->params, idx);
|
|
|
+}
|
|
|
+
|
|
|
+ const struct trn_cell_extension_dos_param_st *
|
|
|
+trn_cell_extension_dos_getconst_params(const trn_cell_extension_dos_t *inp, size_t idx)
|
|
|
+{
|
|
|
+ return trn_cell_extension_dos_get_params((trn_cell_extension_dos_t*)inp, idx);
|
|
|
+}
|
|
|
+int
|
|
|
+trn_cell_extension_dos_set_params(trn_cell_extension_dos_t *inp, size_t idx, struct trn_cell_extension_dos_param_st * elt)
|
|
|
+{
|
|
|
+ trn_cell_extension_dos_param_t *oldval = TRUNNEL_DYNARRAY_GET(&inp->params, idx);
|
|
|
+ if (oldval && oldval != elt)
|
|
|
+ trn_cell_extension_dos_param_free(oldval);
|
|
|
+ return trn_cell_extension_dos_set0_params(inp, idx, elt);
|
|
|
+}
|
|
|
+int
|
|
|
+trn_cell_extension_dos_set0_params(trn_cell_extension_dos_t *inp, size_t idx, struct trn_cell_extension_dos_param_st * elt)
|
|
|
+{
|
|
|
+ TRUNNEL_DYNARRAY_SET(&inp->params, idx, elt);
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+int
|
|
|
+trn_cell_extension_dos_add_params(trn_cell_extension_dos_t *inp, struct trn_cell_extension_dos_param_st * elt)
|
|
|
+{
|
|
|
+#if SIZE_MAX >= UINT8_MAX
|
|
|
+ if (inp->params.n_ == UINT8_MAX)
|
|
|
+ goto trunnel_alloc_failed;
|
|
|
+#endif
|
|
|
+ TRUNNEL_DYNARRAY_ADD(struct trn_cell_extension_dos_param_st *, &inp->params, elt, {});
|
|
|
+ return 0;
|
|
|
+ trunnel_alloc_failed:
|
|
|
+ TRUNNEL_SET_ERROR_CODE(inp);
|
|
|
+ return -1;
|
|
|
+}
|
|
|
+
|
|
|
+struct trn_cell_extension_dos_param_st * *
|
|
|
+trn_cell_extension_dos_getarray_params(trn_cell_extension_dos_t *inp)
|
|
|
+{
|
|
|
+ return inp->params.elts_;
|
|
|
+}
|
|
|
+const struct trn_cell_extension_dos_param_st * const *
|
|
|
+trn_cell_extension_dos_getconstarray_params(const trn_cell_extension_dos_t *inp)
|
|
|
+{
|
|
|
+ return (const struct trn_cell_extension_dos_param_st * const *)trn_cell_extension_dos_getarray_params((trn_cell_extension_dos_t*)inp);
|
|
|
+}
|
|
|
+int
|
|
|
+trn_cell_extension_dos_setlen_params(trn_cell_extension_dos_t *inp, size_t newlen)
|
|
|
+{
|
|
|
+ struct trn_cell_extension_dos_param_st * *newptr;
|
|
|
+#if UINT8_MAX < SIZE_MAX
|
|
|
+ if (newlen > UINT8_MAX)
|
|
|
+ goto trunnel_alloc_failed;
|
|
|
+#endif
|
|
|
+ newptr = trunnel_dynarray_setlen(&inp->params.allocated_,
|
|
|
+ &inp->params.n_, inp->params.elts_, newlen,
|
|
|
+ sizeof(inp->params.elts_[0]), (trunnel_free_fn_t) trn_cell_extension_dos_param_free,
|
|
|
+ &inp->trunnel_error_code_);
|
|
|
+ if (newlen != 0 && newptr == NULL)
|
|
|
+ goto trunnel_alloc_failed;
|
|
|
+ inp->params.elts_ = newptr;
|
|
|
+ return 0;
|
|
|
+ trunnel_alloc_failed:
|
|
|
+ TRUNNEL_SET_ERROR_CODE(inp);
|
|
|
+ return -1;
|
|
|
+}
|
|
|
+const char *
|
|
|
+trn_cell_extension_dos_check(const trn_cell_extension_dos_t *obj)
|
|
|
+{
|
|
|
+ if (obj == NULL)
|
|
|
+ return "Object was NULL";
|
|
|
+ if (obj->trunnel_error_code_)
|
|
|
+ return "A set function failed on this object";
|
|
|
+ {
|
|
|
+ const char *msg;
|
|
|
+
|
|
|
+ unsigned idx;
|
|
|
+ for (idx = 0; idx < TRUNNEL_DYNARRAY_LEN(&obj->params); ++idx) {
|
|
|
+ if (NULL != (msg = trn_cell_extension_dos_param_check(TRUNNEL_DYNARRAY_GET(&obj->params, idx))))
|
|
|
+ return msg;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (TRUNNEL_DYNARRAY_LEN(&obj->params) != obj->n_params)
|
|
|
+ return "Length mismatch for params";
|
|
|
+ return NULL;
|
|
|
+}
|
|
|
+
|
|
|
+ssize_t
|
|
|
+trn_cell_extension_dos_encoded_len(const trn_cell_extension_dos_t *obj)
|
|
|
+{
|
|
|
+ ssize_t result = 0;
|
|
|
+
|
|
|
+ if (NULL != trn_cell_extension_dos_check(obj))
|
|
|
+ return -1;
|
|
|
+
|
|
|
+
|
|
|
+ /* Length of u8 n_params */
|
|
|
+ result += 1;
|
|
|
+
|
|
|
+ /* Length of struct trn_cell_extension_dos_param params[n_params] */
|
|
|
+ {
|
|
|
+
|
|
|
+ unsigned idx;
|
|
|
+ for (idx = 0; idx < TRUNNEL_DYNARRAY_LEN(&obj->params); ++idx) {
|
|
|
+ result += trn_cell_extension_dos_param_encoded_len(TRUNNEL_DYNARRAY_GET(&obj->params, idx));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return result;
|
|
|
+}
|
|
|
+int
|
|
|
+trn_cell_extension_dos_clear_errors(trn_cell_extension_dos_t *obj)
|
|
|
+{
|
|
|
+ int r = obj->trunnel_error_code_;
|
|
|
+ obj->trunnel_error_code_ = 0;
|
|
|
+ return r;
|
|
|
+}
|
|
|
+ssize_t
|
|
|
+trn_cell_extension_dos_encode(uint8_t *output, const size_t avail, const trn_cell_extension_dos_t *obj)
|
|
|
+{
|
|
|
+ ssize_t result = 0;
|
|
|
+ size_t written = 0;
|
|
|
+ uint8_t *ptr = output;
|
|
|
+ const char *msg;
|
|
|
+#ifdef TRUNNEL_CHECK_ENCODED_LEN
|
|
|
+ const ssize_t encoded_len = trn_cell_extension_dos_encoded_len(obj);
|
|
|
+#endif
|
|
|
+
|
|
|
+ if (NULL != (msg = trn_cell_extension_dos_check(obj)))
|
|
|
+ goto check_failed;
|
|
|
+
|
|
|
+#ifdef TRUNNEL_CHECK_ENCODED_LEN
|
|
|
+ trunnel_assert(encoded_len >= 0);
|
|
|
+#endif
|
|
|
+
|
|
|
+ /* Encode u8 n_params */
|
|
|
+ trunnel_assert(written <= avail);
|
|
|
+ if (avail - written < 1)
|
|
|
+ goto truncated;
|
|
|
+ trunnel_set_uint8(ptr, (obj->n_params));
|
|
|
+ written += 1; ptr += 1;
|
|
|
+
|
|
|
+ /* Encode struct trn_cell_extension_dos_param params[n_params] */
|
|
|
+ {
|
|
|
+
|
|
|
+ unsigned idx;
|
|
|
+ for (idx = 0; idx < TRUNNEL_DYNARRAY_LEN(&obj->params); ++idx) {
|
|
|
+ trunnel_assert(written <= avail);
|
|
|
+ result = trn_cell_extension_dos_param_encode(ptr, avail - written, TRUNNEL_DYNARRAY_GET(&obj->params, idx));
|
|
|
+ if (result < 0)
|
|
|
+ goto fail; /* XXXXXXX !*/
|
|
|
+ written += result; ptr += result;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ trunnel_assert(ptr == output + written);
|
|
|
+#ifdef TRUNNEL_CHECK_ENCODED_LEN
|
|
|
+ {
|
|
|
+ trunnel_assert(encoded_len >= 0);
|
|
|
+ trunnel_assert((size_t)encoded_len == written);
|
|
|
+ }
|
|
|
+
|
|
|
+#endif
|
|
|
+
|
|
|
+ return written;
|
|
|
+
|
|
|
+ truncated:
|
|
|
+ result = -2;
|
|
|
+ goto fail;
|
|
|
+ check_failed:
|
|
|
+ (void)msg;
|
|
|
+ result = -1;
|
|
|
+ goto fail;
|
|
|
+ fail:
|
|
|
+ trunnel_assert(result < 0);
|
|
|
+ return result;
|
|
|
+}
|
|
|
+
|
|
|
+/** As trn_cell_extension_dos_parse(), but do not allocate the output
|
|
|
+ * object.
|
|
|
+ */
|
|
|
+static ssize_t
|
|
|
+trn_cell_extension_dos_parse_into(trn_cell_extension_dos_t *obj, const uint8_t *input, const size_t len_in)
|
|
|
+{
|
|
|
+ const uint8_t *ptr = input;
|
|
|
+ size_t remaining = len_in;
|
|
|
+ ssize_t result = 0;
|
|
|
+ (void)result;
|
|
|
+
|
|
|
+ /* Parse u8 n_params */
|
|
|
+ CHECK_REMAINING(1, truncated);
|
|
|
+ obj->n_params = (trunnel_get_uint8(ptr));
|
|
|
+ remaining -= 1; ptr += 1;
|
|
|
+
|
|
|
+ /* Parse struct trn_cell_extension_dos_param params[n_params] */
|
|
|
+ TRUNNEL_DYNARRAY_EXPAND(trn_cell_extension_dos_param_t *, &obj->params, obj->n_params, {});
|
|
|
+ {
|
|
|
+ trn_cell_extension_dos_param_t * elt;
|
|
|
+ unsigned idx;
|
|
|
+ for (idx = 0; idx < obj->n_params; ++idx) {
|
|
|
+ result = trn_cell_extension_dos_param_parse(&elt, ptr, remaining);
|
|
|
+ if (result < 0)
|
|
|
+ goto relay_fail;
|
|
|
+ trunnel_assert((size_t)result <= remaining);
|
|
|
+ remaining -= result; ptr += result;
|
|
|
+ TRUNNEL_DYNARRAY_ADD(trn_cell_extension_dos_param_t *, &obj->params, elt, {trn_cell_extension_dos_param_free(elt);});
|
|
|
+ }
|
|
|
+ }
|
|
|
+ trunnel_assert(ptr + remaining == input + len_in);
|
|
|
+ return len_in - remaining;
|
|
|
+
|
|
|
+ truncated:
|
|
|
+ return -2;
|
|
|
+ relay_fail:
|
|
|
+ trunnel_assert(result < 0);
|
|
|
+ return result;
|
|
|
+ trunnel_alloc_failed:
|
|
|
+ return -1;
|
|
|
+}
|
|
|
+
|
|
|
+ssize_t
|
|
|
+trn_cell_extension_dos_parse(trn_cell_extension_dos_t **output, const uint8_t *input, const size_t len_in)
|
|
|
+{
|
|
|
+ ssize_t result;
|
|
|
+ *output = trn_cell_extension_dos_new();
|
|
|
+ if (NULL == *output)
|
|
|
+ return -1;
|
|
|
+ result = trn_cell_extension_dos_parse_into(*output, input, len_in);
|
|
|
+ if (result < 0) {
|
|
|
+ trn_cell_extension_dos_free(*output);
|
|
|
+ *output = NULL;
|
|
|
+ }
|
|
|
+ return result;
|
|
|
+}
|
|
|
trn_cell_intro_established_t *
|
|
|
trn_cell_intro_established_new(void)
|
|
|
{
|