diff options
author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-10-12 11:11:06 (GMT) |
---|---|---|
committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-10-12 11:11:06 (GMT) |
commit | fa90b5749693d9f5817ad1f106334a0877171fd3 (patch) | |
tree | 8d53b5c820590cad54893bc575ef55df38f55d23 /src/uscxml/server | |
parent | c36b123a60278caef5d06e8a7d0b3d338d669c75 (diff) | |
download | uscxml-fa90b5749693d9f5817ad1f106334a0877171fd3.zip uscxml-fa90b5749693d9f5817ad1f106334a0877171fd3.tar.gz uscxml-fa90b5749693d9f5817ad1f106334a0877171fd3.tar.bz2 |
Major work on PROMELA datamodel
Diffstat (limited to 'src/uscxml/server')
-rw-r--r-- | src/uscxml/server/HTTPServer.cpp | 2 | ||||
-rw-r--r-- | src/uscxml/server/HTTPServer.h | 2 | ||||
-rw-r--r-- | src/uscxml/server/Socket.cpp | 18 | ||||
-rw-r--r-- | src/uscxml/server/Socket.h | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/uscxml/server/HTTPServer.cpp b/src/uscxml/server/HTTPServer.cpp index 1b92203..37be5a9 100644 --- a/src/uscxml/server/HTTPServer.cpp +++ b/src/uscxml/server/HTTPServer.cpp @@ -115,7 +115,7 @@ HTTPServer::HTTPServer(unsigned short port, unsigned short wsPort, SSLConfig* ss LOG(ERROR) << "WebSocket server cannot bind to tcp/" << _wsPort; } } - + #if (defined EVENT_SSL_FOUND && defined OPENSSL_FOUND && defined OPENSSL_HAS_ELIPTIC_CURVES) // have another look here https://github.com/ppelleti/https-example/blob/master/https-server.c _sslHandle = NULL; diff --git a/src/uscxml/server/HTTPServer.h b/src/uscxml/server/HTTPServer.h index dc9af53..7fedd83 100644 --- a/src/uscxml/server/HTTPServer.h +++ b/src/uscxml/server/HTTPServer.h @@ -78,7 +78,7 @@ public: type = req.data.compound["type"].atom; evhttpReq = req.evhttpReq; } - + int status; std::string type; std::map<std::string, std::string> headers; diff --git a/src/uscxml/server/Socket.cpp b/src/uscxml/server/Socket.cpp index fc79357..35b416e 100644 --- a/src/uscxml/server/Socket.cpp +++ b/src/uscxml/server/Socket.cpp @@ -92,7 +92,7 @@ void Socket::parseAddress(const std::string& address, std::string& protocol, std protocol = "tcp"; protEnd = 0; } - + size_t hostEnd = address.find(":", protEnd); if (hostEnd != std::string::npos) { hostName = address.substr(protEnd, hostEnd - protEnd); @@ -109,7 +109,7 @@ void Socket::parseAddress(const std::string& address, std::string& protocol, std } } - + ClientSocket::ClientSocket(int domain, int type, int protocol) : Socket(domain, type, protocol), _clientEvent(NULL) { } @@ -149,7 +149,7 @@ void ClientSocket::connect(const std::string& address) { parseAddress(address, _prot, _address, _port); connect(_address, _port); } - + void ClientSocket::connect(const std::string& address, int port) { // tthread::lock_guard<tthread::recursive_mutex> lock(_mutex); @@ -166,7 +166,7 @@ void ClientSocket::connect(const std::string& address, int port) { int ClientSocket::write(const std::string& data) { return write(data.data(), data.size()); } - + int ClientSocket::write(const char* data, size_t size) { // tthread::lock_guard<tthread::recursive_mutex> lock(_mutex); bufferevent_write(_clientEvent, data, size); @@ -182,7 +182,7 @@ void ClientSocket::readCallback(struct bufferevent *bev, void *ctx) { char* data = (char*)malloc(instance->_blockSizeRead); input = bufferevent_get_input(bev); - + while((n = evbuffer_remove(input, data, instance->_blockSizeRead)) > 0) { instance->readCallback(data, n); } @@ -357,8 +357,8 @@ void ServerSocket::Connection::reply(const char* data, size_t size) { PacketServerSocket::~PacketServerSocket() { for(std::map<Connection, std::stringstream*>::iterator fragIter = _fragments.begin(); - fragIter != _fragments.end(); - fragIter++) { + fragIter != _fragments.end(); + fragIter++) { delete fragIter->second; } } @@ -366,10 +366,10 @@ PacketServerSocket::~PacketServerSocket() { void PacketServerSocket::readCallback(const char* data, size_t size, Connection& conn) { if (_fragments.find(conn) == _fragments.end()) _fragments[conn] = new std::stringstream(); - + std::stringstream* fragment = _fragments[conn]; *fragment << std::string(data, size); - + size_t startPos = 0; size_t endPos; const std::string& buffer = fragment->str(); diff --git a/src/uscxml/server/Socket.h b/src/uscxml/server/Socket.h index 7bb8ebe..01e91b2 100644 --- a/src/uscxml/server/Socket.h +++ b/src/uscxml/server/Socket.h @@ -112,7 +112,7 @@ protected: std::string _sep; std::map<Connection, std::stringstream*> _fragments; }; - + class USCXML_API ClientSocket : public Socket { public: ClientSocket(int domain, int type, int protocol); |