summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2013-02-13 22:38:54 (UTC)
committer Michael Krelin <hacker@klever.net>2013-02-13 22:38:54 (UTC)
commitd6545bd95153a5e41cdae441643f4e4a0af94a49 (patch) (side-by-side diff)
tree51e1ae7f4a3cba4de21e9c62b28c55d414064566
parentdd545573337e3c54ad4c2c64d72f750ad03aa2c9 (diff)
downloadiii-d6545bd95153a5e41cdae441643f4e4a0af94a49.zip
iii-d6545bd95153a5e41cdae441643f4e4a0af94a49.tar.gz
iii-d6545bd95153a5e41cdae441643f4e4a0af94a49.tar.bz2
introduce mimewriter classess for gsoap mime streaming
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--src/eyetil.cc10
-rw-r--r--src/eyetil.h22
2 files changed, 32 insertions, 0 deletions
diff --git a/src/eyetil.cc b/src/eyetil.cc
index 6ccc4ae..fba8724 100644
--- a/src/eyetil.cc
+++ b/src/eyetil.cc
@@ -170,24 +170,34 @@ 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;
}
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 8784cb4..64948d0 100644
--- a/src/eyetil.h
+++ b/src/eyetil.h
@@ -1,32 +1,34 @@
#ifndef __EYETIL_H
#define __EYETIL_H
#include <vector>
#include <string>
+#include <fstream>
#include <archive.h>
#include <archive_entry.h>
#include "openssl/md5.h"
+#include "soapH.h"
struct throwable_exit {
int rc;
throwable_exit(int rc_) : rc(rc_) { }
};
class binary_t : public std::vector<unsigned char> {
public:
binary_t() { }
binary_t(size_type n) : std::vector<unsigned char>(n) { }
binary_t(const std::string& h) { from_hex(h); }
binary_t(const void *d,size_t s) { from_data(d,s); }
binary_t& from_hex(const std::string& h);
binary_t& from_data(const void *d,size_t s);
binary_t& make_nonce();
std::string hex() const;
binary_t md5() const;
};
struct md5_digester {
MD5_CTX ctx;
md5_digester() { init(); }
@@ -89,28 +91,48 @@ 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);
~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 */