(ModbusTCP): Исправил ошибку обработки несуществующего адреса в ModbusTCPSlave…

configure.ac

@@ -3,11 +3,11 @@
 # See doc: http://www.gnu.org/software/hello/manual/autoconf/Generic-Programs.html
 
 # AC_PREREQ(2.59)
-AC_INIT([uniset], [1.7.0], pv@etersoft.ru)
+AC_INIT([uniset], [1.1.0], pv@etersoft.ru)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 
 # AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADER(uniset-config.h)
+AC_CONFIG_HEADER(config.h)
 
 dnl Initialize maintainer mode
 AM_MAINTAINER_MODE
@@ -30,7 +30,7 @@ AC_ENABLE_SHARED(yes)
 AC_ENABLE_STATIC(no)
 AM_PROG_LIBTOOL
 
-LIBVER=1:7:0
+LIBVER=1:1:0
 AC_SUBST(LIBVER)
 
 # Checks for libraries.
@@ -39,23 +39,6 @@ PKG_CHECK_MODULES(OMNI, omniORB4)
 PKG_CHECK_MODULES(SIGC, sigc++-2.0)
 PKG_CHECK_MODULES(COMCPP, libccgnu2)
 
-
-#check sqlite support
-AC_MSG_CHECKING([sqlite support])
-buildsqlite=true
-AC_ARG_ENABLE(sqlite, AC_HELP_STRING([--disable-sqlite], [disable SQLite support]),
-[ if test $enableval = yes; then buildsqlite=true; else buildsqlite=false; fi],[ buildsqlite=true; ])
-
-if test ${buildsqlite} = true; then
-	AC_MSG_RESULT([enabled])
-	PKG_CHECK_MODULES(SQLITE3, sqlite3)
-else
-	AC_MSG_RESULT([disabled])
-fi
-
-AM_CONDITIONAL(DISABLE_SQLITE, test ${buildsqlite} = false)
-
-
 # export
 LDFLAGS="${OMNI_LIBS} ${XML_LIBS}"
 CXXFLAGS="-pedantic -Wall -funsigned-char -g -D_GNU_SOURCE ${OMNI_CFLAGS} ${XML_CFLAGS} -I\$(top_builddir)/include"
@@ -83,25 +66,6 @@ fi
 
 AM_CONDITIONAL(DISABLE_MYSQL, test ${buildmysql} = false)
 
-
-#check rrd support
-AC_MSG_CHECKING([rrd support])
-buildrrd=true
-AC_ARG_ENABLE(rrd, AC_HELP_STRING([--disable-rrd], [disable RRD support]),
-[ if test $enableval = yes; then buildrrd=true; else buildrrd=false; fi],[ buildrrd=true; ])
-
-if test ${buildrrd} = true; then
-	AC_MSG_RESULT([enabled])
-	PKG_CHECK_MODULES(RRD,librrd)
-	AC_SUBST(RRD_LIBS)
-	AC_SUBST(RRD_CFLAGS)
-else
-	AC_MSG_RESULT([disabled])
-fi
-
-AM_CONDITIONAL(DISABLE_RRD, test ${buildrrd} = false)
-
-
 #check build extensions
 ext=true
 AC_MSG_CHECKING([Extensions])
@@ -121,26 +85,6 @@ fi
 
 AM_CONDITIONAL(HAVE_EXTENTIONS, test ${ext} = true)
 
-
-#check python support
-AC_MSG_CHECKING([python support])
-buildpython=true
-AC_ARG_ENABLE(python, AC_HELP_STRING([--disable-python], [disable Python support]),
-[ if test $enableval = yes; then buildpython=true; else buildpython=false; fi],[ buildpython=true; ])
-
-if test ${buildpython} = true; then
-	AC_MSG_RESULT([enabled])
-	dnl Python
-	AM_PATH_PYTHON(,,)
-	PKG_CHECK_MODULES(PYTHON,python,,exit)
-#	AC_CHECK_PROG(SWIG, swig, yes, exit)
-else
-	AC_MSG_RESULT([disabled])
-fi
-
-AM_CONDITIONAL(DISABLE_PYTHON, test ${buildpython} = false)
-
-
 # check Doxygen
 DOXYGEN=""
 doc=true
@@ -166,16 +110,6 @@ fi
 AC_SUBST(UNISET_CODEGEN)
 echo "UNISET_CODEGEN: $UNISET_CODEGEN"
 
-UNISET_CFLAGS="-I \$(top_builddir) -I \$(top_builddir)/include"
-AC_SUBST(UNISET_CFLAGS)
-UNISET_LIBS="\$(top_builddir)/lib/libUniSet.la"
-AC_SUBST(UNISET_LIBS)
-
-UNISET_EXT_CFLAGS="-I \$(top_builddir)/extensions/include"
-AC_SUBST(UNISET_EXT_CFLAGS)
-UNISET_EXT_LIBS="\$(top_builddir)/extensions/lib/libUniSetExtensions.la"
-AC_SUBST(UNISET_EXT_LIBS)
-
 # Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
@@ -233,6 +167,7 @@ AC_CONFIG_FILES([Makefile
 				 Utilities/SMonit/Makefile
 				 Utilities/InfoServer/Makefile
 				 Utilities/MBTester/Makefile
+				 Utilities/DBServer-MySQL/Makefile
 				 Utilities/SImitator/Makefile
 				 Utilities/codegen/Makefile
 				 Utilities/codegen/uniset-codegen
@@ -241,33 +176,24 @@ AC_CONFIG_FILES([Makefile
 				 extensions/libUniSetExtensions.pc
 				 extensions/lib/Makefile
 				 extensions/include/Makefile
-				 extensions/DBServer-MySQL/Makefile
-				 extensions/DBServer-MySQL/libUniSetMySQL.pc
-				 extensions/DBServer-SQLite/Makefile
-				 extensions/DBServer-SQLite/libUniSetSQLite.pc
 				 extensions/IOControl/Makefile
 				 extensions/IOControl/libUniSetIOControl.pc
-				 extensions/ModbusMaster/Makefile
-				 extensions/ModbusMaster/libUniSetRTU.pc
-				 extensions/ModbusMaster/libUniSetMBTCPMaster.pc
+				 extensions/RTUExchange/Makefile
+				 extensions/RTUExchange/libUniSetRTU.pc
 				 extensions/ModbusSlave/Makefile
 				 extensions/ModbusSlave/libUniSetMBSlave.pc
+				 extensions/MBTCPMaster/Makefile
+				 extensions/MBTCPMaster/libUniSetMBTCPMaster.pc
 				 extensions/LogicProcessor/Makefile
 				 extensions/LogicProcessor/libUniSetLogicProcessor.pc
 				 extensions/SMViewer/Makefile
 				 extensions/UniNetwork/Makefile
 				 extensions/UniNetwork/libUniSetNetwork.pc
-				 extensions/UNetUDP/Makefile
-				 extensions/UNetUDP/libUniSetUNetUDP.pc
+				 extensions/UNet2/Makefile
+				 extensions/UNet2/libUniSetUNet2.pc
 				 extensions/SharedMemory/Makefile
 				 extensions/SharedMemory/libUniSetSharedMemory.pc
-				 extensions/SharedMemoryPlus/Makefile
-				 extensions/RRDServer/Makefile
-				 extensions/RRDServer/libUniSetRRDServer.pc
-				 extensions/tests/Makefile
-				 python/lib/Makefile
-				 python/lib/pyUniSet/Makefile
-				 python/Makefile])
+				 extensions/SharedMemoryPlus/Makefile])
 				 
 AC_OUTPUT