diff options
| author | Nick Mathewson <nickm@torproject.org> | 2005-09-08 18:24:26 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2005-09-08 18:24:26 +0000 |
| commit | 810572a5de43e9262c6e9c8d68b29fc8d2e70e47 (patch) | |
| tree | d155e8b3868001a719fab738327dfe9e2e366f17 /src/or/routerparse.c | |
| parent | 4633b271f92f3a038c1d67fa2f053c392af8c518 (diff) | |
| download | tor-810572a5de43e9262c6e9c8d68b29fc8d2e70e47.tar.gz tor-810572a5de43e9262c6e9c8d68b29fc8d2e70e47.zip | |
Stop dying when we get a directory from tor26; workaround for change in networkstatus format
svn:r4933
Diffstat (limited to 'src/or/routerparse.c')
| -rw-r--r-- | src/or/routerparse.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index de9589462c..c514d86e23 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -133,6 +133,8 @@ static struct { { "dir-signing-key", K_DIR_SIGNING_KEY, ARGS, OBJ_OK, DIR|NETSTATUS}, { "family", K_FAMILY, ARGS, NO_OBJ, RTR }, { "fingerprint", K_FINGERPRINT, ARGS, NO_OBJ, ANY }, + /* XXXX NM obsolete; remove once tor26 upgrades. */ + { "dir-fingerprint", K_FINGERPRINT, ARGS, NO_OBJ, NETSTATUS }, { "hibernating", K_HIBERNATING, ARGS, NO_OBJ, RTR }, { "read-history", K_READ_HISTORY, ARGS, NO_OBJ, RTR }, { "write-history", K_WRITE_HISTORY, ARGS, NO_OBJ, RTR }, @@ -1412,7 +1414,8 @@ networkstatus_parse_from_string(const char *s) goto done; err: - networkstatus_free(ns); + if (ns) + networkstatus_free(ns); ns = NULL; done: SMARTLIST_FOREACH(tokens, directory_token_t *, t, token_free(t)); |