author | Michael Krelin <hacker@klever.net> | 2013-02-13 22:30:47 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2013-02-13 22:30:47 (UTC) |
commit | d6d845ab3cdbc76943d68329aa0aaa3ddf2af21a (patch) (side-by-side diff) | |
tree | a115a131493aa73cdc4fe00f2e002a2f32f67d4e | |
parent | 41f437eeadaae0dce4a3dad3da6dde2bd3c3de99 (diff) | |
download | iii-d6d845ab3cdbc76943d68329aa0aaa3ddf2af21a.zip iii-d6d845ab3cdbc76943d68329aa0aaa3ddf2af21a.tar.gz iii-d6d845ab3cdbc76943d68329aa0aaa3ddf2af21a.tar.bz2 |
moved tcp checksum calculation to header
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | src/eyetil.cc | 18 | ||||
-rw-r--r-- | src/eyetil.h | 11 |
2 files changed, 16 insertions, 13 deletions
diff --git a/src/eyetil.cc b/src/eyetil.cc index 11e2fb7..cd22eea 100644 --- a/src/eyetil.cc +++ b/src/eyetil.cc @@ -70,32 +70,37 @@ binary_t binary_t::md5() const { return rv; } void md5_digester::init() { if(!MD5_Init(&ctx)) throw std::runtime_error("failed to MD5_Init()"); } void md5_digester::update(const void *d,size_t l) { if(!MD5_Update(&ctx,d,l)) throw std::runtime_error("failed to MD5_Update()"); } binary_t md5_digester::final() { binary_t rv(MD5_DIGEST_LENGTH); if(!MD5_Final((unsigned char*)&(rv.front()), &ctx)) throw std::runtime_error("failed to MD5_Final()"); return rv; } +uint16_t block512_t::tcpcksum(block512_t& data) { + uint32_t sum = std::accumulate(data.data,data.data+words,0); + while(uint32_t hw = sum>>16) sum = (sum&0xffff)+hw; + return 0xffff&~sum; +} static void make_path_for_template(const std::string& p,mode_t m) { struct stat st; std::string pp; for(std::string::size_type sl=p.find('/',1); sl!=std::string::npos; sl=p.find('/',sl+1)) { if(stat( (pp=p.substr(0,sl)).c_str() ,&st) || !S_ISDIR(st.st_mode)) { if(mkdir(pp.c_str(),m)) throw std::runtime_error("failed to mkdir()"); } } } tmpdir_t::tmpdir_t(const std::string& dt) : dir(dt) { @@ -137,37 +142,24 @@ tarchive_t::~tarchive_t() { bool tarchive_t::read_next_header() { assert(a); return archive_read_next_header(a,&e)==ARCHIVE_OK; } std::string tarchive_t::entry_pathname() { assert(a); assert(e); return archive_entry_pathname(e); } bool tarchive_t::read_data_into_fd(int fd) { assert(a); return archive_read_data_into_fd(a,fd)==ARCHIVE_OK; } -#pragma pack(1) -struct block512_t { - enum { words = 512 / sizeof(uint16_t) }; - uint16_t data[words]; - - static uint16_t tcpcksum(block512_t& data) { - uint32_t sum = std::accumulate(data.data,data.data+words,0); - while(uint32_t hw = sum>>16) sum = (sum&0xffff)+hw; - return 0xffff&~sum; - } - -}; -#pragma pack() binary_t integrity_digest(const void *ptr,size_t size,const std::string& ukey) { md5_digester rv; std::transform( (block512_t*)ptr, ((block512_t*)ptr)+size/sizeof(block512_t), rv.updater<uint16_t>(), block512_t::tcpcksum ); rv.update( binary_t(ukey) ); return rv.final(); } diff --git a/src/eyetil.h b/src/eyetil.h index 03b9ba8..7517ba6 100644 --- a/src/eyetil.h +++ b/src/eyetil.h @@ -50,32 +50,43 @@ struct md5_digester { update_iterator& operator=(const T& x) { d->update(x); return *this; } }; template<typename T> update_iterator<T> updater() { return update_iterator<T>(this); } }; template<> inline void md5_digester::update<binary_t>(const binary_t& x) { update((const unsigned char*)&(x.front()),x.size()); } +#pragma pack(1) +struct block512_t { + enum { words = 512 / sizeof(uint16_t) }; + uint16_t data[words]; + + inline uint8_t *dptr(size_t o) { return ((uint8_t*)this)+o; } + + static uint16_t tcpcksum(block512_t& data); +}; +#pragma pack() + class tmpdir_t { public: std::string dir; tmpdir_t(const std::string& dt); ~tmpdir_t(); std::string get_file(const std::string& f); }; class tarchive_t { public: struct archive *a; struct archive_entry *e; tarchive_t(void *p,size_t s); |