Merge pull request #7 from MiaoDX-fork-and-pruning/add_some_examples

Make build with `SSL` support optional, and add some examples.
This commit is contained in:
Fred Nicolson 2017-05-29 09:06:14 +01:00 committed by GitHub
commit 2d1cf169db
4 changed files with 47 additions and 2 deletions

29
examples/CMakeLists.txt Normal file
View File

@ -0,0 +1,29 @@
cmake_minimum_required(VERSION 3.5)
project(frnetlib_test)
if( WIN32 )
set( ADDITIONAL_LIB ws2_32 ) # Ws2_32.lib
set( FRNETLIB_ROOT_PATH "C:/tools/cmake_install_libs/frnetlib/" ) # change it to your install directory
set( FRNETLIB_INCLUDE_PATH ${FRNETLIB_ROOT_PATH}/include )
set( FRNETLIB_LIB ${FRNETLIB_ROOT_PATH}/lib/frnetlib-s-d.lib )
include_directories( ${FRNETLIB_INCLUDE_PATH} )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -std=c++14")
elseif(APPLE)
set( ADDITIONAL_LIB "" )
else()
set( ADDITIONAL_LIB "" )
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -m64 -fPIC -std=c++14 -pthread -lmbedtls -lmbedx509 -lmbedcrypto")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -m64 -fPIC -std=c++14 -pthread")
endif()
add_executable(${PROJECT_NAME} ../main.cpp)
add_executable(packet packet.cpp)
target_link_libraries(${PROJECT_NAME} ${FRNETLIB_LIB} ${ADDITIONAL_LIB})
target_link_libraries(packet ${FRNETLIB_LIB} ${ADDITIONAL_LIB})

14
examples/packet.cpp Normal file
View File

@ -0,0 +1,14 @@
#include <iostream>
#include "frnetlib/Packet.h"
int main()
{
fr::Packet packet;
std::vector<std::pair<int, int>> bob = {{1, 2}, {3, 4}};
packet << bob;
bob.clear();
packet >> bob;
std::cout << bob[0].first << ", " << bob[0].second << ", " << bob[1].first << ", " << bob[1].second << std::endl;
}

View File

@ -3,11 +3,12 @@
//
#include <chrono>
#include <mbedtls/net_sockets.h>
#include <frnetlib/TcpListener.h>
#include "frnetlib/SSLListener.h"
#ifdef SSL_ENABLED
#include <mbedtls/net_sockets.h>
namespace fr
{
SSLListener::SSLListener(std::shared_ptr<SSLContext> ssl_context_, const std::string &crt_path, const std::string &pem_path, const std::string &private_key_path) noexcept

View File

@ -4,10 +4,11 @@
#include "frnetlib/SSLSocket.h"
#include <memory>
#include <mbedtls/net_sockets.h>
#ifdef SSL_ENABLED
#include <mbedtls/net_sockets.h>
namespace fr
{
SSLSocket::SSLSocket(std::shared_ptr<SSLContext> ssl_context_) noexcept