Merge branch 'protover_v2_squashed'

5 files changed, 198 insertions, 2 deletions

diff --git a/src/test/include.am b/src/test/include.am
index 5bcc969cf0..8ecfaf10c6 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -108,6 +108,7 @@ src_test_test_SOURCES = \
 	src/test/test_options.c \
 	src/test/test_policy.c \
 	src/test/test_procmon.c \
+	src/test/test_protover.c \
 	src/test/test_pt.c \
 	src/test/test_pubsub.c \
 	src/test/test_relay.c \
diff --git a/src/test/test.c b/src/test/test.c
index 2f10c7e90b..9a41b976b8 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -1214,6 +1214,7 @@ struct testgroup_t testgroups[] = {
   { "options/", options_tests },
   { "policy/" , policy_tests },
   { "procmon/", procmon_tests },
+  { "protover/", protover_tests },
   { "pt/", pt_tests },
   { "relay/" , relay_tests },
   { "relaycell/", relaycell_tests },
diff --git a/src/test/test.h b/src/test/test.h
index bf1f53d207..770f403cee 100644
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -207,6 +207,7 @@ extern struct testcase_t oos_tests[];
 extern struct testcase_t options_tests[];
 extern struct testcase_t policy_tests[];
 extern struct testcase_t procmon_tests[];
+extern struct testcase_t protover_tests[];
 extern struct testcase_t pubsub_tests[];
 extern struct testcase_t pt_tests[];
 extern struct testcase_t relay_tests[];
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index 4a6c5a9b5a..7610ddc399 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -232,7 +232,6 @@ test_dir_formats(void *arg)
           "platform Tor "VERSION" on ", sizeof(buf2));
   strlcat(buf2, get_uname(), sizeof(buf2));
   strlcat(buf2, "\n"
-          "protocols Link 1 2 Circuit 1\n"
           "published 1970-01-01 00:00:00\n"
           "fingerprint ", sizeof(buf2));
   tt_assert(!crypto_pk_get_fingerprint(pk2, fingerprint, 1));
@@ -301,7 +300,6 @@ test_dir_formats(void *arg)
   strlcat(buf2, "platform Tor "VERSION" on ", sizeof(buf2));
   strlcat(buf2, get_uname(), sizeof(buf2));
   strlcat(buf2, "\n"
-          "protocols Link 1 2 Circuit 1\n"
           "published 1970-01-01 00:00:05\n"
           "fingerprint ", sizeof(buf2));
   tt_assert(!crypto_pk_get_fingerprint(pk1, fingerprint, 1));
diff --git a/src/test/test_protover.c b/src/test/test_protover.c
new file mode 100644
index 0000000000..f00955d1b4
--- /dev/null
+++ b/src/test/test_protover.c
@@ -0,0 +1,195 @@
+/* Copyright (c) 2016, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+#define PROTOVER_PRIVATE
+
+#include "orconfig.h"
+#include "test.h"
+
+#include "protover.h"
+
+static void
+test_protover_parse(void *arg)
+{
+  (void) arg;
+  char *re_encoded = NULL;
+
+  const char *orig = "Foo=1,3 Bar=3 Baz= Quux=9-12,14,15-16,900";
+  smartlist_t *elts = parse_protocol_list(orig);
+
+  tt_assert(elts);
+  tt_int_op(smartlist_len(elts), OP_EQ, 4);
+
+  const proto_entry_t *e;
+  const proto_range_t *r;
+  e = smartlist_get(elts, 0);
+  tt_str_op(e->name, OP_EQ, "Foo");
+  tt_int_op(smartlist_len(e->ranges), OP_EQ, 2);
+  {
+    r = smartlist_get(e->ranges, 0);
+    tt_int_op(r->low, OP_EQ, 1);
+    tt_int_op(r->high, OP_EQ, 1);
+
+    r = smartlist_get(e->ranges, 1);
+    tt_int_op(r->low, OP_EQ, 3);
+    tt_int_op(r->high, OP_EQ, 3);
+  }
+
+  e = smartlist_get(elts, 1);
+  tt_str_op(e->name, OP_EQ, "Bar");
+  tt_int_op(smartlist_len(e->ranges), OP_EQ, 1);
+  {
+    r = smartlist_get(e->ranges, 0);
+    tt_int_op(r->low, OP_EQ, 3);
+    tt_int_op(r->high, OP_EQ, 3);
+  }
+
+  e = smartlist_get(elts, 2);
+  tt_str_op(e->name, OP_EQ, "Baz");
+  tt_int_op(smartlist_len(e->ranges), OP_EQ, 0);
+
+  e = smartlist_get(elts, 3);
+  tt_str_op(e->name, OP_EQ, "Quux");
+  tt_int_op(smartlist_len(e->ranges), OP_EQ, 4);
+  {
+    r = smartlist_get(e->ranges, 0);
+    tt_int_op(r->low, OP_EQ, 9);
+    tt_int_op(r->high, OP_EQ, 12);
+
+    r = smartlist_get(e->ranges, 1);
+    tt_int_op(r->low, OP_EQ, 14);
+    tt_int_op(r->high, OP_EQ, 14);
+
+    r = smartlist_get(e->ranges, 2);
+    tt_int_op(r->low, OP_EQ, 15);
+    tt_int_op(r->high, OP_EQ, 16);
+
+    r = smartlist_get(e->ranges, 3);
+    tt_int_op(r->low, OP_EQ, 900);
+    tt_int_op(r->high, OP_EQ, 900);
+  }
+
+  re_encoded = encode_protocol_list(elts);
+  tt_assert(re_encoded);
+  tt_str_op(re_encoded, OP_EQ, orig);
+
+ done:
+  if (elts)
+    SMARTLIST_FOREACH(elts, proto_entry_t *, ent, proto_entry_free(ent));
+  smartlist_free(elts);
+  tor_free(re_encoded);
+}
+
+static void
+test_protover_parse_fail(void *arg)
+{
+  (void)arg;
+  smartlist_t *elts;
+
+  /* random junk */
+  elts = parse_protocol_list("!!3@*");
+  tt_assert(elts == NULL);
+
+  /* Missing equals sign in an entry */
+  elts = parse_protocol_list("Link=4 Haprauxymatyve Desc=9");
+  tt_assert(elts == NULL);
+
+  /* Missing word. */
+  elts = parse_protocol_list("Link=4 =3 Desc=9");
+  tt_assert(elts == NULL);
+
+  /* Broken numbers */
+  elts = parse_protocol_list("Link=fred");
+  tt_assert(elts == NULL);
+  elts = parse_protocol_list("Link=1,fred");
+  tt_assert(elts == NULL);
+  elts = parse_protocol_list("Link=1,fred,3");
+  tt_assert(elts == NULL);
+
+  /* Broken range */
+  elts = parse_protocol_list("Link=1,9-8,3");
+  tt_assert(elts == NULL);
+
+ done:
+  ;
+}
+
+static void
+test_protover_vote(void *arg)
+{
+  (void) arg;
+
+  smartlist_t *lst = smartlist_new();
+  char *result = protover_compute_vote(lst, 1);
+
+  tt_str_op(result, OP_EQ, "");
+  tor_free(result);
+
+  smartlist_add(lst, (void*) "Foo=1-10,500 Bar=1,3-7,8");
+  result = protover_compute_vote(lst, 1);
+  tt_str_op(result, OP_EQ, "Bar=1,3-8 Foo=1-10,500");
+  tor_free(result);
+
+  smartlist_add(lst, (void*) "Quux=123-456,78 Bar=2-6,8 Foo=9");
+  result = protover_compute_vote(lst, 1);
+  tt_str_op(result, OP_EQ, "Bar=1-8 Foo=1-10,500 Quux=78,123-456");
+  tor_free(result);
+
+  result = protover_compute_vote(lst, 2);
+  tt_str_op(result, OP_EQ, "Bar=3-6,8 Foo=9");
+  tor_free(result);
+
+ done:
+  tor_free(result);
+  smartlist_free(lst);
+}
+
+static void
+test_protover_all_supported(void *arg)
+{
+  (void)arg;
+  char *msg = NULL;
+
+  tt_assert(protover_all_supported(NULL, &msg));
+  tt_assert(msg == NULL);
+
+  tt_assert(protover_all_supported("", &msg));
+  tt_assert(msg == NULL);
+
+  // Some things that we do support
+  tt_assert(protover_all_supported("Link=3-4", &msg));
+  tt_assert(msg == NULL);
+  tt_assert(protover_all_supported("Link=3-4 Desc=2", &msg));
+  tt_assert(msg == NULL);
+
+  // Some things we don't support
+  tt_assert(! protover_all_supported("Wombat=9", &msg));
+  tt_str_op(msg, OP_EQ, "Wombat=9");
+  tor_free(msg);
+  tt_assert(! protover_all_supported("Link=999", &msg));
+  tt_str_op(msg, OP_EQ, "Link=999");
+  tor_free(msg);
+
+  // Mix of things we support and things we don't
+  tt_assert(! protover_all_supported("Link=3-4 Wombat=9", &msg));
+  tt_str_op(msg, OP_EQ, "Wombat=9");
+  tor_free(msg);
+  tt_assert(! protover_all_supported("Link=3-999", &msg));
+  tt_str_op(msg, OP_EQ, "Link=3-999");
+  tor_free(msg);
+
+ done:
+  tor_free(msg);
+}
+
+#define PV_TEST(name, flags)                       \
+  { #name, test_protover_ ##name, (flags), NULL, NULL }
+
+struct testcase_t protover_tests[] = {
+  PV_TEST(parse, 0),
+  PV_TEST(parse_fail, 0),
+  PV_TEST(vote, 0),
+  PV_TEST(all_supported, 0),
+  END_OF_TESTCASES
+};
+