# # # patch "ChangeLog" # from [0eaa43a2f5cc6b58e6c80d3a4132b8eb73a781d4] # to [964ad00f873b9ad5ad214395b5231f039d73d9e8] # # patch "packet.cc" # from [92ba5e816320b1e23775f9c54875c3dd9642fab8] # to [e0d4ed1e5b82b9ce34bc77bef7d24049409221cf] # ============================================================ --- ChangeLog 0eaa43a2f5cc6b58e6c80d3a4132b8eb73a781d4 +++ ChangeLog 964ad00f873b9ad5ad214395b5231f039d73d9e8 @@ -1,5 +1,9 @@ 2006-01-10 Nathaniel Smith + * packet.cc (packet_roundabout_test): Test rdata packets too. + +2006-01-10 Nathaniel Smith + * netsync.cc (session): * commands.cc (read): Adjust to match previous change. ============================================================ --- packet.cc 92ba5e816320b1e23775f9c54875c3dd9642fab8 +++ packet.cc e0d4ed1e5b82b9ce34bc77bef7d24049409221cf @@ -524,6 +524,21 @@ diff(fdata.inner(), fdata2.inner(), del); pw.consume_file_delta(fid, fid2, file_delta(del)); + // a rdata packet + revision_set rev; + rev.new_manifest = manifest_id(std::string("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")); + split_path sp; + file_path_internal("").split(sp); + shared_ptr cs(new cset); + cs->dirs_added.insert(sp); + rev.edges.insert(std::make_pair(revision_id(std::string("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb")), + cs)); + revision_data rdat; + write_revision_set(rev, rdat); + revision_id rid; + calculate_ident(rdat, rid); + pw.consume_revision_data(rid, rdat); + // a cert packet base64 val; encode_base64(cert_value("peaches"), val); @@ -540,7 +555,7 @@ encode_base64(rsa_pub_key("this is not a real rsa key"), kp.pub); pw.consume_public_key(rsa_keypair_id("address@hidden"), kp.pub); - // a private key packet + // a keypair packet encode_base64(rsa_priv_key("this is not a real rsa key either!"), kp.priv); pw.consume_key_pair(rsa_keypair_id("address@hidden"), kp);