ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-02-21 01:42:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Generate version id before reading the file contents

Browse Source
This commit is contained in:
Jeremy Lakeman 2013-01-03 11:22:01 +10:30
parent 2967d1e00f
commit cf6ecbc57d
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rhizome_bundle.c
View File

@ -653,16 +653,6 @@ int rhizome_manifest_finalise(rhizome_manifest *m, rhizome_manifest **mout)
} else {
*mout=m;
/* set version of manifest, either from version variable, or using current time */
if (rhizome_manifest_get(m,"version",NULL,0)==NULL)
{
/* No version set */
m->version = gettime_ms();
rhizome_manifest_set_ll(m,"version",m->version);
}
else
m->version = rhizome_manifest_get_ll(m,"version");
/* Convert to final form for signing and writing to disk */
if (rhizome_manifest_pack_variables(m))
return WHY("Could not convert manifest to wire format");
@ -728,6 +718,14 @@ int rhizome_fill_manifest(rhizome_manifest *m, const char *filepath, const sid_t
}
}
/* set version of manifest, either from version variable, or using current time */
if (rhizome_manifest_get(m,"version",NULL,0)==NULL)
{
/* No version set, default to the current time */
m->version = gettime_ms();
rhizome_manifest_set_ll(m,"version",m->version);
}
const char *id = rhizome_manifest_get(m, "id", NULL, 0);
if (id == NULL) {
if (config.debug.rhizome) DEBUG("creating new bundle");
@ -806,6 +804,7 @@ int rhizome_fill_manifest(rhizome_manifest *m, const char *filepath, const sid_t
}
}
}
// TODO assert that new version > old version?
}
return 0;
}