Python dnp3

.gitignore

@@ -1,51 +1,61 @@
+dnp3test
+!DNP3Test/
+
+testset
+!TestSet/
+
+*.gcda
+*.gcno
 *.iml
-opendnp3.jar
-JavaDNP3.h
-JavaDNP3.cpp
+*.la
+*.lo
+*.o
+*.user
+*~
+.*.swp
+.DS_Store
+.deps
+.dirstamp
 .idea
-/DNP3Java/target
-/DNP3Java/src
-/DNP.ncb
-/DNP.suo
+.libs
 Debug
 Release
 ipch
-*.user
-pc_cygwin
+
+/DNP3Java/.java-built
+/DNP3Java/JavaDNP3.cpp
+/DNP3Java/JavaDNP3.h
+/DNP3Java/src
+/DNP3Java/target
+opendnp3.jar
+
 /*/pc_linux_arm
-/tools/install_scripts/boost/*/temp
-/tools/boostlib
 /CSToCppXMLBinder/bin
 /CSToCppXMLBinder/obj
 /ConfigurationBuilder/*.cs
 /ConfigurationBuilder/*.xsx
-/TestSet/*.xml
-/DNP3Java/jar
+/DNP.ncb
+/DNP.suo
 /DNP3Java/JavaDNP3_wrap.*
+/DNP3Java/jar
+/DNP3Java/src
+/DNP3Java/target
+/TestSet/*.xml
+/coverage-*
+/doc
 /java
+/lcov
+/org
 /src
-*.log
+/tools/boostlib
+/tools/install_scripts/boost/*/temp
+Debug
 Linux_i686
+Release
 TestAPL/TestSingle.tiny.xml
 TestSingle.tiny.xml
-/doc
-/coverage-*
-/lcov
-/org
-*~
-*.o
-*.lo
-.deps
-.dirstamp
-.libs
-*.la
-*.so
-*.gcno
-*.gcda
-.*.swp
-*.map
-*.sdf
-*.opensdf
+ipch
+pc_cygwin
 
 demo-master-cpp
 demo-slave-cpp
@@ -55,27 +65,26 @@ __init__.pyc
 pyopendnp3.py
 pyopendnp3.pyc
 
+/autom4te.cache
+/build-aux
 /config/autotools/m4/libtool.m4
 /config/autotools/m4/ltoptions.m4
 /config/autotools/m4/ltsugar.m4
 /config/autotools/m4/ltversion.m4
 /config/autotools/m4/lt~obsolete.m4
-
-/build-aux
-
 /configure
-configure.in
-configure
-Makefile.in
 Makefile
-config.h
-stamp-h1
+Makefile.in
 aclocal.m4
-/autom4te.cache
+compile.log
+config.h
 config.h.in
+config.log
 config.status
+configure
+configure.in
 libtool
+stamp-h1
 
 *target*
 
-

APLTestTools/AsyncPhysTestObject.cpp

@@ -18,15 +18,16 @@
 //
 
 #include "AsyncPhysTestObject.h"
+#include <opendnp3/APL/TcpSettings.h>
 
 namespace apl
 {
 
 AsyncPhysTestObject::AsyncPhysTestObject(FilterLevel aLevel, bool aImmediate, bool aAutoRead) :
 	AsyncTestObjectASIO(),
 	LogTester(aImmediate),
-	mTCPClient(mLog.GetLogger(aLevel, "TCPClient"), this->GetService(), "127.0.0.1", 50000),
-	mTCPServer(mLog.GetLogger(aLevel, "TCPSever"), this->GetService(), "127.0.0.1", 50000),
+	mTCPClient(mLog.GetLogger(aLevel, "TCPClient"), this->GetService(), TcpSettings("127.0.0.1", 50000)),
+	mTCPServer(mLog.GetLogger(aLevel, "TCPSever"), this->GetService(), TcpSettings("127.0.0.1", 50000)),
 	mClientAdapter(mLog.GetLogger(aLevel, "ClientAdapter"), &mTCPClient, aAutoRead),
 	mServerAdapter(mLog.GetLogger(aLevel, "ServerAdapter"), &mTCPServer, aAutoRead),
 	mClientUpper(mLog.GetLogger(aLevel, "MockUpperClient")),