-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 { | |||
70 | return rv; | 70 | return rv; |
71 | } | 71 | } |
72 | 72 | ||
73 | void md5_digester::init() { | 73 | void md5_digester::init() { |
74 | if(!MD5_Init(&ctx)) throw std::runtime_error("failed to MD5_Init()"); | 74 | if(!MD5_Init(&ctx)) throw std::runtime_error("failed to MD5_Init()"); |
75 | } | 75 | } |
76 | void md5_digester::update(const void *d,size_t l) { | 76 | void md5_digester::update(const void *d,size_t l) { |
77 | if(!MD5_Update(&ctx,d,l)) throw std::runtime_error("failed to MD5_Update()"); | 77 | if(!MD5_Update(&ctx,d,l)) throw std::runtime_error("failed to MD5_Update()"); |
78 | } | 78 | } |
79 | binary_t md5_digester::final() { | 79 | 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 | ||
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; |
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; |
92 | sl=p.find('/',sl+1)) { | 97 | sl=p.find('/',sl+1)) { |
93 | if(stat( (pp=p.substr(0,sl)).c_str() ,&st) | 98 | if(stat( (pp=p.substr(0,sl)).c_str() ,&st) |
94 | || !S_ISDIR(st.st_mode)) { | 99 | || !S_ISDIR(st.st_mode)) { |
95 | if(mkdir(pp.c_str(),m)) | 100 | if(mkdir(pp.c_str(),m)) |
96 | throw std::runtime_error("failed to mkdir()"); | 101 | throw std::runtime_error("failed to mkdir()"); |
97 | } | 102 | } |
98 | } | 103 | } |
99 | } | 104 | } |
100 | 105 | ||
101 | tmpdir_t::tmpdir_t(const std::string& dt) : dir(dt) { | 106 | tmpdir_t::tmpdir_t(const std::string& dt) : dir(dt) { |
@@ -137,37 +142,24 @@ tarchive_t::~tarchive_t() { | |||
137 | 142 | ||
138 | bool tarchive_t::read_next_header() { | 143 | bool tarchive_t::read_next_header() { |
139 | assert(a); | 144 | assert(a); |
140 | return archive_read_next_header(a,&e)==ARCHIVE_OK; | 145 | return archive_read_next_header(a,&e)==ARCHIVE_OK; |
141 | } | 146 | } |
142 | 147 | ||
143 | std::string tarchive_t::entry_pathname() { | 148 | std::string tarchive_t::entry_pathname() { |
144 | assert(a); assert(e); | 149 | assert(a); assert(e); |
145 | return archive_entry_pathname(e); | 150 | return archive_entry_pathname(e); |
146 | } | 151 | } |
147 | 152 | ||
148 | bool tarchive_t::read_data_into_fd(int fd) { | 153 | 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), |
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) ); |
172 | return rv.final(); | 164 | return rv.final(); |
173 | } | 165 | } |
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 { | |||
50 | 50 | ||
51 | update_iterator& operator=(const T& x) { | 51 | update_iterator& operator=(const T& x) { |
52 | d->update(x); return *this; | 52 | d->update(x); return *this; |
53 | } | 53 | } |
54 | }; | 54 | }; |
55 | 55 | ||
56 | template<typename T> | 56 | template<typename T> |
57 | update_iterator<T> updater() { | 57 | update_iterator<T> updater() { |
58 | return update_iterator<T>(this); | 58 | return update_iterator<T>(this); |
59 | } | 59 | } |
60 | 60 | ||
61 | }; | 61 | }; |
62 | template<> inline void md5_digester::update<binary_t>(const binary_t& x) { | 62 | template<> 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) | ||
67 | struct 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 | |||
66 | class tmpdir_t { | 77 | class 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(); |
72 | 83 | ||
73 | std::string get_file(const std::string& f); | 84 | std::string get_file(const std::string& f); |
74 | }; | 85 | }; |
75 | 86 | ||
76 | class tarchive_t { | 87 | class tarchive_t { |
77 | public: | 88 | public: |
78 | struct archive *a; | 89 | struct archive *a; |
79 | struct archive_entry *e; | 90 | struct archive_entry *e; |
80 | 91 | ||
81 | tarchive_t(void *p,size_t s); | 92 | tarchive_t(void *p,size_t s); |