Merge pull request #398 from PhoenixDecim/phoenixdecim/buildfailfix

Phoenixdecim/buildfailfix

README.md

@@ -2,7 +2,7 @@ Open Source C++ OPC-UA Server and Client Library
 ========
 [![Build Status](https://travis-ci.org/FreeOpcUa/freeopcua.svg?branch=master)](https://travis-ci.org/FreeOpcUa/freeopcua)
 
-LGPL OPC-UA server and client library written in C++ and with a lot of code auto-generated from xml specification using python.  
+LGPL [OPC-UA](https://opcfoundation.org/about/opc-technologies/opc-ua/) server and client library written in C++ and with a lot of code auto-generated from xml specification using python.  
 
 Python bindings can be found in the python directory.
 

debian.soft

@@ -4,5 +4,5 @@ libboost-system-dev libboost-filesystem-dev \
 libcppunit-dev pkg-config git python-dev libboost-python-dev \
 gsoap libxml2-dev build-essential autotools-dev dh-make \
 debhelper devscripts fakeroot xutils lintian pbuilder \
-reprepro
+reprepro libmbedtls-dev
 

src/core/common/uri_facade_win.cpp

@@ -19,7 +19,7 @@
 namespace Common
 {
 
-void Uri::Initialize(const char * uriString, std::size_t size)
+void Uri::Initialize(const std::string &uriString)
 {
   URL_COMPONENTS url = {0};
   url.dwStructSize = sizeof(url);
@@ -31,7 +31,7 @@ void Uri::Initialize(const char * uriString, std::size_t size)
 
   // TODO msdn says do not use this function in services and in server patforms. :(
   // TODO http://msdn.microsoft.com/en-us/library/windows/desktop/aa384376(v=vs.85).aspx
-  if (!InternetCrackUrl(uriString, size, options, &url))
+  if (!InternetCrackUrl(uriString.c_str(), uriString.size(), options, &url))
     {
       THROW_ERROR1(CannotParseUri, uriString);
     }

src/core/socket_channel.cpp

@@ -50,7 +50,11 @@ OpcUa::SocketChannel::~SocketChannel()
 
 void OpcUa::SocketChannel::Stop()
 {
+#ifdef _WIN32
+  closesocket(Socket);
+#else
   close(Socket);
+#endif
 }
 
 std::size_t OpcUa::SocketChannel::Receive(char * data, std::size_t size)

src/server/endpoints_parameters.cpp

@@ -13,6 +13,7 @@
 
 #include <iostream>
 #include <stdexcept>
+#include <algorithm>
 
 namespace
 {