[ViewVC] Diff of: cvs/syncmail/syncmail

Comparing syncmail/syncmail (file contents):
Revision 1.6 by root, Sun Oct 28 20:52:25 2001 UTC vs.
Revision 1.7 by root, Mon Oct 29 00:37:41 2001 UTC

    @folders;
 }
 my $sync_folder = new Coro::Semaphore 3; # max 3 folders in parallel
+sub sync_offer {
+   my ($folder, $avc, $diff) = @_;
+   my $vc = create vc pri => 1;
+   $avc->snd("offer", $vc->{port});
+   async {
+      $vc->rcv; # need to synchronize, argl. should open on other side
+      $vc->snd(join "\0", @$diff);
+      my %dup; @dup{split /\0/, $vc->rcv} = ();
+      for (@$diff) {
+         $vc->snd($folder->fetch($_)) unless exists $dup{$_};
+      }
+      defined $vc->rcv and die "protocol error, expected close";
+   };
+}
 sub sync_folder {
    my $name = $_[0];
    my $quit_guard = quit_guard;
    async {
       my $folder = new folder name => $name;
       $vc->snd("open", $name);
       $vc->snd("mtime");
-      $folder->check;
       $folder->read_mdif;
       my $ctime = $folder->{host}{$OTHERNAME} || -1;
       my $rtime = $vc->rcv;
       # 01 - local add
       # 10 - remote del
       # 11 - remote add
       my @diff = grep { $_->[0] > $ctime } @{$folder->{diff}};
       $diff = $vc->rcv;
       while () {
-         if ($diff >= 0 and (!@diff or $diff <= $diff[0][0])) {
+         if ($diff >= 0 and (!@diff or $diff < $diff[0][0])) {
-            slog 0, "applying remote diff $diff (@add, @del)\n";
             $diff{$_} = 0b01 for split /\0/, $vc->rcv; # add
             $diff{$_} = 0b00 for split /\0/, $vc->rcv; # del
             $diff = $vc->rcv;
          } elsif (@diff) {
-            slog 0, "applying local diff $diff[0][0]\n";
             $diff{$_} = 0b11 for @{$diff[0][1]};
             $diff{$_} = 0b10 for @{$diff[0][2]};
             shift @diff;
          } else {
-            slog 0, "no more diffing\n";
             last;
          }
       }
       # append or update, depending on wether there are messages to be deleted
       }
       $vc->snd("delete", join "\0", @{$diff[2]});
       $folder->delete(@{$diff[0]});
+      # offer ours
+      my $offer_coro = sync_offer($folder, $vc, $diff[3]);
+      # request theirs
+      {
+         my @send = grep { !$folder->exists($_) } @{$diff[1]};
+         $vc->snd("send", join "\0", @send);
+         $folder->append($_, $vc->rcv) for @send;
+         $vc->snd("-"); # sync
+      }
+      slog 0, "waiting...\n";#d#
+      $offer_coro->join;
+      # sanity check
+      $vc->snd("inventory");
+      if ($folder->inventory ne $vc->rcv) {
+         $folder->write_mdif;
+         slog 0, "FATAL: folder inventory mismatch after update\n";
+      }
       $vc->snd("end");
       $folder->end_update;
-      $vc->snd("ctime", $folder->{ctime});
+      $vc->snd("setctime", $folder->{ctime});
+      $vc->snd("mtime");
       $folder->{host}{$OTHERNAME} = $vc->rcv;
-      # sanity check
-      $vc->snd("inventory");
+      $vc->snd("close");
-      if ($folder->inventory ne $vc->rcv) {
+      $folder->close;
-         slog 0, "FATAL: folder inventory mismatch after update";
-         die;
-      }
-      slog 0, "LINV ".$folder->inventory."\n";
-      slog 0, "RINV ".$vc->rcv."\n";
       undef $quit_guard;
    }
 }
       $vc->snd("time");
       my $othertime = $vc->rcv;
       abs (($time + time)*0.5 - $othertime) <= $::MAXTIMEDIFF
          or die "ERROR: time difference between hosts larger than $::MAXTIMEDIFF";
    }
-#Coro::Event::do_timer(after => 60);#d#
    $vc->snd("setname", $MYNAME); $OTHERNAME = $vc->rcv;
    if ($SLAVE) {
       #
    my $name = $vc->rcv;
    my $folder = new folder name => $name;
    slog 8, "serving folder $name\n";
-   $folder->check;
    $folder->read_mdif;
    while (my $msg = $vc->rcv) {
       if ($msg eq "mtime") {
          $vc->snd($folder->{mtime});
                     );
          }
          $vc->snd(-1);
       } elsif ($msg eq "begin") {
          $folder->begin_update;
+      } elsif ($msg eq "delete") {
+         $folder->delete(split /\0/, $vc->rcv);
+      } elsif ($msg eq "offer") {
+         my $ovc = catch vc port => $vc->rcv;
+         async {
+            my @offer;
+            {
+               my @dup;
+               $ovc->snd("-"); # synchronize
+               for (split /\0/, $ovc->rcv) {
+                  if ($folder->exists($_)) {
+                     push @dup, $_;
+                  } else {
+                     push @offer, $_;
+                  }
+               }
+               $ovc->snd(join "\0", @dup);
+            }
+            # now we'll get everything in @offer, in order
+            $folder->append($_, $ovc->rcv) for @offer;
+            $ovc->close;
+         };
+      } elsif ($msg eq "send") {
+         $vc->pri(1);
+         $vc->snd($folder->fetch($_)) for split /\0/, $vc->rcv;
+         $vc->rcv; # sync
+         $vc->pri(0);
       } elsif ($msg eq "end") {
          $folder->end_update;
       } elsif ($msg eq "mtime") {
          $vc->snd($folder->{mtime});
       } elsif ($msg eq "setctime") {
          $folder->{host}{$OTHERNAME} = $vc->rcv;
+      } elsif ($msg eq "close") {
+         $folder->close;
       } else {
          die "protocol error, unknown folder command ($msg)\n";
       }
    }
 }

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing syncmail/syncmail (file contents): Revision 1.6 by root, Sun Oct 28 20:52:25 2001 UTC vs. Revision 1.7 by root, Mon Oct 29 00:37:41 2001 UTC

Diff Legend

Comparing syncmail/syncmail (file contents):
Revision 1.6 by root, Sun Oct 28 20:52:25 2001 UTC vs.
Revision 1.7 by root, Mon Oct 29 00:37:41 2001 UTC