summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2013-02-13 22:30:47 (UTC)
committer Michael Krelin <hacker@klever.net>2013-02-13 22:30:47 (UTC)
commitd6d845ab3cdbc76943d68329aa0aaa3ddf2af21a (patch) (unidiff)
treea115a131493aa73cdc4fe00f2e002a2f32f67d4e
parent41f437eeadaae0dce4a3dad3da6dde2bd3c3de99 (diff)
downloadiii-d6d845ab3cdbc76943d68329aa0aaa3ddf2af21a.zip
iii-d6d845ab3cdbc76943d68329aa0aaa3ddf2af21a.tar.gz
iii-d6d845ab3cdbc76943d68329aa0aaa3ddf2af21a.tar.bz2
moved tcp checksum calculation to header
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/eyetil.cc18
-rw-r--r--src/eyetil.h11
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
@@ -80,12 +80,17 @@ binary_t md5_digester::final() {
80 binary_t rv(MD5_DIGEST_LENGTH); 80 binary_t rv(MD5_DIGEST_LENGTH);
81 if(!MD5_Final((unsigned char*)&(rv.front()), &ctx)) 81 if(!MD5_Final((unsigned char*)&(rv.front()), &ctx))
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
86uint16_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
87static void make_path_for_template(const std::string& p,mode_t m) { 92static 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;
90 for(std::string::size_type sl=p.find('/',1); 95 for(std::string::size_type sl=p.find('/',1);
91 sl!=std::string::npos; 96 sl!=std::string::npos;
@@ -147,25 +152,12 @@ std::string tarchive_t::entry_pathname() {
147 152
148bool tarchive_t::read_data_into_fd(int fd) { 153bool 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)
154struct 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
167binary_t integrity_digest(const void *ptr,size_t size,const std::string& ukey) { 159binary_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),
170 rv.updater<uint16_t>(), block512_t::tcpcksum ); 162 rv.updater<uint16_t>(), block512_t::tcpcksum );
171 rv.update( binary_t(ukey) ); 163 rv.update( binary_t(ukey) );
diff --git a/src/eyetil.h b/src/eyetil.h
index 03b9ba8..7517ba6 100644
--- a/src/eyetil.h
+++ b/src/eyetil.h
@@ -60,12 +60,23 @@ struct md5_digester {
60 60
61}; 61};
62template<> inline void md5_digester::update<binary_t>(const binary_t& x) { 62template<> inline void md5_digester::update<binary_t>(const binary_t& x) {
63 update((const unsigned char*)&(x.front()),x.size()); 63 update((const unsigned char*)&(x.front()),x.size());
64} 64}
65 65
66#pragma pack(1)
67struct block512_t {
68 enum { words = 512 / sizeof(uint16_t) };
69 uint16_t data[words];
70
71 inline uint8_t *dptr(size_t o) { return ((uint8_t*)this)+o; }
72
73 static uint16_t tcpcksum(block512_t& data);
74};
75#pragma pack()
76
66class tmpdir_t { 77class tmpdir_t {
67 public: 78 public:
68 std::string dir; 79 std::string dir;
69 80
70 tmpdir_t(const std::string& dt); 81 tmpdir_t(const std::string& dt);
71 ~tmpdir_t(); 82 ~tmpdir_t();