fixed version checks to only complain if xml version is > than current RRD version

[rrdtool.git] / src / rrd_restore.c

diff --git a/src/rrd_restore.c b/src/rrd_restore.c
index a0ef635..4371d65 100644 (file)
--- a/src/rrd_restore.c
+++ b/src/rrd_restore.c
@@ -122,10 +122,10 @@ int xml2rrd(char* buf, rrd_t* rrd, char rc){
   strcpy(rrd->stat_head->cookie,RRD_COOKIE);
   read_tag(&ptr,"version","%4[0-9]",rrd->stat_head->version);
   /* added primitive version checking */
-  if (atoi(rrd -> stat_head -> version) != 2)
+  if (atoi(rrd -> stat_head -> version) > atoi(RRD_VERSION) )
   {
-    rrd_set_error("Incompatible file version, detected version %s, required version %s\n",
-                 rrd -> stat_head -> version, RRD_VERSION);
+    rrd_set_error("Incompatible file version, detected version %s is bigger than supported version %s\n",
+                 rrd -> stat_head -> version, RRD_VERSION );
     free(rrd -> stat_head);
     return -1;
   }
@@ -423,8 +423,12 @@ rrd_write(char *file_name, rrd_t *rrd)
 
     fwrite(rrd->rra_def,
           sizeof(rra_def_t), rrd->stat_head->rra_cnt, rrd_file);
-    
-    fwrite(rrd->live_head, sizeof(live_head_t),1, rrd_file);
+
+        /* maybe the xml hold an old formatted rrd */
+    if (atoi(rrd->stat_head->version) < 3)
+      fwrite(&(rrd->live_head->last_up), sizeof(long),1, rrd_file);
+    else
+      fwrite(rrd->live_head, sizeof(live_head_t),1, rrd_file);
 
     fwrite( rrd->pdp_prep, sizeof(pdp_prep_t),rrd->stat_head->ds_cnt,rrd_file);