diff options
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 41 |
1 files changed, 40 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index 87fab798cd..3f39f3d938 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1614,13 +1614,52 @@ void clear_trusted_dir_servers(void); /********************************* routerparse.c ************************/ +#define MAX_STATUS_TAG_LEN 32 +/** Structure to hold parsed Tor versions. This is a little messier + * than we would like it to be, because we changed version schemes with 0.1.0. + * + * Before 0.1.0, versions were of the format: + * MAJOR.MINOR.MICRO(status(PATCHLEVEL))?(-cvs)? + * where MAJOR, MINOR, MICRO, and PATCHLEVEL are numbers, status is one of + * "pre" (for an alpha release), "rc" (for a release candidate), or "." for a + * release. As a special case, "a.b.c" was equivalent to "a.b.c.0". We + * compare the elements in order (major, minor, micro, status, patchlevel, + * cvs), with "cvs" preceding non-cvs. + * + * We would start each development branch with a final version in mind: say, + * "0.0.8". Our first pre-release would be "0.0.8pre1", followed by (for + * example) "0.0.8pre2-cvs", "0.0.8pre2", "0.0.8pre3-cvs", "0.0.8rc1", + * "0.0.8rc2-cvs", and "0.0.8rc2". Finally, we'd release 0.0.8. The stable + * CVS branch would then be versioned "0.0.8.1-cvs", and any eventual bugfix + * release would be "0.0.8.1". + * + * After 0.1.0, versions are of the format: + * MAJOR.MINOR.MICRO(.PATCHLEVEL([-.]status_tag)?)? + * As before, MAJOR, MINOR, MICRO, and PATCHLEVEL are numbers, with an absent + * number equivalent to 0. All versions _should_ be distinguishable purely by + * those four numbers; the status tag is purely informational. If we *do* + * encounter two versions that differ only by status tag, we compare them + * lexically. + * + * Now, we start each development branch with (say) 0.1.1.1-cvs. The + * patchlevel increments consistently as the status tag changes, for example, + * as in: 0.1.1.2-alpha, 0.1.1.3-cvs, 0.1.1.4-alpha, 0.1.1.5-cvs, 0.1.1.6-rc + * 0.1.1.7-cvs, 0.1.1.8-rc, 0.1.1.9-cvs. Eventually, we release 0.1.1.10. + * The stable CVS repository gets the version 0.1.1.11-maint_cvs; the + * next patch release is 0.1.1.12. + */ typedef struct tor_version_t { int major; int minor; int micro; - enum { VER_PRE=0, VER_RC=1, VER_RELEASE=2 } status; + /** Release status. For version in the post-0.1 format, this is always + * VER_RELEASE. */ + enum { VER_PRE=0, VER_RC=1, VER_RELEASE=2, } status; int patchlevel; + /** CVS status. For version in the post-0.1 format, this is always + * IS_NOT_CVS */ enum { IS_CVS=0, IS_NOT_CVS=1} cvs; + char status_tag[MAX_STATUS_TAG_LEN]; } tor_version_t; int router_get_router_hash(const char *s, char *digest); |