Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
ef7fdabc
Commit
ef7fdabc
authored
Jan 26, 2010
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed bug in MBTCPMaster
parent
641998d3
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
41 additions
and
12 deletions
+41
-12
libuniset.spec
conf/libuniset.spec
+4
-1
MBSlave.cc
extensions/ModbusSlave/MBSlave.cc
+3
-3
ModbusTCPMaster.cc
src/Communications/Modbus/ModbusTCPMaster.cc
+17
-5
ModbusTCPServer.cc
src/Communications/Modbus/ModbusTCPServer.cc
+10
-0
ModbusTypes.cc
src/Communications/Modbus/ModbusTypes.cc
+7
-3
No files found.
conf/libuniset.spec
View file @
ef7fdabc
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
Name: libuniset
Name: libuniset
Version: 0.97
Version: 0.97
Release: eter
48
Release: eter
50
Summary: UniSet - library for building distributed industrial control systems
Summary: UniSet - library for building distributed industrial control systems
License: GPL
License: GPL
Group: Development/C++
Group: Development/C++
...
@@ -182,6 +182,9 @@ rm -f %buildroot%_libdir/*.la
...
@@ -182,6 +182,9 @@ rm -f %buildroot%_libdir/*.la
%exclude %_pkgconfigdir/libUniSet.pc
%exclude %_pkgconfigdir/libUniSet.pc
%changelog
%changelog
* Tue Jan 26 2010 Pavel Vainerman <pv@altlinux.ru> 0.97-eter49
- fixed bug in ModbusTCPMaster
* Mon Dec 28 2009 Alexander Morozov <amorozov@etersoft.ru> 0.97-eter48
* Mon Dec 28 2009 Alexander Morozov <amorozov@etersoft.ru> 0.97-eter48
- added new filters
- added new filters
- fixed some bugs
- fixed some bugs
...
...
extensions/ModbusSlave/MBSlave.cc
View file @
ef7fdabc
...
@@ -833,7 +833,7 @@ ModbusRTU::mbErrCode MBSlave::readOutputRegisters( ModbusRTU::ReadOutputMessage&
...
@@ -833,7 +833,7 @@ ModbusRTU::mbErrCode MBSlave::readOutputRegisters( ModbusRTU::ReadOutputMessage&
if
(
reply
.
count
<
query
.
count
)
if
(
reply
.
count
<
query
.
count
)
{
{
dlog
[
Debug
::
WARN
]
<<
myname
dlog
[
Debug
::
WARN
]
<<
myname
<<
"(readInputRegisters): query.count="
<<
query
.
count
<<
"(readInputRegisters): query.count="
<<
(
int
)
query
.
count
<<
" > reply.count="
<<
reply
.
count
<<
endl
;
<<
" > reply.count="
<<
reply
.
count
<<
endl
;
}
}
...
@@ -1143,8 +1143,8 @@ mbErrCode MBSlave::readInputRegisters( ReadInputMessage& query,
...
@@ -1143,8 +1143,8 @@ mbErrCode MBSlave::readInputRegisters( ReadInputMessage& query,
if
(
reply
.
count
<
query
.
count
)
if
(
reply
.
count
<
query
.
count
)
{
{
dlog
[
Debug
::
WARN
]
<<
myname
dlog
[
Debug
::
WARN
]
<<
myname
<<
"(readInputRegisters): query.count="
<<
query
.
count
<<
"(readInputRegisters): query.count="
<<
(
int
)
query
.
count
<<
" > reply.count="
<<
reply
.
count
<<
endl
;
<<
" > reply.count="
<<
(
int
)
reply
.
count
<<
endl
;
}
}
pingOK
=
true
;
pingOK
=
true
;
...
...
src/Communications/Modbus/ModbusTCPMaster.cc
View file @
ef7fdabc
...
@@ -160,10 +160,13 @@ mbErrCode ModbusTCPMaster::query( ModbusAddr addr, ModbusMessage& msg,
...
@@ -160,10 +160,13 @@ mbErrCode ModbusTCPMaster::query( ModbusAddr addr, ModbusMessage& msg,
if
(
ret
<
(
int
)
sizeof
(
rmh
)
)
if
(
ret
<
(
int
)
sizeof
(
rmh
)
)
{
{
if
(
dlog
.
debugging
(
Debug
::
INFO
)
)
dlog
[
Debug
::
INFO
]
<<
"(ModbusTCPMaster::query): ret="
<<
(
int
)
ret
<<
" < rmh="
<<
(
int
)
sizeof
(
rmh
)
<<
endl
;
disconnect
();
disconnect
();
return
erTimeOut
;
// return erHardwareError;
return
erTimeOut
;
// return erHardwareError;
}
}
rmh
.
swapdata
();
rmh
.
swapdata
();
if
(
rmh
.
tID
!=
mh
.
tID
)
if
(
rmh
.
tID
!=
mh
.
tID
)
...
@@ -176,11 +179,20 @@ mbErrCode ModbusTCPMaster::query( ModbusAddr addr, ModbusMessage& msg,
...
@@ -176,11 +179,20 @@ mbErrCode ModbusTCPMaster::query( ModbusAddr addr, ModbusMessage& msg,
cleanInputStream
();
cleanInputStream
();
return
erBadReplyNodeAddress
;
return
erBadReplyNodeAddress
;
}
}
//
//
return
recv
(
addr
,
msg
.
func
,
reply
,
timeout
);
// msg.addr = rmh.uID;
// return recv(addr,msg.func,reply,timeout);
// return recv_pdu(msg.func,reply,timeout);
mbErrCode
res
=
recv
(
addr
,
msg
.
func
,
reply
,
timeout
);
if
(
force_disconnect
)
{
if
(
dlog
.
debugging
(
Debug
::
INFO
)
)
dlog
[
Debug
::
INFO
]
<<
"(query): force disconnect.."
<<
endl
;
disconnect
();
}
return
res
;
}
}
if
(
dlog
.
debugging
(
Debug
::
INFO
)
)
if
(
dlog
.
debugging
(
Debug
::
INFO
)
)
...
...
src/Communications/Modbus/ModbusTCPServer.cc
View file @
ef7fdabc
...
@@ -88,6 +88,7 @@ mbErrCode ModbusTCPServer::receive( ModbusRTU::ModbusAddr addr, timeout_t timeou
...
@@ -88,6 +88,7 @@ mbErrCode ModbusTCPServer::receive( ModbusRTU::ModbusAddr addr, timeout_t timeou
}
}
usleep
(
10000
);
usleep
(
10000
);
tcp
.
disconnect
();
return
res
;
return
res
;
}
}
...
@@ -104,7 +105,10 @@ mbErrCode ModbusTCPServer::receive( ModbusRTU::ModbusAddr addr, timeout_t timeou
...
@@ -104,7 +105,10 @@ mbErrCode ModbusTCPServer::receive( ModbusRTU::ModbusAddr addr, timeout_t timeou
while
(
res
==
erBadReplyNodeAddress
);
while
(
res
==
erBadReplyNodeAddress
);
if
(
res
!=
erNoError
)
if
(
res
!=
erNoError
)
{
tcp
.
disconnect
();
return
res
;
return
res
;
}
// processing message...
// processing message...
res
=
processing
(
buf
);
res
=
processing
(
buf
);
...
@@ -169,7 +173,13 @@ mbErrCode ModbusTCPServer::tcp_processing( ost::TCPStream& tcp, ModbusTCP::MBAPH
...
@@ -169,7 +173,13 @@ mbErrCode ModbusTCPServer::tcp_processing( ost::TCPStream& tcp, ModbusTCP::MBAPH
len
=
ModbusTCPCore
::
readNextData
(
&
tcp
,
qrecv
,
mhead
.
len
);
len
=
ModbusTCPCore
::
readNextData
(
&
tcp
,
qrecv
,
mhead
.
len
);
if
(
len
<
mhead
.
len
)
if
(
len
<
mhead
.
len
)
{
if
(
dlog
.
debugging
(
Debug
::
INFO
)
)
dlog
[
Debug
::
INFO
]
<<
"(ModbusTCPServer::tcp_processing): len("
<<
(
int
)
len
<<
") < mhead.len("
<<
(
int
)
mhead
.
len
<<
")"
<<
endl
;
return
erInvalidFormat
;
return
erInvalidFormat
;
}
return
erNoError
;
return
erNoError
;
}
}
...
...
src/Communications/Modbus/ModbusTypes.cc
View file @
ef7fdabc
...
@@ -653,7 +653,8 @@ std::ostream& ModbusRTU::operator<<(std::ostream& os, ReadInputStatusMessage& m
...
@@ -653,7 +653,8 @@ std::ostream& ModbusRTU::operator<<(std::ostream& os, ReadInputStatusMessage& m
// return mbPrintMessage(os,(ModbusByte*)(&m),sizeof(m));
// return mbPrintMessage(os,(ModbusByte*)(&m),sizeof(m));
return
os
<<
"addr="
<<
addr2str
(
m
.
addr
)
return
os
<<
"addr="
<<
addr2str
(
m
.
addr
)
<<
" start="
<<
dat2str
(
m
.
start
)
<<
" start="
<<
dat2str
(
m
.
start
)
<<
" count="
<<
dat2str
(
m
.
count
);
<<
" count="
<<
dat2str
(
m
.
count
)
<<
"("
<<
(
int
)
m
.
count
<<
")"
;
}
}
std
::
ostream
&
ModbusRTU
::
operator
<<
(
std
::
ostream
&
os
,
ReadInputStatusMessage
*
m
)
std
::
ostream
&
ModbusRTU
::
operator
<<
(
std
::
ostream
&
os
,
ReadInputStatusMessage
*
m
)
{
{
...
@@ -854,7 +855,9 @@ std::ostream& ModbusRTU::operator<<(std::ostream& os, ReadOutputMessage& m )
...
@@ -854,7 +855,9 @@ std::ostream& ModbusRTU::operator<<(std::ostream& os, ReadOutputMessage& m )
// return mbPrintMessage(os,(ModbusByte*)(&m),sizeof(m));
// return mbPrintMessage(os,(ModbusByte*)(&m),sizeof(m));
return
os
<<
"addr="
<<
addr2str
(
m
.
addr
)
return
os
<<
"addr="
<<
addr2str
(
m
.
addr
)
<<
" start="
<<
dat2str
(
m
.
start
)
<<
" start="
<<
dat2str
(
m
.
start
)
<<
" count="
<<
dat2str
(
m
.
count
);
<<
" count="
<<
dat2str
(
m
.
count
)
<<
"("
<<
(
int
)
m
.
count
<<
")"
;
}
}
std
::
ostream
&
ModbusRTU
::
operator
<<
(
std
::
ostream
&
os
,
ReadOutputMessage
*
m
)
std
::
ostream
&
ModbusRTU
::
operator
<<
(
std
::
ostream
&
os
,
ReadOutputMessage
*
m
)
{
{
...
@@ -1070,7 +1073,8 @@ std::ostream& ModbusRTU::operator<<(std::ostream& os, ReadInputMessage& m )
...
@@ -1070,7 +1073,8 @@ std::ostream& ModbusRTU::operator<<(std::ostream& os, ReadInputMessage& m )
// return mbPrintMessage(os,(ModbusByte*)(&m),sizeof(m));
// return mbPrintMessage(os,(ModbusByte*)(&m),sizeof(m));
return
os
<<
"addr="
<<
addr2str
(
m
.
addr
)
return
os
<<
"addr="
<<
addr2str
(
m
.
addr
)
<<
" start="
<<
dat2str
(
m
.
start
)
<<
" start="
<<
dat2str
(
m
.
start
)
<<
" count="
<<
dat2str
(
m
.
count
);
<<
" count="
<<
dat2str
(
m
.
count
)
<<
"("
<<
(
int
)
m
.
count
<<
")"
;
}
}
std
::
ostream
&
ModbusRTU
::
operator
<<
(
std
::
ostream
&
os
,
ReadInputMessage
*
m
)
std
::
ostream
&
ModbusRTU
::
operator
<<
(
std
::
ostream
&
os
,
ReadInputMessage
*
m
)
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment