[parchive2-cvs] library/src/packet input_file_slice_checksum_packet.cc,1.24,1.25 packet.cc,1.31,1.32

[<co...@us...>]

Update of /cvsroot/parchive2/library/src/packet
In directory sc8-pr-cvs1:/tmp/cvs-serv4822/src/packet

Modified Files:
	input_file_slice_checksum_packet.cc packet.cc 
Log Message:
Fixed a bug in length computation


Index: input_file_slice_checksum_packet.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/packet/input_file_slice_checksum_packet.cc,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** input_file_slice_checksum_packet.cc	6 May 2003 04:16:27 -0000	1.24
--- input_file_slice_checksum_packet.cc	7 May 2003 03:41:56 -0000	1.25
***************
*** 31,36 ****
  const unsigned long long Input_File_Slice_Checksum_Packet::Get_Packet_Length() const
  {
!     return (Packet::Get_Packet_Length() + sizeof(md5) + 
!              md5s.size()*(sizeof(md5) + sizeof(crc)));
  }
  
--- 31,50 ----
  const unsigned long long Input_File_Slice_Checksum_Packet::Get_Packet_Length() const
  {
!     // I don't know why this works and the other way below fails...
!     unsigned long long length = Packet::Get_Packet_Length();
!     length += sizeof(md5);
! 
!     list<md5>::const_iterator i = md5s.begin();
!     do
!       {
!           length += sizeof(md5);
!           i++;
!           length += sizeof(crc);
!       } while(i != md5s.end());
! 
!     return length;
! 
! //    return (Packet::Get_Packet_Length() + sizeof(md5) + 
! //             md5s.size()*(sizeof(md5) + sizeof(crc)));
  }
  

Index: packet.cc
===================================================================
RCS file: /cvsroot/parchive2/library/src/packet/packet.cc,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** packet.cc	7 May 2003 03:22:59 -0000	1.31
--- packet.cc	7 May 2003 03:41:56 -0000	1.32
***************
*** 47,60 ****
  const md5 Packet::calculateHash()
  {
!   const unsigned long long int len = Get_Packet_Length() - 32;
    
    char *buf = new char[len];
    char *curpos = buf;
  
!   memcpy(curpos, recovery_set_id.Get_MD5(), 16);
!   curpos += 16;
   
!   memcpy(curpos, type.get_type(), 16);
!   curpos += 16;
  
    serializeData(curpos);
--- 47,62 ----
  const md5 Packet::calculateHash()
  {
!   const unsigned long long int len =
!     Get_Packet_Length() - Packet::Get_Packet_Length() + 
!     sizeof(md5) + sizeof(packet_type) /*for below*/;
    
    char *buf = new char[len];
    char *curpos = buf;
  
!   memcpy(curpos, recovery_set_id.Get_MD5(), sizeof(md5));
!   curpos += sizeof(md5);
   
!   memcpy(curpos, type.get_type(), sizeof(packet_type));
!   curpos += sizeof(packet_type);
  
    serializeData(curpos);