[or-cvs] r11433: Remove some needless complexity from the code to add signatu (in tor/trunk: . src/or)
nickm at seul.org
nickm at seul.org
Wed Sep 12 17:33:18 UTC 2007
Author: nickm
Date: 2007-09-12 13:33:18 -0400 (Wed, 12 Sep 2007)
New Revision: 11433
Modified:
tor/trunk/
tor/trunk/src/or/dirvote.c
tor/trunk/src/or/or.h
tor/trunk/src/or/test.c
Log:
r14391 at Kushana: nickm | 2007-09-12 10:56:17 -0400
Remove some needless complexity from the code to add signatures to a consensus: previously, we had a path to add new signatures, and a second path to replace signatures. But the second path sufficed as a common case, and the code isn't invoked nearly enough to justify the optimization of having the first path.
Property changes on: tor/trunk
___________________________________________________________________
svk:merge ticket from /tor/trunk [r14391] on c95137ef-5f19-0410-b913-86e773d04f59
Modified: tor/trunk/src/or/dirvote.c
===================================================================
--- tor/trunk/src/or/dirvote.c 2007-09-12 17:17:03 UTC (rev 11432)
+++ tor/trunk/src/or/dirvote.c 2007-09-12 17:33:18 UTC (rev 11433)
@@ -733,9 +733,12 @@
}
/** Given a v3 networkstatus consensus in <b>consensus</b>, check every
- * as-yet-unchecked signature on <b>consensus. Return 0 if there are enough
- * good signatures from recognized authorities on it, and -1 otherwise.
- * DOCDOC warn. DOCDOC -2 rerturn. */
+ * as-yet-unchecked signature on <b>consensus</b>. Return 0 if there are
+ * enough good signatures from recognized authorities on it, -1 if we might
+ * get enough good signatures by fetching missing certificates, and -2
+ * otherwise. Log messages at INFO or WARN: if <b>warn</b> is over 1, warn
+ * about every problem; if warn is at least 1, warn only if we can't get
+ * enough signatures; if warn is negative, log nothing at all. */
int
networkstatus_check_consensus_signature(networkstatus_vote_t *consensus,
int warn)
@@ -791,7 +794,7 @@
smartlist_add(missing_authorities, ds);
});
- if (warn > 1 || (warn && n_good < n_required))
+ if (warn > 1 || (warn >= 0 && n_good < n_required))
severity = LOG_WARN;
else
severity = LOG_INFO;
@@ -844,32 +847,22 @@
* <b>src_voter_list</b> that should be added to <b>target. (A signature
* should be added if we have no signature for that voter in <b>target</b>
* yet, or if we have no verifiable signature and the new signature is
- * verifiable.) Set *<b>new_signatures_out</b> to a newly allocated string
- * holding the newly added signatures; set *<b>regenerate_out</b> to true if
- * we replaced a signature and 0 otherwise. Return the number of signatures
- * added or changed. */
+ * verifiable.) Return the number of signatures added or changed. */
static int
networkstatus_add_signatures_impl(networkstatus_vote_t *target,
- smartlist_t *src_voter_list,
- char **new_signatures_out,
- int *regenerate_out)
+ smartlist_t *src_voter_list)
{
- smartlist_t *added_signatures, *sigs;
- int r;
+ int r = 0;
tor_assert(target);
tor_assert(!target->is_vote);
- tor_assert(new_signatures_out);
- tor_assert(regenerate_out);
- added_signatures = smartlist_create();
-
/* For each voter in src... */
SMARTLIST_FOREACH(src_voter_list, networkstatus_voter_info_t *, src_voter,
{
networkstatus_voter_info_t *target_voter =
networkstatus_get_voter_by_id(target, src_voter->identity_digest);
authority_cert_t *cert;
- /* If the target a doesn't know about this voter, then forget it. */
+ /* If the target doesn't know about this voter, then forget it. */
if (!target_voter)
continue;
@@ -886,11 +879,10 @@
networkstatus_check_voter_signature(target, src_voter, cert);
}
}
- /* If this signature is good, or we don't have ay signature yet,
+ /* If this signature is good, or we don't have any signature yet,
* then add it. */
if (src_voter->good_signature || !target_voter->signature) {
- if (target_voter->signature)
- *regenerate_out = 1;
+ ++r;
tor_free(target_voter->signature);
target_voter->signature =
tor_memdup(src_voter->signature, src_voter->signature_len);
@@ -899,43 +891,19 @@
target_voter->signature_len = src_voter->signature_len;
target_voter->good_signature = 1;
target_voter->bad_signature = 0;
- smartlist_add(added_signatures, target_voter);
}
});
- sigs = smartlist_create();
- SMARTLIST_FOREACH(added_signatures, networkstatus_voter_info_t *, v,
- {
- char buf[4096];
- char sk[HEX_DIGEST_LEN+1];
- char ik[HEX_DIGEST_LEN+1];
- tor_assert(v->signature);
-
- base16_encode(sk, sizeof(sk), v->signing_key_digest, DIGEST_LEN);
- base16_encode(ik, sizeof(ik), v->identity_digest, DIGEST_LEN);
- tor_snprintf(buf, sizeof(buf), "directory-signature %s %s\n"
- "-----BEGIN SIGNATURE-----\n", ik, sk);
- smartlist_add(sigs, tor_strdup(buf));
- base64_encode(buf, sizeof(buf), v->signature, v->signature_len);
- strlcat(buf, "-----END SIGNATURE-----\n", sizeof(buf));
- smartlist_add(sigs, tor_strdup(buf));
- });
-
- *new_signatures_out = smartlist_join_strings(sigs, "", 0, NULL);
- SMARTLIST_FOREACH(sigs, char *, cp, tor_free(cp));
- smartlist_free(sigs);
- r = smartlist_len(added_signatures);
- smartlist_free(added_signatures);
return r;
}
+#if 0
/** As networkstatus_add_consensus_signature_impl, but takes new signatures
* from the consensus in <b>src</b>. */
int
networkstatus_add_consensus_signatures(networkstatus_vote_t *target,
networkstatus_vote_t *src,
- char **new_signatures_out,
- int *regenerate_out)
+ char **new_signatures_out)
{
tor_assert(src);
tor_assert(! src->is_vote);
@@ -949,31 +917,24 @@
if (target == src)
return 0;
- return networkstatus_add_signatures_impl(target, src->voters,
- new_signatures_out,
- regenerate_out);
+ return networkstatus_add_signatures_impl(target, src->voters);
}
+#endif
/** As networkstatus_add_consensus_signature_impl, but takes new signatures
* from the detached signatures document <b>sigs</b>. */
int
networkstatus_add_detached_signatures(networkstatus_vote_t *target,
- ns_detached_signatures_t *sigs,
- char **new_signatures_out,
- int *regenerate_out)
+ ns_detached_signatures_t *sigs)
{
tor_assert(sigs);
- *new_signatures_out = NULL;
-
/* Are they the same consensus? */
if (memcmp(target->networkstatus_digest, sigs->networkstatus_digest,
DIGEST_LEN))
return -1;
- return networkstatus_add_signatures_impl(target, sigs->signatures,
- new_signatures_out,
- regenerate_out);
+ return networkstatus_add_signatures_impl(target, sigs->signatures);
}
/** Return a newly allocated string holding the detached-signatures document
@@ -1562,9 +1523,7 @@
const char **msg_out)
{
ns_detached_signatures_t *sigs = NULL;
- int r = -1, regenerate=0;
- char *new_signatures = NULL;
- size_t siglen;
+ int r = -1;
tor_assert(detached_signatures_body);
tor_assert(msg_out);
@@ -1583,13 +1542,11 @@
}
r = networkstatus_add_detached_signatures(pending_consensus,
- sigs,
- &new_signatures,
- ®enerate);
+ sigs);
// XXXX020 originally, this test was regenerate && r >= 0). But one
// code path is simpler than 2.
- if (new_signatures && (siglen = strlen(new_signatures)) && r >= 0) {
+ if (r >= 0) {
/* XXXX This should really be its own function. */
char *new_detached =
networkstatus_get_detached_signatures(pending_consensus);
@@ -1605,7 +1562,7 @@
tor_assert(src);
strlcpy(dst, src, new_consensus_len - (dst-pending_consensus_body));
- /* XXXX020 remove this once it fails to crash. */
+ /* XXXX020 remove this block once it has failed to crash for a while. */
{
ns_detached_signatures_t *sigs =
networkstatus_parse_detached_signatures(new_detached, NULL);
@@ -1619,30 +1576,13 @@
tor_free(pending_consensus_signatures);
pending_consensus_signatures = new_detached;
}
-#if 0
- else if (new_signatures && (siglen = strlen(new_signatures)) && r >= 0) {
- size_t siglen = strlen(new_signatures);
- size_t len = strlen(pending_consensus_body);
- pending_consensus_body = tor_realloc(pending_consensus_body,
- len+siglen+1);
- memcpy(pending_consensus_body+len, new_signatures, siglen+1);
- len = strlen(pending_consensus_signatures);
- pending_consensus_signatures = tor_realloc(pending_consensus_signatures,
- len+siglen+1);
- memcpy(pending_consensus_signatures+len, new_signatures, siglen+1);
-
- log_info(LD_DIR, "Added %d new signatures to the pending consensus.", r);
- }
-#endif
-
*msg_out = "ok";
goto done;
err:
if (!msg_out)
*msg_out = "Unrecognized error while adding detached signatures.";
done:
- tor_free(new_signatures);
if (sigs)
ns_detached_signatures_free(sigs);
return r;
Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h 2007-09-12 17:17:03 UTC (rev 11432)
+++ tor/trunk/src/or/or.h 2007-09-12 17:33:18 UTC (rev 11433)
@@ -2890,14 +2890,12 @@
const char *identity);
int networkstatus_check_consensus_signature(networkstatus_vote_t *consensus,
int warn);
+#if 0
int networkstatus_add_consensus_signatures(networkstatus_vote_t *target,
- networkstatus_vote_t *src,
- char **new_signatures_out,
- int *regenerate_out);
+ networkstatus_vote_t *src);
+#endif
int networkstatus_add_detached_signatures(networkstatus_vote_t *target,
- ns_detached_signatures_t *sigs,
- char **new_signatures_out,
- int *regenerate_out);
+ ns_detached_signatures_t *sigs);
char *networkstatus_get_detached_signatures(networkstatus_vote_t *consensus);
void ns_detached_signatures_free(ns_detached_signatures_t *s);
Modified: tor/trunk/src/or/test.c
===================================================================
--- tor/trunk/src/or/test.c 2007-09-12 17:17:03 UTC (rev 11432)
+++ tor/trunk/src/or/test.c 2007-09-12 17:33:18 UTC (rev 11433)
@@ -2766,10 +2766,8 @@
{
char *consensus_text2, *consensus_text3;
networkstatus_vote_t *con2, *con3;
- char *detached_text1, *addition1, *detached_text2, *addition2;
+ char *detached_text1, *detached_text2;
ns_detached_signatures_t *dsig1, *dsig2;
- size_t sz;
- int regen;
/* Compute the other two signed consensuses. */
smartlist_shuffle(votes);
consensus_text2 = networkstatus_compute_consensus(votes, 3,
@@ -2812,12 +2810,9 @@
/* Try adding it to con2. */
detached_text2 = networkstatus_get_detached_signatures(con2);
- addition1 = NULL;
- test_eq(1, networkstatus_add_detached_signatures(con2, dsig1, &addition1,
- ®en));
- sz = strlen(detached_text2)+strlen(addition1)+1;
- detached_text2 = tor_realloc(detached_text2, sz);
- strlcat(detached_text2, addition1, sz);
+ test_eq(1, networkstatus_add_detached_signatures(con2, dsig1));
+ tor_free(detached_text2);
+ detached_text2 = networkstatus_get_detached_signatures(con2);
//printf("\n<%s>\n", detached_text2);
dsig2 = networkstatus_parse_detached_signatures(detached_text2, NULL);
test_assert(dsig2);
@@ -2832,12 +2827,10 @@
test_eq(2, smartlist_len(dsig2->signatures));
/* Try adding to con2 twice; verify that nothing changes. */
- test_eq(0, networkstatus_add_detached_signatures(con2, dsig1, &addition2,
- ®en));
+ test_eq(0, networkstatus_add_detached_signatures(con2, dsig1));
/* Add to con. */
- test_eq(2, networkstatus_add_detached_signatures(con, dsig2, &addition2,
- ®en));
+ test_eq(2, networkstatus_add_detached_signatures(con, dsig2));
/* Check signatures */
test_assert(!networkstatus_check_voter_signature(con,
smartlist_get(con->voters, 0),
@@ -2854,8 +2847,6 @@
tor_free(detached_text2);
ns_detached_signatures_free(dsig1);
ns_detached_signatures_free(dsig2);
- tor_free(addition1);
- tor_free(addition2);
}
smartlist_free(votes);
More information about the tor-commits
mailing list