diff options
| author | Rob Austein <sra@hactrn.net> | 2011-09-15 18:20:03 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2011-09-15 18:20:03 +0000 |
| commit | c4725f15a312eed801130d36c4a45768f0462652 (patch) | |
| tree | 2aa9924f517be9b8720c4c689a19ee57556e8ce2 | |
| parent | 3187122e2afa6337518f6226db14718b6d90f4cb (diff) | |
Check TAL URI properly. (#80)
Clean up a bit of dead code.
svn path=/rcynic/rcynic.c; revision=3987
| -rw-r--r-- | rcynic/rcynic.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/rcynic/rcynic.c b/rcynic/rcynic.c index 09fe1360..abab25d8 100644 --- a/rcynic/rcynic.c +++ b/rcynic/rcynic.c @@ -218,6 +218,7 @@ static const struct { QB(malformed_crldp, "Malformed CRDLP extension") \ QB(malformed_roa_addressfamily, "Malformed ROA addressFamily") \ QB(malformed_sia, "Malformed SIA extension") \ + QB(malformed_tal_uri, "Malformed TAL URI") \ QB(manifest_bad_econtenttype, "Bad manifest eContentType") \ QB(manifest_decode_error, "Manifest decode error") \ QB(manifest_invalid_cms, "Manifest validation failure") \ @@ -2308,12 +2309,6 @@ static void rsync_init(const rcynic_ctx_t *rc, logmsg(rc, log_debug, "New rsync context %s is feeling conflicted", ctx->uri.s); ctx->state = rsync_state_conflict_wait; } - - -#if 0 - if (rsync_runable(rc, ctx) && rsync_count_running(rc) < rc->max_parallel_fetches); - rsync_run(rc, ctx); -#endif } /** @@ -4471,6 +4466,12 @@ int main(int argc, char *argv[]) bio = NULL; continue; } + if (endswith(uri.s, "/")) { + log_validation_status(&rc, &uri, malformed_tal_uri, object_generation_null); + BIO_free_all(bio); + bio = NULL; + continue; + } logmsg(&rc, log_telemetry, "Processing trust anchor from URI %s", uri.s); rsync_file(&rc, &uri); while (sk_rsync_ctx_t_num(rc.rsync_queue) > 0) |