| -rw-r--r-- | src/eyetil.cc | 9 | ||||
| -rw-r--r-- | src/eyetil.h | 2 |
2 files changed, 0 insertions, 11 deletions
diff --git a/src/eyetil.cc b/src/eyetil.cc index 5bceec7..5489d7b 100644 --- a/src/eyetil.cc +++ b/src/eyetil.cc @@ -90,114 +90,105 @@ uint16_t block512_t::tcpcksum(block512_t& data) { } void integrity_digester::update(const void *d_,size_t s) { uint8_t *d=(uint8_t*)d_; if(data_size) { int l = sizeof(data)-data_size; if(l>s) { memmove(data.dptr(data_size),d,s); data_size+=s; return; } memmove(data.dptr(data_size),d,l); d+=l; s-=l; md5.update<uint16_t>( data.tcpcksum(data) ); } if(s<sizeof(data)) { memmove(data.dptr(0),d,s); data_size=s; return; } size_t bb=s/sizeof(block512_t); std::transform((block512_t*)d,((block512_t*)d)+bb, md5.updater<uint16_t>(),block512_t::tcpcksum); size_t ss=bb*sizeof(block512_t); d+=ss; s-=ss; assert(s<sizeof(block512_t)); if(s) memmove(data.dptr(0),d,data_size=s); } binary_t integrity_digester::final(const std::string& ukey) { assert(!data_size); md5.update( binary_t(ukey) ); return md5.final(); } 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) { make_path_for_template(dt,0777); if(!mkdtemp((char*)dir.data())) throw std::runtime_error("failed to mkdtmp()"); } tmpdir_t::~tmpdir_t() { assert(!dir.empty()); if(rmdir(dir.c_str())) { syslog(LOG_WARNING,"Failed to remove '%s' directory",dir.c_str()); } } std::string tmpdir_t::get_file(const std::string& f) { std::string::size_type ls = f.rfind('/'); return dir+'/'+( (ls==std::string::npos) ? f : f.substr(ls+1) ); } tarchive_t::tarchive_t(const char *fn) : a(archive_read_new()), e(0) { if(!a) throw std::runtime_error("failed to archive_read_new()"); if(archive_read_support_format_tar(a)) { archive_read_finish(a); throw std::runtime_error("failed to archive_read_support_format_tar()"); } if(archive_read_open_filename(a,fn,16384)) { archive_read_finish(a); throw std::runtime_error("failed to archive_read_open_memory()"); } } tarchive_t::~tarchive_t() { assert(a); archive_read_finish(a); } 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; } - -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(); -} - mimewrite_tarfile::mimewrite_tarfile(tmpdir_t& d) { f.open((fn=d.get_file("the-tarfile.tar")).c_str(),std::ios_base::in|std::ios_base::out|std::ios_base::trunc|std::ios_base::binary); } mimewrite_tarfile::~mimewrite_tarfile() { unlink(fn.c_str()); } int mimewrite_tarfile::write(const char *buf,size_t len) { return f.write(buf,len) ? (idigest.update(buf,len),SOAP_OK) : SOAP_ERR; } diff --git a/src/eyetil.h b/src/eyetil.h index 8af18a4..22e07f1 100644 --- a/src/eyetil.h +++ b/src/eyetil.h @@ -39,100 +39,98 @@ struct md5_digester { template<typename T> void update(const T& x) { update(&x,sizeof(x)); } template<typename T> struct update_iterator : public std::iterator<std::output_iterator_tag,T,void,T*,T&> { md5_digester *d; update_iterator(md5_digester *d_) : d(d_) { } update_iterator(const update_iterator& x) : d(x.d) { } update_iterator& operator*() { return *this; } update_iterator& operator++() { return *this; } update_iterator& operator++(int) { return *this; } 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() struct integrity_digester { md5_digester md5; size_t data_size; block512_t data; integrity_digester() : data_size(0) { } void update(const void *d,size_t s); binary_t final(const std::string& ukey); }; 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(const char *); ~tarchive_t(); bool read_next_header(); std::string entry_pathname(); bool read_data_into_fd(int fd); }; struct mimewrite_base { virtual ~mimewrite_base() { } virtual int write(const char *buf,size_t len) = 0; virtual void close() = 0; }; struct mimewrite_string : public mimewrite_base { std::string str; int write(const char *buf,size_t len) { str.append(buf,len); return SOAP_OK; }; void close() { } }; struct mimewrite_tarfile : public mimewrite_base { std::string fn; std::fstream f; integrity_digester idigest; mimewrite_tarfile(tmpdir_t& d); ~mimewrite_tarfile(); int write(const char *buf,size_t len); void close() { } }; -binary_t integrity_digest(const void *ptr,size_t size, - const std::string& ukey); #endif /* __EYETIL_H */ |