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) (unidiff) | |
tree | a115a131493aa73cdc4fe00f2e002a2f32f67d4e /src/eyetil.cc | |
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 |
1 files changed, 5 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 | |||
@@ -82,8 +82,13 @@ binary_t md5_digester::final() { | |||
82 | throw std::runtime_error("failed to MD5_Final()"); | 82 | throw std::runtime_error("failed to MD5_Final()"); |
83 | return rv; | 83 | return rv; |
84 | } | 84 | } |
85 | 85 | ||
86 | uint16_t block512_t::tcpcksum(block512_t& data) { | ||
87 | uint32_t sum = std::accumulate(data.data,data.data+words,0); | ||
88 | while(uint32_t hw = sum>>16) sum = (sum&0xffff)+hw; | ||
89 | return 0xffff&~sum; | ||
90 | } | ||
86 | 91 | ||
87 | static void make_path_for_template(const std::string& p,mode_t m) { | 92 | static void make_path_for_template(const std::string& p,mode_t m) { |
88 | struct stat st; | 93 | struct stat st; |
89 | std::string pp; | 94 | std::string pp; |
@@ -149,21 +154,8 @@ bool tarchive_t::read_data_into_fd(int fd) { | |||
149 | assert(a); | 154 | assert(a); |
150 | return archive_read_data_into_fd(a,fd)==ARCHIVE_OK; | 155 | return archive_read_data_into_fd(a,fd)==ARCHIVE_OK; |
151 | } | 156 | } |
152 | 157 | ||
153 | #pragma pack(1) | ||
154 | struct block512_t { | ||
155 | enum { words = 512 / sizeof(uint16_t) }; | ||
156 | uint16_t data[words]; | ||
157 | |||
158 | static uint16_t tcpcksum(block512_t& data) { | ||
159 | uint32_t sum = std::accumulate(data.data,data.data+words,0); | ||
160 | while(uint32_t hw = sum>>16) sum = (sum&0xffff)+hw; | ||
161 | return 0xffff&~sum; | ||
162 | } | ||
163 | |||
164 | }; | ||
165 | #pragma pack() | ||
166 | 158 | ||
167 | binary_t integrity_digest(const void *ptr,size_t size,const std::string& ukey) { | 159 | binary_t integrity_digest(const void *ptr,size_t size,const std::string& ukey) { |
168 | md5_digester rv; | 160 | md5_digester rv; |
169 | std::transform( (block512_t*)ptr, ((block512_t*)ptr)+size/sizeof(block512_t), | 161 | std::transform( (block512_t*)ptr, ((block512_t*)ptr)+size/sizeof(block512_t), |