From 10c0d7324d1a25feebaaf6f5bf9b6054e03dd0b3 Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Mon, 24 Aug 2015 16:00:11 +0300 Subject: [PATCH] Removed sgcp, added json. --- .../stargazer/plugins/other/radius/reader.cpp | 7 - .../stargazer/plugins/other/radius/reader.h | 170 ------------------ stglibs/json.lib/Makefile | 18 ++ stglibs/json.lib/generator.cpp | 82 +++++++++ stglibs/json.lib/include/stg/json_generator.h | 122 +++++++++++++ stglibs/json.lib/include/stg/json_parser.h | 107 +++++++++++ stglibs/json.lib/parser.cpp | 122 +++++++++++++ stglibs/sgcp.lib/Makefile | 16 -- stglibs/sgcp.lib/include/stg/sgcp_conn.h | 70 -------- stglibs/sgcp.lib/include/stg/sgcp_proto.h | 68 ------- stglibs/sgcp.lib/include/stg/sgcp_types.h | 39 ---- stglibs/sgcp.lib/include/stg/sgcp_utils.h | 61 ------- stglibs/sgcp.lib/packet.cpp | 28 --- stglibs/sgcp.lib/packet.h | 54 ------ stglibs/sgcp.lib/proto.cpp | 101 ----------- stglibs/sgcp.lib/stream_conn.h | 126 ------------- stglibs/sgcp.lib/tcp.cpp | 56 ------ stglibs/sgcp.lib/tcp.h | 57 ------ stglibs/sgcp.lib/transport.cpp | 18 -- stglibs/sgcp.lib/transport.h | 56 ------ stglibs/sgcp.lib/unix.cpp | 46 ----- stglibs/sgcp.lib/unix.h | 57 ------ 22 files changed, 451 insertions(+), 1030 deletions(-) delete mode 100644 projects/stargazer/plugins/other/radius/reader.cpp delete mode 100644 projects/stargazer/plugins/other/radius/reader.h create mode 100644 stglibs/json.lib/Makefile create mode 100644 stglibs/json.lib/generator.cpp create mode 100644 stglibs/json.lib/include/stg/json_generator.h create mode 100644 stglibs/json.lib/include/stg/json_parser.h create mode 100644 stglibs/json.lib/parser.cpp delete mode 100644 stglibs/sgcp.lib/Makefile delete mode 100644 stglibs/sgcp.lib/include/stg/sgcp_conn.h delete mode 100644 stglibs/sgcp.lib/include/stg/sgcp_proto.h delete mode 100644 stglibs/sgcp.lib/include/stg/sgcp_types.h delete mode 100644 stglibs/sgcp.lib/include/stg/sgcp_utils.h delete mode 100644 stglibs/sgcp.lib/packet.cpp delete mode 100644 stglibs/sgcp.lib/packet.h delete mode 100644 stglibs/sgcp.lib/proto.cpp delete mode 100644 stglibs/sgcp.lib/stream_conn.h delete mode 100644 stglibs/sgcp.lib/tcp.cpp delete mode 100644 stglibs/sgcp.lib/tcp.h delete mode 100644 stglibs/sgcp.lib/transport.cpp delete mode 100644 stglibs/sgcp.lib/transport.h delete mode 100644 stglibs/sgcp.lib/unix.cpp delete mode 100644 stglibs/sgcp.lib/unix.h diff --git a/projects/stargazer/plugins/other/radius/reader.cpp b/projects/stargazer/plugins/other/radius/reader.cpp deleted file mode 100644 index e7d3e2fa..00000000 --- a/projects/stargazer/plugins/other/radius/reader.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "reader.h" - -using STG::Reader; - -Reader::Reader() -{ -} diff --git a/projects/stargazer/plugins/other/radius/reader.h b/projects/stargazer/plugins/other/radius/reader.h deleted file mode 100644 index 3bc1f9e6..00000000 --- a/projects/stargazer/plugins/other/radius/reader.h +++ /dev/null @@ -1,170 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* - * Author : Maxim Mamontov - */ - -#ifndef __STG_SGCONFIG_READER_H__ -#define __STG_SGCONFIG_READER_H__ - -#include -#include -#include - -namespace STG -{ - -struct BaseReader -{ - virtual ~BaseReader() {} - - virtual ssize_t read(TransportProto& proto) = 0; - virtual bool done() const = 0; -}; - -template -class Reader : public BaseReader -{ - public: - Reader(size_t size = sizeof(T)) : m_size(size), m_done(0) {} - - virtual ssize_t read(TransportProto& proto) - { - char* pos = static_cast(&m_dest); - pos += m_done; - ssize_t res = proto.read(pos, m_size - m_done); - if (res < 0) - return res; - if (res == 0) { - m_done = m_size; - return 0; - } - m_done += res; - return res; - } - - virtual bool done() const { return m_done == m_size; } - - T get() const { return ntoh(m_dest); } - - private: - T m_dest; - size_t m_size; - size_t m_done; - -}; - -template <> -class Reader > : public BaseReader -{ - public: - Reader(const std::vector& readers) : m_size(readers.size()), m_done(0) {} - - virtual ssize_t read(TransportProto& proto) - { - if (m_size == 0) - return 0; - size_t res = m_dest[m_done]->read(proto); - if (res < 0) - return res; - if (res == 0) { - m_done = m_size; - return 0; - } - if (m_dest[m_done].done()) - ++m_dest; - return res; - } - - virtual bool done() const { return m_done == m_size; } - - const T& get() const { return m_dest; } - - private: - T m_dest; - size_t m_size; - size_t m_done; - -}; - -template <> -class Reader > : public BaseReader -{ - public: - Reader(size_t size ) : m_dest(size), m_size(size), m_done(0) {} - - virtual ssize_t read(TransportProto& proto) - { - char* pos = static_cast(m_dest.data()); - pos += m_done; - ssize_t res = proto.read(pos, m_size - m_done); - if (res < 0) - return res; - if (res == 0) { - m_done = m_size; - return 0; - } - m_done += res; - return res; - } - - virtual bool done() const { return m_done == m_size; } - - const std::vector& get() const { return m_dest; } - - private: - std::vector m_dest; - size_t m_size; - size_t m_done; - -}; - -template <> -class Reader -{ - public: - Reader() : m_dest(Reader::initDest()) {} - - virtual ssize_t read(TransportProto& proto) - { - if (m_size == 0) - return 0; - size_t res = m_dest[m_done]->read(proto); - if (res < 0) - return res; - if (res == 0) { - m_done = m_size; - return 0; - } - if (m_dest[m_done].done()) - ++m_dest; - return res; - } - - virtual bool done() const { return m_done == m_size; } - - const T& get() const { return m_dest; } - - private: - T m_dest; - size_t m_size; - size_t m_done; -}; - -} // namespace STG - -#endif diff --git a/stglibs/json.lib/Makefile b/stglibs/json.lib/Makefile new file mode 100644 index 00000000..947fce40 --- /dev/null +++ b/stglibs/json.lib/Makefile @@ -0,0 +1,18 @@ +############################################################################### +# $Id: Makefile,v 1.9 2010/08/18 07:47:03 faust Exp $ +############################################################################### + +LIB_NAME = stgjson + +STGLIBS = -lstgcommon +LIBS = + +SRCS = parser.cpp \ + generator.cpp + +INCS = json_parser.h \ + json_generator.h + +LIB_INCS = -I ../common.lib/include + +include ../Makefile.in diff --git a/stglibs/json.lib/generator.cpp b/stglibs/json.lib/generator.cpp new file mode 100644 index 00000000..d18ef04a --- /dev/null +++ b/stglibs/json.lib/generator.cpp @@ -0,0 +1,82 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * Author : Maxim Mamontov + */ + +#include "stg/json_generator.h" + +#include + +using STG::JSON::NullGen; +using STG::JSON::BoolGen; +using STG::JSON::StringGen; +using STG::JSON::NumberGen; +using STG::JSON::MapGen; +using STG::JSON::ArrayGen; +using STG::JSON::Callback; + +namespace +{ + +void genString(yajl_gen_t* handle, const std::string& value) +{ + yajl_gen_string(handle, reinterpret_cast(value.c_str()), value.length()); +} + +} + +void NullGen::run(yajl_gen_t* handle) const { yajl_gen_null(handle); } +void BoolGen::run(yajl_gen_t* handle) const { yajl_gen_bool(handle, m_value); } +void StringGen::run(yajl_gen_t* handle) const { genString(handle, m_value); } +void NumberGen::run(yajl_gen_t* handle) const { yajl_gen_number(handle, m_value.c_str(), m_value.length()); } + +void MapGen::run(yajl_gen_t* handle) const +{ + yajl_gen_map_open(handle); + for (Value::const_iterator it = m_value.begin(); it != m_value.end(); ++it) + { + genString(handle, it->first); + it->second.first->run(handle); + } + yajl_gen_map_close(handle); +} + +void ArrayGen::run(yajl_gen_t* handle) const +{ + yajl_gen_array_open(handle); + for (Value::const_iterator it = m_value.begin(); it != m_value.end(); ++it) + it->first->run(handle); + yajl_gen_array_close(handle); +} + +bool STG::JSON::generate(Gen& gen, Callback callback, void* data) +{ + yajl_gen handle = yajl_gen_alloc(NULL); + + gen.run(handle); + + const unsigned char* buf = NULL; + size_t size = 0; + yajl_gen_get_buf(handle, &buf, &size); + + bool res = callback(data, reinterpret_cast(buf), size); + + yajl_gen_free(handle); + + return res; +} diff --git a/stglibs/json.lib/include/stg/json_generator.h b/stglibs/json.lib/include/stg/json_generator.h new file mode 100644 index 00000000..96e454e3 --- /dev/null +++ b/stglibs/json.lib/include/stg/json_generator.h @@ -0,0 +1,122 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * Author : Maxim Mamontov + */ + +#ifndef __STG_STGLIBS_JSON_GENERATOR_H__ +#define __STG_STGLIBS_JSON_GENERATOR_H__ + +#include +#include +#include +#include + +#include + +struct yajl_gen_t; + +namespace STG +{ +namespace JSON +{ + +struct Gen +{ + virtual ~Gen() {} + virtual void run(yajl_gen_t* handle) const = 0; +}; + +struct NullGen : public Gen +{ + virtual void run(yajl_gen_t* handle) const; +}; + +class BoolGen : public Gen +{ + public: + BoolGen(bool value) : m_value(value) {} + virtual void run(yajl_gen_t* handle) const; + private: + bool m_value; +}; + +class StringGen : public Gen +{ + public: + StringGen(const std::string& value) : m_value(value) {} + virtual void run(yajl_gen_t* handle) const; + private: + std::string m_value; +}; + +class NumberGen : public Gen +{ + public: + NumberGen(const std::string& value) : m_value(value) {} + template + NumberGen(const T& value) : m_value(x2str(value)) {} + virtual void run(yajl_gen_t* handle) const; + private: + std::string m_value; +}; + +class MapGen : public Gen +{ + public: + MapGen() {} + virtual ~MapGen() + { + for (Value::iterator it = m_value.begin(); it != m_value.end(); ++it) + if (it->second.second) + delete it->second.first; + } + MapGen& add(const std::string& key, Gen* value) { m_value[key] = std::make_pair(value, true); return *this; } + MapGen& add(const std::string& key, Gen& value) { m_value[key] = std::make_pair(&value, false); return *this; } + virtual void run(yajl_gen_t* handle) const; + private: + typedef std::pair SmartGen; + typedef std::map Value; + Value m_value; +}; + +class ArrayGen : public Gen +{ + public: + ArrayGen() {} + virtual ~ArrayGen() + { + for (Value::iterator it = m_value.begin(); it != m_value.end(); ++it) + if (it->second) + delete it->first; + } + void add(Gen* value) { m_value.push_back(std::make_pair(value, true)); } + void add(Gen& value) { m_value.push_back(std::make_pair(&value, false)); } + virtual void run(yajl_gen_t* handle) const; + private: + typedef std::pair SmartGen; + typedef std::vector Value; + Value m_value; +}; + +typedef bool (*Callback)(void* /*data*/, const char* /*buf*/, size_t /*size*/); +bool generate(Gen& gen, Callback callback, void* data); + +} +} + +#endif diff --git a/stglibs/json.lib/include/stg/json_parser.h b/stglibs/json.lib/include/stg/json_parser.h new file mode 100644 index 00000000..73009d2f --- /dev/null +++ b/stglibs/json.lib/include/stg/json_parser.h @@ -0,0 +1,107 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * Author : Maxim Mamontov + */ + +#ifndef __STG_STGLIBS_JSON_PARSER_H__ +#define __STG_STGLIBS_JSON_PARSER_H__ + +#include "stg/common.h" + +#include +#include + +#include + +namespace STG +{ +namespace JSON +{ + +struct NodeParser +{ + virtual ~NodeParser() {} + + virtual NodeParser* parseNull() { return this; } + virtual NodeParser* parseBoolean(const bool& /*value*/) { return this; } + virtual NodeParser* parseNumber(const std::string& /*value*/) { return this; } + virtual NodeParser* parseString(const std::string& /*value*/) { return this; } + virtual NodeParser* parseStartMap() { return this; } + virtual NodeParser* parseMapKey(const std::string& /*value*/) { return this; } + virtual NodeParser* parseEndMap() { return this; } + virtual NodeParser* parseStartArray() { return this; } + virtual NodeParser* parseEndArray() { return this; } +}; + +class Parser +{ + public: + Parser(NodeParser* topParser); + virtual ~Parser(); + + bool append(const char* data, size_t size); + bool done(); + + private: + class Impl; + boost::scoped_ptr m_impl; +}; + +template +class EnumParser : public NodeParser +{ + public: + typedef std::map Codes; + EnumParser(NodeParser* next, T& data, std::string& dataStr, const Codes& codes) + : m_next(next), m_data(data), m_dataStr(dataStr), m_codes(codes) {} + virtual NodeParser* parseString(const std::string& value) + { + m_dataStr = value; + const typename Codes::const_iterator it = m_codes.find(ToLower(value)); + if (it != m_codes.end()) + m_data = it->second; + return m_next; + } + private: + NodeParser* m_next; + T& m_data; + std::string& m_dataStr; + const Codes& m_codes; +}; + +class PairsParser : public NodeParser +{ + public: + typedef std::map Pairs; + + PairsParser(NodeParser* next, Pairs& pairs) : m_next(next), m_pairs(pairs) {} + + virtual NodeParser* parseStartMap() { return this; } + virtual NodeParser* parseString(const std::string& value) { m_pairs[m_key] = value; return this; } + virtual NodeParser* parseMapKey(const std::string& value) { m_key = value; return this; } + virtual NodeParser* parseEndMap() { return m_next; } + private: + NodeParser* m_next; + Pairs& m_pairs; + std::string m_key; +}; + +} +} + +#endif diff --git a/stglibs/json.lib/parser.cpp b/stglibs/json.lib/parser.cpp new file mode 100644 index 00000000..5547b697 --- /dev/null +++ b/stglibs/json.lib/parser.cpp @@ -0,0 +1,122 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * Author : Maxim Mamontov + */ + +#include "stg/json_parser.h" + +#include + +using STG::JSON::Parser; +using STG::JSON::NodeParser; + +class Parser::Impl +{ + public: + Impl(NodeParser* topParser); + ~Impl() + { + yajl_free(m_handle); + } + + bool append(const char* data, size_t size) { return yajl_parse(m_handle, reinterpret_cast(data), size) != yajl_status_ok; } + bool done() { return yajl_complete_parse(m_handle) != yajl_status_ok; } + + static int parseNull(void* ctx) + { return runParser(ctx, &NodeParser::parseNull); } + static int parseBoolean(void* ctx, int value) + { return runParser(ctx, &NodeParser::parseBoolean, value != 0); } + static int parseNumber(void* ctx, const char* value, size_t size) + { return runParser(ctx, &NodeParser::parseNumber, std::string(value, size)); } + static int parseString(void* ctx, const unsigned char* value, size_t size) + { return runParser(ctx, &NodeParser::parseString, std::string(reinterpret_cast(value), size)); } + static int parseStartMap(void* ctx) + { return runParser(ctx, &NodeParser::parseStartMap); } + static int parseMapKey(void* ctx, const unsigned char* value, size_t size) + { return runParser(ctx, &NodeParser::parseMapKey, std::string(reinterpret_cast(value), size)); } + static int parseEndMap(void* ctx) + { return runParser(ctx, &NodeParser::parseEndMap); } + static int parseStartArray(void* ctx) + { return runParser(ctx, &NodeParser::parseStartArray); } + static int parseEndArray(void* ctx) + { return runParser(ctx, &NodeParser::parseEndArray); } + + private: + yajl_handle m_handle; + NodeParser* m_parser; + + static yajl_callbacks callbacks; + + static NodeParser& getParser(void* ctx) { return *static_cast(ctx)->m_parser; } + static bool runParser(void* ctx, NodeParser* (NodeParser::*func)()) + { + Impl& p = *static_cast(ctx); + NodeParser* next = (p.m_parser->*func)(); + if (next != NULL) + p.m_parser = next; + return next != NULL; + } + template + static bool runParser(void* ctx, NodeParser* (NodeParser::*func)(const T&), const T& value) + { + Impl& p = *static_cast(ctx); + NodeParser* next = (p.m_parser->*func)(value); + if (next != NULL) + p.m_parser = next; + return next != NULL; + } +}; + +yajl_callbacks Parser::Impl::callbacks = { + Parser::Impl::parseNull, + Parser::Impl::parseBoolean, + NULL, // parsing of integer is done using parseNumber + NULL, // parsing of double is done using parseNumber + Parser::Impl::parseNumber, + Parser::Impl::parseString, + Parser::Impl::parseStartMap, + Parser::Impl::parseMapKey, + Parser::Impl::parseEndMap, + Parser::Impl::parseStartArray, + Parser::Impl::parseEndArray +}; + +Parser::Impl::Impl(NodeParser* topParser) + : m_handle(yajl_alloc(&callbacks, NULL, this)), + m_parser(topParser) +{ +} + +Parser::Parser(NodeParser* topParser) + : m_impl(new Impl(topParser)) +{ +} + +Parser::~Parser() +{ +} + +bool Parser::append(const char* data, size_t size) +{ + return m_impl->append(data, size); +} + +bool Parser::done() +{ + return m_impl->done(); +} diff --git a/stglibs/sgcp.lib/Makefile b/stglibs/sgcp.lib/Makefile deleted file mode 100644 index e8bc30b1..00000000 --- a/stglibs/sgcp.lib/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -include ../../Makefile.conf - -LIB_NAME = stgsgcp - -SRCS = proto.cpp \ - transport.cpp \ - unix.cpp \ - tcp.cpp \ - packet.cpp - -INCS = sgcp_proto.h \ - sgcp_types.h \ - sgcp_utils.h \ - sgcp_conn.h - -include ../Makefile.in diff --git a/stglibs/sgcp.lib/include/stg/sgcp_conn.h b/stglibs/sgcp.lib/include/stg/sgcp_conn.h deleted file mode 100644 index 075ddf27..00000000 --- a/stglibs/sgcp.lib/include/stg/sgcp_conn.h +++ /dev/null @@ -1,70 +0,0 @@ -#ifndef __STG_SGCP_CONN_H__ -#define __STG_SGCP_CONN_H__ - -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* - * Author : Maxim Mamontov - */ - -#include "stg/os_int.h" - -#include -#include - -#include - -namespace STG -{ -namespace SGCP -{ - -class Connection : public boost::enable_shared_from_this -{ - public: - struct Chunk; - typedef boost::function Dispatcher; - typedef boost::function Continuation; - typedef boost::function ErrorHandler; - struct Chunk - { - void* buffer; - size_t size; - Continuation continuation; - }; - - Connection(Dispatcher dispatcher, ErrorHandler errorHandler) : m_dispatcher(dispatcher), m_errorHandler(errorHandler) {} - virtual ~Connection() {} - - virtual boost::asio::basic_stream_socket& socket() = 0; - - virtual void send(const void* data, size_t size) = 0; - - virtual void start() = 0; - virtual void stop() = 0; - - protected: - Dispatcher m_dispatcher; - ErrorHandler m_errorHandler; -}; - -typedef boost::shared_ptr ConnectionPtr; - -} // namespace SGCP -} // namespace STG - -#endif diff --git a/stglibs/sgcp.lib/include/stg/sgcp_proto.h b/stglibs/sgcp.lib/include/stg/sgcp_proto.h deleted file mode 100644 index 9a750b5f..00000000 --- a/stglibs/sgcp.lib/include/stg/sgcp_proto.h +++ /dev/null @@ -1,68 +0,0 @@ -#ifndef __STG_SGCP_PROTO_H__ -#define __STG_SGCP_PROTO_H__ - -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* - * Author : Maxim Mamontov - */ - -#include "sgcp_types.h" // TransportType -#include "sgcp_conn.h" - -#include "stg/os_int.h" - -#include -#include - -#include -#include - -namespace STG -{ -namespace SGCP -{ - -class Proto -{ - public: - - struct Error : public std::runtime_error - { - Error(const std::string& mesage) : runtime_error(message) {} - }; - - typedef boost::function AcceptHandler; - - Proto(TransportType transport, const std::string& key); - ~Proto(); - - ConnectionPtr connect(const std::string& address, uint16_t port); - void bind(const std::string& address, uint16_t port, AcceptHandler handler); - - void run(); - bool stop(); - - private: - class Impl; - boost::scoped_ptr m_impl; -}; - -} // namespace SGCP -} // namespace STG - -#endif diff --git a/stglibs/sgcp.lib/include/stg/sgcp_types.h b/stglibs/sgcp.lib/include/stg/sgcp_types.h deleted file mode 100644 index a33be7b2..00000000 --- a/stglibs/sgcp.lib/include/stg/sgcp_types.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef __STG_SGCP_TYPES_H__ -#define __STG_SGCP_TYPES_H__ - -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* - * Author : Maxim Mamontov - */ - -namespace STG -{ -namespace SGCP -{ - -enum TransportType -{ - UNIX, - TCP, - SSL -}; - -} // namespace SGCP -} // namespace STG - -#endif diff --git a/stglibs/sgcp.lib/include/stg/sgcp_utils.h b/stglibs/sgcp.lib/include/stg/sgcp_utils.h deleted file mode 100644 index 947951d3..00000000 --- a/stglibs/sgcp.lib/include/stg/sgcp_utils.h +++ /dev/null @@ -1,61 +0,0 @@ -#ifndef __STG_SGCP_UTILS_H__ -#define __STG_SGCP_UTILS_H__ - -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* - * Author : Maxim Mamontov - */ - -#include "stg/os_int.h" - -#include // hton* - -namespace STG -{ -namespace SGCP -{ - -template inline T hton(T value) { return value; } -template inline T ntoh(T value) { return hton(value); } - -template <> inline uint16_t hton(uint16_t value) { return htons(value); } -template <> inline int16_t hton(int16_t value) { return htons(value); } - -template <> inline uint32_t hton(uint32_t value) { return htonl(value); } -template <> inline int32_t hton(int32_t value) { return htonl(value); } - -inline -uint64_t htonll(uint64_t value) -{ -#ifdef ARCH_LE - const uint32_t high_part = htonl(static_cast(value >> 32)); - const uint32_t low_part = htonl(static_cast(value & 0xFFFFFFFFLL)); - - return (static_cast(low_part) << 32) | high_part; -#else - return value; -#endif -} - -template <> inline uint64_t hton(uint64_t value) { return htonll(value); } -template <> inline int64_t hton(int64_t value) { return htonll(value); } - -} // namespace SGCP -} // namespace STG - -#endif diff --git a/stglibs/sgcp.lib/packet.cpp b/stglibs/sgcp.lib/packet.cpp deleted file mode 100644 index 12d8f1e9..00000000 --- a/stglibs/sgcp.lib/packet.cpp +++ /dev/null @@ -1,28 +0,0 @@ -#include "packet.h" - -#include "stg/sgcp_utils.h" - -#include - -using STG::SGCP::Packet; - -uint64_t Packet::MAGIC = 0x5f8edc0fdb6d3113; // Carefully picked random 64-bit number :) -uint16_t Packet::VERSION = 1; - -Packet::Packet(uint16_t ver, uint16_t t, uint16_t sz) - : magic(MAGIC), - senderTime(time(NULL)), - version(ver), - type(t), - size(s) -{ -} - -Packet hton(Packet value) -{ - value.magic = hton(value.magic); - value.senderTime = hton(value.senderTime); - value.version = hton(value.version); - value.type = hton(value.type); - value.size = hton(value.size); -} diff --git a/stglibs/sgcp.lib/packet.h b/stglibs/sgcp.lib/packet.h deleted file mode 100644 index f5a4374e..00000000 --- a/stglibs/sgcp.lib/packet.h +++ /dev/null @@ -1,54 +0,0 @@ -#ifndef __STG_SGCP_PACKET_H__ -#define __STG_SGCP_PACKET_H__ - -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* - * Author : Maxim Mamontov - */ - -#include - -namespace STG -{ -namespace SGCP -{ - -struct __attribute__ ((__packed__)) Packet -{ - Packet(uint16_t type, uint16_t size); - - bool valid() const { return magic == MAGIC; } - - static uint64_t MAGIC; - static uint16_t VERSION; - - enum Types { PING, PONG, DATA }; - - uint64_t magic; - uint64_t senderTime; - uint16_t version; - uint16_t type; - uint32_t size; -}; - -Packet hton(Packet value); - -} // namespace SGCP -} // namespace STG - -#endif diff --git a/stglibs/sgcp.lib/proto.cpp b/stglibs/sgcp.lib/proto.cpp deleted file mode 100644 index 8e3b1eb6..00000000 --- a/stglibs/sgcp.lib/proto.cpp +++ /dev/null @@ -1,101 +0,0 @@ -#include "stg/sgcp_proto.h" - -#include "stg/sgcp_transport.h" - -#include -#include - -using STG::SGCP::Proto; - -Proto::Proto(TransportType transport, const std::string& key) - : m_impl(new Impl(transport, key)) -{ -} - -Proto::~Proto() -{ -} - -ConnectionPtr Proto::connect(const std::string& address, uint16_t port) -{ - m_impl->connect(adress, port); -} - -void Proto::bind(const std::string& address, uint16_t port, AcceptHandler handler) -{ - m_impl->bind(address, port, handler); -} - -void Proto::run() -{ - m_impl->run(); -} - -bool Proto::stop() -{ - return m_impl->stop(); -} - -class Proto::Impl -{ - public: - Impl(TransportType transport, const std::string& key); - ~Impl(); - - Connection& connect(const std::string& address, uint16_t port); - void bind(const std::string& address, uint16_t port, AcceptHandler handler); - - void run(); - bool stop(); - - private: - ba::io_service m_ios; - boost::scoped_ptr m_transport; - std::vector m_conns; - bool m_running; - bool m_stopped; -}; - -Proto::Impl::Impl(TransportType transport, const std::string& key) - : m_transport(makeTransport(transport, key)), - m_running(false), - m_stopped(true) -{ -} - -Proto::Impl::~Impl() -{ - stop(); -} - -ConnectionPtr Proto::Impl::connect(const std::string& address, uint16_t port) -{ - return m_transport->connect(address, port); -} - -void Proto::Impl::bind(const std::string& address, uint16_t port, AcceptHandler handler) -{ - m_transport->bind(address, port, handler); -} - -void Proto::Impl::run() -{ - m_stopped = false; - m_running = true; - while (m_running) - m_ios.run_once(); - m_stopped = true; -} - -bool Proto::Impl::stop() -{ - for (size_t i = 0; i < m_conns.size(); ++i) - m_conns[i]->stop(); - m_ios.stop(); - for (size_t i = 0; i < 10 && !m_ios.stopped(); ++i) { - timspec ts; - ts.tv_sec = 0; - ts.tv_nsec = 10000000; // 10 msec - } - return m_ios.stopped(); -} diff --git a/stglibs/sgcp.lib/stream_conn.h b/stglibs/sgcp.lib/stream_conn.h deleted file mode 100644 index 70ca09bc..00000000 --- a/stglibs/sgcp.lib/stream_conn.h +++ /dev/null @@ -1,126 +0,0 @@ -#ifndef __STG_SGCP_STREAM_CONN_H__ -#define __STG_SGCP_STREAM_CONN_H__ - -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* - * Author : Maxim Mamontov - */ - -namespace STG -{ -namespace SGCP -{ -namespace Impl -{ - -template -class StreamConn : public Connection -{ - public: - StreamConn(ba::io_service& ios, Dispatcher dispatcher, ErrorHandler errorHandler) - : Connection(dispatcher, errorHandler), - m_socket(ios) - { - } - - socket::endpoint_type& endpoint() { return m_endpoint; } - - virtual ba::basic_stream_socket& socket() { return m_socket; } - - virtual void start() - { - ba::read(m_socket, ba::buffer(&m_packet, sizeof(m_packet)), - boost::bind(&StreamConn::m_handleReadHeader, this)); - } - virtual void stop() { m_socket.shutdown(socket::shutdown_both); } - - virtual void send(const void* data, size_t size) - { - Packet* packet = new Packet(Packet::DATA, size)); - *packet = hton(*packet); - boost::array data = { - ba::buffer(packet, sizeof(*packet)), - ba::buffer(data, size) - }; - ba::write(m_socket, data, boost::bind(&StreamConn::m_handleWrite, this, packet, boost::_1, boost::_2)); - } - - private: - typedef Stream::socket socket; - socket m_socket; - Packet m_packet; - - void m_handleReadHeader(const boost::system::error_code& ec, size_t size) - { - if (ec) { - // TODO: Handle errors. - /*if (ec != ba::error::operation_aborted) - m_errorHandler(ec);*/ - return; - } - Packet packet = ntoh(m_packet); - Chunk chunk = m_dispatcher(packet.type, packet.size); - if (chunk.size == 0) { - // TODO: Discard current data. - ba::read(m_socket, ba::buffer(&m_packet, sizeof(m_packet)), - boost::bind(&StreamConn::m_handleReadHeader, this)); - return; - } - ba::read(m_socket, ba::buffer(chunk.buffer, chunk.size), - boost::bind(&StreamConn::m_handleReadData, this, packet, chunk, boost::_1, boost::_2)); - } - - void m_handleReadData(Packet packet, Chunk chunk, const boost::system::error_code& ec, size_t size) - { - if (ec) { - // TODO: Handle errors. - /*if (ec != ba::error::operation_aborted) - m_errorHandler(ec);*/ - return; - } - chunk = chunk.continuation(""); // TODO: Handle errors. - if (chunk.size == 0) { - // TODO: Discard current data. - ba::read(m_socket, ba::buffer(&m_packet, sizeof(m_packet)), - boost::bind(&StreamConn::m_handleReadHeader, this)); - return; - } - ba::read(m_socket, ba::buffer(chunk.buffer, chunk.size), - boost::bind(&StreamConn::m_handleReadData, this, packet, chunk, boost::_1, boost::_2)); - } - - void m_handleWrite(Packet* packet, const boost::system::error_code& ec, size_t size) - { - delete packet; - if (ec) { - // TODO: Handle errors. - /*if (ec != ba::error::operation_aborted) - m_errorHandler(ec);*/ - return; - } - } -}; - -typedef StreamConn TCPConn; -typedef StreamConn UNIXConn; - -} // namespace Impl -} // namespace SGCP -} // namespace STG - -#endif diff --git a/stglibs/sgcp.lib/tcp.cpp b/stglibs/sgcp.lib/tcp.cpp deleted file mode 100644 index 5d6c6cbc..00000000 --- a/stglibs/sgcp.lib/tcp.cpp +++ /dev/null @@ -1,56 +0,0 @@ -#include "tcp.h" - -#include "stg/sgcp_utils.h" - -#include -#include - -#include -#include -#include -#include - -using STG::SGCP::TCPProto; - -TCPProto::TCPProto(ba::io_service& ios) - : m_ios(ios), - m_acceptor(m_ios) -{ -} - -TCPProto::~TCPProto() -{ - close(m_sock); -} - -ConnectionPtr TCPProto::connect(const std::string& address, uint16_t port) -{ - bs::error_code ec; - ConnectionPtr conn = boost::make_shared(m_ios); - conn.socket().connect(ba::local::stream_protocol::enpoint(address, port), ec); - if (ec) - throw Error(ec.message()); - conn->start(); - return conn; -} - -void TCPProto::bind(const std::string& address, uint16_t port, Proto::AcceptHandler handler) -{ - bs::error_code ec; - m_acceptor.bind(address, ec); - if (ec) - throw Error(ec.message()); - - TCPConn* conn = new TCPConn(m_ios); - m_acceptor.async_accept(conn->socket(), conn->endpoint(), boost::bind(&TCPProto::m_handleAccept, this, conn, handler, boost::_1); -} - -void TCPProto::m_handleAccept(TCPConn* conn, Proto::AcceptHandler handler, const boost::system::error_code& ec) -{ - if (ec) { - delete conn; - handler(NULL, "", ec.message()); - return; - } - handler(conn, conn->enpoint().address(), ""); -} diff --git a/stglibs/sgcp.lib/tcp.h b/stglibs/sgcp.lib/tcp.h deleted file mode 100644 index 55de821b..00000000 --- a/stglibs/sgcp.lib/tcp.h +++ /dev/null @@ -1,57 +0,0 @@ -#ifndef __STG_SGCP_TCP_H__ -#define __STG_SGCP_TCP_H__ - -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* - * Author : Maxim Mamontov - */ - -#include "stg/sgcp_transport.h" - -#include "stg/os_int.h" - -#include - -#include // ssize_t - -namespace STG -{ -namespace SGCP -{ - -class TCPProto : public TransportProto -{ - public: - TCPProto(boost::asio::io_service& ios); - virtual ~TCPProto(); - - virtual ConnectionPtr connect(const std::string& address, uint16_t port) = 0; - virtual void bind(const std::string& address, uint16_t port, Proto::AcceptHandler handler) = 0; - - typedef boost::asio::ip::tcp protocol; - private: - ba::io_service& m_ios; - protocol::acceptor m_acceptor; - - void m_handleAccept(TCPConn* conn, Proto::AcceptHandler handler, const boost::system::error_code& ec) -}; - -} // namespace SGCP -} // namespace STG - -#endif diff --git a/stglibs/sgcp.lib/transport.cpp b/stglibs/sgcp.lib/transport.cpp deleted file mode 100644 index b67cea6a..00000000 --- a/stglibs/sgcp.lib/transport.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "stg/sgcp_transport.h" - -#include "crypto.h" -#include "unix.h" -#include "tcp.h" -#include "ssl.h" - -using STG::SGCP::TransportProto; - -TransportProto* TransportProto::create(TransportType transport, const std::string& key) -{ - switch (transport) { - case UNIX: return new UnixProto; - case TCP: return new TCPProto; - case SSL: return new SSLProto(key); - }; - return NULL; -} diff --git a/stglibs/sgcp.lib/transport.h b/stglibs/sgcp.lib/transport.h deleted file mode 100644 index 6e24756a..00000000 --- a/stglibs/sgcp.lib/transport.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef __STG_SGCP_TRANSPORT_H__ -#define __STG_SGCP_TRANSPORT_H__ - -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* - * Author : Maxim Mamontov - */ - -#include "stg/sgcp_types.h" - -#include "stg/os_int.h" - -#include -#include - -#include // ssize_t - -namespace STG -{ -namespace SGCP -{ - -class TransportProto -{ - public: - struct Error : public std::runtime_error { - Error(const std::string& message) : runtime_error(message) {} - }; - - static TransportProto* create(TransportType transport, const std::string& key); - - virtual ~TransportProto() {} - - virtual ConnectionPtr connect(const std::string& address, uint16_t port) = 0; - virtual void bind(const std::string& address, uint16_t port, Proto::AcceptHandler handler) = 0; -}; - -} // namespace SGCP -} // namespace STG - -#endif diff --git a/stglibs/sgcp.lib/unix.cpp b/stglibs/sgcp.lib/unix.cpp deleted file mode 100644 index 02f7f524..00000000 --- a/stglibs/sgcp.lib/unix.cpp +++ /dev/null @@ -1,46 +0,0 @@ -#include "unix.h" - -using STG::SGCP::UNIXProto; - -UNIXProto::UNIXProto(ba::io_service& ios) - : m_ios(ios), - m_acceptor(m_ios) -{ -} - -UNIXProto::~UNIXProto() -{ - close(m_sock); -} - -ConnectionPtr UNIXProto::connect(const std::string& address, uint16_t /*port*/) -{ - bs::error_code ec; - ConnectionPtr conn = boost::make_shared(m_ios); - conn.socket().connect(ba::local::stream_protocol::enpoint(address), ec); - if (ec) - throw Error(ec.message()); - conn->start(); - return conn; -} - -void UNIXProto::bind(const std::string& address, uint16_t /*port*/, Proto::AcceptHandler handler) -{ - bs::error_code ec; - m_acceptor.bind(address, ec); - if (ec) - throw Error(ec.message()); - - UNIXConn* conn = new UNIXConn(m_ios); - m_acceptor.async_accept(conn->socket(), conn->endpoint(), boost::bind(&UNIXProto::m_handleAccept, this, conn, handler, boost::_1); -} - -void UNIXProto::m_handleAccept(UNIXConn* conn, Proto::AcceptHandler handler, const boost::system::error_code& ec) -{ - if (ec) { - delete conn; - handler(NULL, "", ec.message()); - return; - } - handler(conn, conn->enpoint().path(), ""); -} diff --git a/stglibs/sgcp.lib/unix.h b/stglibs/sgcp.lib/unix.h deleted file mode 100644 index 6735f6dc..00000000 --- a/stglibs/sgcp.lib/unix.h +++ /dev/null @@ -1,57 +0,0 @@ -#ifndef __STG_SGCP_UNIX_H__ -#define __STG_SGCP_UNIX_H__ - -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* - * Author : Maxim Mamontov - */ - -#include "stg/sgcp_transport.h" - -#include "stg/os_int.h" - -#include - -#include // ssize_t - -namespace STG -{ -namespace SGCP -{ - -class UNIXProto : public TransportProto -{ - public: - UNIXProto(boost::asio::io_service& ios); - virtual ~UNIXProto(); - - virtual ConnectionPtr connect(const std::string& address, uint16_t port) = 0; - virtual void bind(const std::string& address, uint16_t port, Proto::AcceptHandler handler) = 0; - - typedef boost::asio::local::stream_protocol protocol; - private: - ba::io_service& m_ios; - protocol::acceptor m_acceptor; - - void m_handleAccept(UNIXConn* conn, Proto::AcceptHandler handler, const boost::system::error_code& ec) -}; - -} // namespace SGCP -} // namespace STG - -#endif -- 2.44.2