Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
ITADataSources
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Institute of Technical Acoustics (ITA)
ITADataSources
Commits
856ce0b9
Commit
856ce0b9
authored
Dec 21, 2016
by
Anne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge fixed bodyloop
parent
5c42938a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
487 additions
and
418 deletions
+487
-418
include/ITANetAudioMessage.h
include/ITANetAudioMessage.h
+8
-2
include/ITANetAudioStreamingServer.h
include/ITANetAudioStreamingServer.h
+0
-2
src/ITANetAudioMessage.cpp
src/ITANetAudioMessage.cpp
+449
-399
src/ITANetAudioServer.cpp
src/ITANetAudioServer.cpp
+0
-1
src/ITANetAudioStreamingClient.cpp
src/ITANetAudioStreamingClient.cpp
+16
-6
src/ITANetAudioStreamingServer.cpp
src/ITANetAudioStreamingServer.cpp
+12
-6
tests/NetAudio/ITANetAudioStreamingServerTest.cpp
tests/NetAudio/ITANetAudioStreamingServerTest.cpp
+2
-2
No files found.
include/ITANetAudioMessage.h
View file @
856ce0b9
...
...
@@ -78,7 +78,10 @@ public:
void
WriteString
(
const
std
::
string
&
);
void
WriteIntVector
(
const
std
::
vector
<
int
>
);
void
WriteFloatVector
(
const
std
::
vector
<
float
>
);
void
WriteStreamingParameters
(
const
CITANetAudioProtocol
::
StreamingParameters
&
);
void
WriteStreamingParameters
(
const
CITANetAudioProtocol
::
StreamingParameters
&
);
void
WriteRingBufferSize
(
const
int
);
void
WriteRingBufferFree
(
const
int
);
void
WriteSampleFrame
(
ITASampleFrame
*
);
std
::
string
ReadString
();
int
ReadInt
();
...
...
@@ -88,7 +91,10 @@ public:
double
ReadDouble
();
std
::
vector
<
int
>
ReadIntVector
();
std
::
vector
<
float
>
ReadFloatVector
();
CITANetAudioProtocol
::
StreamingParameters
ReadStreamingParameters
();
CITANetAudioProtocol
::
StreamingParameters
ReadStreamingParameters
();
int
ReadRingBufferSize
();
int
ReadRingBufferFree
();
void
ReadSampleFrame
(
ITASampleFrame
*
pSampleFrame
);
private:
...
...
include/ITANetAudioStreamingServer.h
View file @
856ce0b9
...
...
@@ -74,8 +74,6 @@ public:
void
SetAutomaticUpdateRate
();
bool
LoopBody
();
protected:
int
Transmit
(
const
ITASampleFrame
&
sfNewSamples
,
int
iNumSamples
);
ITADatasource
*
GetInputStream
()
const
;
...
...
src/ITANetAudioMessage.cpp
View file @
856ce0b9
#include <ITANetAudioMessage.h>
#include <ITAStringUtils.h>
#include <VistaInterProcComm/Connections/VistaConnectionIP.h>
#include <VistaBase/VistaExceptionBase.h>
#include <cassert>
static
int
S_nMessageIds
=
0
;
CITANetAudioMessage
::
CITANetAudioMessage
(
VistaSerializingToolset
::
ByteOrderSwapBehavior
bSwapBuffers
)
:
m_vecIncomingBuffer
(
2048
)
,
m_oOutgoing
(
2048
)
,
m_pConnection
(
NULL
)
{
m_oOutgoing
.
SetByteorderSwapFlag
(
bSwapBuffers
);
m_oIncoming
.
SetByteorderSwapFlag
(
bSwapBuffers
);
ResetMessage
();
}
void
CITANetAudioMessage
::
ResetMessage
()
{
if
(
m_oIncoming
.
GetTailSize
()
>
0
)
{
std
::
cerr
<<
"CITANetAudioMessage::ResetMessage() called before message was fully processed!"
<<
std
::
endl
;
}
// wait till sending is complete -> this prevents us
// from deleting the buffer while it is still being read
// by the connection
if
(
m_pConnection
)
m_pConnection
->
WaitForSendFinish
();
m_nMessageId
=
S_nMessageIds
++
;
m_oOutgoing
.
ClearBuffer
();
m_oOutgoing
.
WriteInt32
(
0
);
// size dummy
m_oOutgoing
.
WriteInt32
(
0
);
// type dummy
m_oOutgoing
.
WriteInt32
(
0
);
// ID
m_oIncoming
.
SetBuffer
(
NULL
,
0
);
m_nMessageType
=
CITANetAudioProtocol
::
NP_INVALID
;
m_nAnswerType
=
CITANetAudioProtocol
::
NP_INVALID
;
m_pConnection
=
NULL
;
}
void
CITANetAudioMessage
::
SetConnection
(
VistaConnectionIP
*
pConn
)
{
m_pConnection
=
pConn
;
}
void
CITANetAudioMessage
::
WriteMessage
()
{
VistaType
::
byte
*
pBuffer
=
(
VistaType
::
byte
*
)
m_oOutgoing
.
GetBuffer
();
VistaType
::
sint32
iSwapDummy
;
// rewrite size dummy
iSwapDummy
=
m_oOutgoing
.
GetBufferSize
()
-
sizeof
(
VistaType
::
sint32
);
if
(
m_oOutgoing
.
GetByteorderSwapFlag
()
)
VistaSerializingToolset
::
Swap4
(
&
iSwapDummy
);
memcpy
(
pBuffer
,
&
iSwapDummy
,
sizeof
(
VistaType
::
sint32
)
);
pBuffer
+=
sizeof
(
VistaType
::
sint32
);
// rewrite type dummy
iSwapDummy
=
m_nMessageType
;
if
(
m_oOutgoing
.
GetByteorderSwapFlag
()
)
VistaSerializingToolset
::
Swap4
(
&
iSwapDummy
);
memcpy
(
pBuffer
,
&
iSwapDummy
,
sizeof
(
VistaType
::
sint32
)
);
pBuffer
+=
sizeof
(
VistaType
::
sint32
);
// rewrite messageid dummy
iSwapDummy
=
m_nMessageId
;
if
(
m_oOutgoing
.
GetByteorderSwapFlag
()
)
VistaSerializingToolset
::
Swap4
(
&
iSwapDummy
);
memcpy
(
pBuffer
,
&
iSwapDummy
,
sizeof
(
VistaType
::
sint32
)
);
try
{
int
iRawBufferSize
=
m_oOutgoing
.
GetBufferSize
();
int
nRet
=
m_pConnection
->
WriteRawBuffer
(
m_oOutgoing
.
GetBuffer
(),
iRawBufferSize
);
m_pConnection
->
WaitForSendFinish
();
if
(
nRet
!=
m_oOutgoing
.
GetBufferSize
()
)
ITA_EXCEPT1
(
NETWORK_ERROR
,
"Could not write the expected number of bytes"
);
}
catch
(
VistaExceptionBase
&
ex
)
{
ITA_EXCEPT1
(
NETWORK_ERROR
,
ex
.
GetExceptionText
()
);
}
}
void
CITANetAudioMessage
::
ReadMessage
()
{
try
{
VistaType
::
sint32
nMessageSize
;
int
nReturn
=
m_pConnection
->
ReadInt32
(
nMessageSize
);
// we need at least the two protocol ints
assert
(
nMessageSize
>=
3
*
sizeof
(
VistaType
::
sint32
)
);
if
(
nMessageSize
>
(
int
)
m_vecIncomingBuffer
.
size
()
)
m_vecIncomingBuffer
.
resize
(
nMessageSize
);
nReturn
=
m_pConnection
->
ReadRawBuffer
(
&
m_vecIncomingBuffer
[
0
],
nMessageSize
);
if
(
nReturn
!=
nMessageSize
)
ITA_EXCEPT1
(
NETWORK_ERROR
,
"Protokoll error, Received less bytes than expected"
);
m_oIncoming
.
SetBuffer
(
&
m_vecIncomingBuffer
[
0
],
nReturn
);
// DEBUG: std::cout << "Remainign Size after Mesage Read: " << m_pConnection->PendingDataSize() << std::endl;
}
catch
(
VistaExceptionBase
&
ex
)
{
ITA_EXCEPT1
(
UNKNOWN
,
ex
.
GetExceptionText
()
);
}
catch
(
ITAException
&
ex
)
{
ex
;
}
m_nMessageType
=
ReadInt
();
m_nMessageId
=
ReadInt
();
}
void
CITANetAudioMessage
::
WriteAnswer
()
{
VistaType
::
byte
*
pBuffer
=
(
VistaType
::
byte
*
)
m_oOutgoing
.
GetBuffer
();
VistaType
::
sint32
iSwapDummy
;
// rewrite size dummy
iSwapDummy
=
m_oOutgoing
.
GetBufferSize
()
-
sizeof
(
VistaType
::
sint32
);
if
(
m_oOutgoing
.
GetByteorderSwapFlag
()
)
VistaSerializingToolset
::
Swap4
(
&
iSwapDummy
);
memcpy
(
pBuffer
,
&
iSwapDummy
,
sizeof
(
VistaType
::
sint32
)
);
pBuffer
+=
sizeof
(
VistaType
::
sint32
);
// rewrite type dummy
iSwapDummy
=
m_nAnswerType
;
if
(
m_oOutgoing
.
GetByteorderSwapFlag
()
)
VistaSerializingToolset
::
Swap4
(
&
iSwapDummy
);
memcpy
(
pBuffer
,
&
iSwapDummy
,
sizeof
(
VistaType
::
sint32
)
);
pBuffer
+=
sizeof
(
VistaType
::
sint32
);
// rewrite message dummy
iSwapDummy
=
m_nMessageId
;
if
(
m_oOutgoing
.
GetByteorderSwapFlag
()
)
VistaSerializingToolset
::
Swap4
(
&
iSwapDummy
);
memcpy
(
pBuffer
,
&
iSwapDummy
,
sizeof
(
VistaType
::
sint32
)
);
try
{
int
nRet
=
m_pConnection
->
WriteRawBuffer
(
m_oOutgoing
.
GetBuffer
(),
m_oOutgoing
.
GetBufferSize
()
);
m_pConnection
->
WaitForSendFinish
();
if
(
nRet
!=
m_oOutgoing
.
GetBufferSize
()
)
ITA_EXCEPT1
(
UNKNOWN
,
"Could not write the expected number of bytes"
);
}
catch
(
VistaExceptionBase
&
ex
)
{
ITA_EXCEPT1
(
UNKNOWN
,
ex
.
GetExceptionText
()
);
}
}
void
CITANetAudioMessage
::
ReadAnswer
()
{
try
{
VistaType
::
sint32
nMessageSize
;
int
nReturn
;
try
{
nReturn
=
m_pConnection
->
ReadInt32
(
nMessageSize
);
}
catch
(
...
)
{
nReturn
=
-
1
;
// Network connection error
}
if
(
nReturn
!=
sizeof
(
VistaType
::
sint32
)
)
{
ITA_EXCEPT1
(
UNKNOWN
,
"Protokoll error, Received less bytes than expected"
);
}
// we need at least the two protocol types
assert
(
nMessageSize
>=
2
*
sizeof
(
VistaType
::
sint32
)
);
if
(
nMessageSize
>
(
int
)
m_vecIncomingBuffer
.
size
()
)
m_vecIncomingBuffer
.
resize
(
nMessageSize
);
// jst: hier nicht while( nReturn < nMessageSize) ReadRawBuffer??
nReturn
=
m_pConnection
->
ReadRawBuffer
(
&
m_vecIncomingBuffer
[
0
],
nMessageSize
);
if
(
nReturn
!=
nMessageSize
)
ITA_EXCEPT1
(
UNKNOWN
,
"Protokoll error, Received less bytes than expected"
);
m_oIncoming
.
SetBuffer
(
&
m_vecIncomingBuffer
[
0
],
nReturn
);
}
catch
(
VistaExceptionBase
&
ex
)
{
// Probable connection loss
return
;
ITA_EXCEPT1
(
UNKNOWN
,
ex
.
GetExceptionText
()
);
}
catch
(
ITAException
&
ex
)
{
std
::
string
sErrorText
=
ex
.
ToString
();
}
try
{
m_nAnswerType
=
ReadInt
();
// TODO: assert weg, dafr Kontrolle falls Server crasht<
int
nMessageID
=
ReadInt
();
assert
(
nMessageID
==
m_nMessageId
);
m_nMessageId
=
nMessageID
;
}
catch
(
ITAException
&
ex
)
{
std
::
cerr
<<
"ITANetAudioMessage: Protocol error: "
<<
ex
<<
std
::
endl
;
}
}
int
CITANetAudioMessage
::
GetMessageType
()
const
{
return
m_nMessageType
;
}
void
CITANetAudioMessage
::
SetMessageType
(
int
nType
)
{
assert
(
m_nMessageType
==
CITANetAudioProtocol
::
NP_INVALID
);
// should only be set once
m_nMessageType
=
nType
;
}
void
CITANetAudioMessage
::
SetAnswerType
(
int
nType
)
{
assert
(
m_nAnswerType
==
CITANetAudioProtocol
::
NP_INVALID
);
// should only be set once
m_nAnswerType
=
nType
;
}
int
CITANetAudioMessage
::
GetAnswerType
()
const
{
return
m_nAnswerType
;
}
int
CITANetAudioMessage
::
GetIncomingMessageSize
()
const
{
return
m_oIncoming
.
GetTailSize
();
}
int
CITANetAudioMessage
::
GetOutgoingMessageSize
()
const
{
return
m_oOutgoing
.
GetBufferSize
();
}
bool
CITANetAudioMessage
::
GetOutgoingMessageHasData
()
const
{
return
(
m_oOutgoing
.
GetBufferSize
()
>
4
*
sizeof
(
VistaType
::
sint32
)
);
}
void
CITANetAudioMessage
::
WriteString
(
const
std
::
string
&
sValue
)
{
m_oOutgoing
.
WriteInt32
(
(
VistaType
::
sint32
)
sValue
.
size
()
);
if
(
!
sValue
.
empty
()
)
m_oOutgoing
.
WriteString
(
sValue
);
}
void
CITANetAudioMessage
::
WriteInt
(
const
int
iValue
)
{
m_oOutgoing
.
WriteInt32
(
(
VistaType
::
sint32
)
iValue
);
}
void
CITANetAudioMessage
::
WriteBool
(
const
bool
bValue
)
{
m_oOutgoing
.
WriteBool
(
bValue
);
}
void
CITANetAudioMessage
::
WriteFloat
(
const
float
fValue
)
{
m_oOutgoing
.
WriteFloat32
(
fValue
);
}
void
CITANetAudioMessage
::
WriteDouble
(
const
double
dValue
)
{
m_oOutgoing
.
WriteFloat64
(
dValue
);
}
std
::
string
CITANetAudioMessage
::
ReadString
()
{
VistaType
::
sint32
nSize
;
int
nReturn
=
m_oIncoming
.
ReadInt32
(
nSize
);
assert
(
nReturn
==
sizeof
(
VistaType
::
sint32
)
);
// Empty string?
if
(
nSize
==
0
)
return
""
;
std
::
string
sValue
;
nReturn
=
m_oIncoming
.
ReadString
(
sValue
,
nSize
);
assert
(
nReturn
==
nSize
);
return
sValue
;
}
int
CITANetAudioMessage
::
ReadInt
()
{
VistaType
::
sint32
nValue
;
int
nReturn
=
m_oIncoming
.
ReadInt32
(
nValue
);
if
(
nReturn
==
-
1
)
ITA_EXCEPT1
(
UNKNOWN
,
"Could not read integer value from incoming message"
);
assert
(
nReturn
==
sizeof
(
VistaType
::
sint32
)
);
return
nValue
;
}
bool
CITANetAudioMessage
::
ReadBool
()
{
bool
bValue
;
int
nReturn
=
m_oIncoming
.
ReadBool
(
bValue
);
assert
(
nReturn
==
sizeof
(
bool
)
);
return
bValue
;
}
float
CITANetAudioMessage
::
ReadFloat
()
{
float
fValue
;
int
nReturn
=
m_oIncoming
.
ReadFloat32
(
fValue
);
assert
(
nReturn
==
sizeof
(
float
)
);
return
fValue
;
}
double
CITANetAudioMessage
::
ReadDouble
()
{
double
dValue
;
int
nReturn
=
m_oIncoming
.
ReadFloat64
(
dValue
);
assert
(
nReturn
==
sizeof
(
double
)
);
return
dValue
;
}
void
CITANetAudioMessage
::
WriteException
(
const
ITAException
&
oException
)
{
WriteInt
(
oException
.
iErrorCode
);
WriteString
(
oException
.
sModule
);
WriteString
(
oException
.
sReason
);
}
ITAException
CITANetAudioMessage
::
ReadException
()
{
int
iErrorCode
=
ReadInt
();
std
::
string
sModule
=
ReadString
();
std
::
string
sReason
=
ReadString
();
return
ITAException
(
iErrorCode
,
sModule
,
sReason
);
}
VistaConnectionIP
*
CITANetAudioMessage
::
GetConnection
()
const
{
return
m_pConnection
;
}
void
CITANetAudioMessage
::
ClearConnection
()
{
m_pConnection
=
NULL
;
}
void
CITANetAudioMessage
::
WriteIntVector
(
const
std
::
vector
<
int
>
viData
)
{
int
iSize
=
(
int
)
viData
.
size
();
WriteInt
(
iSize
);
for
(
int
i
=
0
;
i
<
iSize
;
i
++
)
WriteInt
(
viData
[
i
]
);
}
std
::
vector
<
int
>
CITANetAudioMessage
::
ReadIntVector
()
{
std
::
vector
<
int
>
viData
;
int
iSize
=
ReadInt
();
for
(
int
i
=
0
;
i
<
iSize
;
i
++
)
viData
.
push_back
(
ReadInt
()
);
return
viData
;
}
CITANetAudioProtocol
::
StreamingParameters
CITANetAudioMessage
::
ReadStreamingParameters
()
{
CITANetAudioProtocol
::
StreamingParameters
oParams
;
oParams
.
iChannels
=
ReadInt
();
oParams
.
dSampleRate
=
ReadDouble
();
oParams
.
iBlockSize
=
ReadInt
();
return
oParams
;
}
void
CITANetAudioMessage
::
WriteStreamingParameters
(
const
CITANetAudioProtocol
::
StreamingParameters
&
oParams
)
{
WriteInt
(
oParams
.
iChannels
);
WriteDouble
(
oParams
.
dSampleRate
);
WriteInt
(
oParams
.
iBlockSize
);
}
#include <ITANetAudioMessage.h>
#include <ITAStringUtils.h>
#include <VistaInterProcComm/Connections/VistaConnectionIP.h>
#include <VistaBase/VistaExceptionBase.h>
#include <cassert>
static
int
S_nMessageIds
=
0
;
CITANetAudioMessage
::
CITANetAudioMessage
(
VistaSerializingToolset
::
ByteOrderSwapBehavior
bSwapBuffers
)
:
m_vecIncomingBuffer
(
2048
)
,
m_oOutgoing
(
2048
)
,
m_pConnection
(
NULL
)
{
m_oOutgoing
.
SetByteorderSwapFlag
(
bSwapBuffers
);
m_oIncoming
.
SetByteorderSwapFlag
(
bSwapBuffers
);
ResetMessage
();
}
void
CITANetAudioMessage
::
ResetMessage
()
{
if
(
m_oIncoming
.
GetTailSize
()
>
0
)
{
std
::
cerr
<<
"CITANetAudioMessage::ResetMessage() called before message was fully processed!"
<<
std
::
endl
;
}
// wait till sending is complete -> this prevents us
// from deleting the buffer while it is still being read
// by the connection
if
(
m_pConnection
)
m_pConnection
->
WaitForSendFinish
();
m_nMessageId
=
S_nMessageIds
++
;
m_oOutgoing
.
ClearBuffer
();
m_oOutgoing
.
WriteInt32
(
0
);
// size dummy
m_oOutgoing
.
WriteInt32
(
0
);
// type dummy
m_oOutgoing
.
WriteInt32
(
0
);
// ID
m_oIncoming
.
SetBuffer
(
NULL
,
0
);
m_nMessageType
=
CITANetAudioProtocol
::
NP_INVALID
;
m_nAnswerType
=
CITANetAudioProtocol
::
NP_INVALID
;
m_pConnection
=
NULL
;
}
void
CITANetAudioMessage
::
SetConnection
(
VistaConnectionIP
*
pConn
)
{
m_pConnection
=
pConn
;
}
void
CITANetAudioMessage
::
WriteMessage
()
{
VistaType
::
byte
*
pBuffer
=
(
VistaType
::
byte
*
)
m_oOutgoing
.
GetBuffer
();
VistaType
::
sint32
iSwapDummy
;
// rewrite size dummy
iSwapDummy
=
m_oOutgoing
.
GetBufferSize
()
-
sizeof
(
VistaType
::
sint32
);
if
(
m_oOutgoing
.
GetByteorderSwapFlag
()
)
VistaSerializingToolset
::
Swap4
(
&
iSwapDummy
);
memcpy
(
pBuffer
,
&
iSwapDummy
,
sizeof
(
VistaType
::
sint32
)
);
pBuffer
+=
sizeof
(
VistaType
::
sint32
);
// rewrite type dummy
iSwapDummy
=
m_nMessageType
;
if
(
m_oOutgoing
.
GetByteorderSwapFlag
()
)
VistaSerializingToolset
::
Swap4
(
&
iSwapDummy
);
memcpy
(
pBuffer
,
&
iSwapDummy
,
sizeof
(
VistaType
::
sint32
)
);
pBuffer
+=
sizeof
(
VistaType
::
sint32
);
// rewrite messageid dummy
iSwapDummy
=
m_nMessageId
;
if
(
m_oOutgoing
.
GetByteorderSwapFlag
()
)
VistaSerializingToolset
::
Swap4
(
&
iSwapDummy
);
memcpy
(
pBuffer
,
&
iSwapDummy
,
sizeof
(
VistaType
::
sint32
)
);
try
{
int
iRawBufferSize
=
m_oOutgoing
.
GetBufferSize
();
int
nRet
=
m_pConnection
->
WriteRawBuffer
(
m_oOutgoing
.
GetBuffer
(),
iRawBufferSize
);
m_pConnection
->
WaitForSendFinish
();
if
(
nRet
!=
m_oOutgoing
.
GetBufferSize
()
)
ITA_EXCEPT1
(
NETWORK_ERROR
,
"Could not write the expected number of bytes"
);
}
catch
(
VistaExceptionBase
&
ex
)
{
ITA_EXCEPT1
(
NETWORK_ERROR
,
ex
.
GetExceptionText
()
);
}
}
void
CITANetAudioMessage
::
ReadMessage
()
{
try
{
VistaType
::
sint32
nMessageSize
;
int
nReturn
=
m_pConnection
->
ReadInt32
(
nMessageSize
);
// we need at least the two protocol ints
assert
(
nMessageSize
>=
2
*
sizeof
(
VistaType
::
sint32
)
);
if
(
nMessageSize
>
(
int
)
m_vecIncomingBuffer
.
size
()
)
m_vecIncomingBuffer
.
resize
(
nMessageSize
);
nReturn
=
m_pConnection
->
ReadRawBuffer
(
&
m_vecIncomingBuffer
[
0
],
nMessageSize
);
if
(
nReturn
!=
nMessageSize
)
ITA_EXCEPT1
(
NETWORK_ERROR
,
"Protokoll error, Received less bytes than expected"
);
m_oIncoming
.
SetBuffer
(
&
m_vecIncomingBuffer
[
0
],
nReturn
);
// DEBUG: std::cout << "Remainign Size after Mesage Read: " << m_pConnection->PendingDataSize() << std::endl;
}
catch
(
VistaExceptionBase
&
ex
)
{
ITA_EXCEPT1
(
UNKNOWN
,
ex
.
GetExceptionText
()
);
}
catch
(
ITAException
&
ex
)
{
ex
;
}
m_nMessageType
=
ReadInt
();
m_nMessageId
=
ReadInt
();
}
void
CITANetAudioMessage
::
WriteAnswer
()
{
VistaType
::
byte
*
pBuffer
=
(
VistaType
::
byte
*
)
m_oOutgoing
.
GetBuffer
();
VistaType
::
sint32
iSwapDummy
;
// rewrite size dummy
iSwapDummy
=
m_oOutgoing
.
GetBufferSize
()
-
sizeof
(
VistaType
::
sint32
);
if
(
m_oOutgoing
.
GetByteorderSwapFlag
()
)
VistaSerializingToolset
::
Swap4
(
&
iSwapDummy
);
memcpy
(
pBuffer
,
&
iSwapDummy
,
sizeof
(
VistaType
::
sint32
)
);
pBuffer
+=
sizeof
(
VistaType
::
sint32
);
// rewrite type dummy
iSwapDummy
=
m_nAnswerType
;
if
(
m_oOutgoing
.
GetByteorderSwapFlag
()
)
VistaSerializingToolset
::
Swap4
(
&
iSwapDummy
);
memcpy
(
pBuffer
,
&
iSwapDummy
,
sizeof
(
VistaType
::
sint32
)
);
pBuffer
+=
sizeof
(
VistaType
::
sint32
);
// rewrite message dummy
iSwapDummy
=
m_nMessageId
;
if
(
m_oOutgoing
.
GetByteorderSwapFlag
()
)
VistaSerializingToolset
::
Swap4
(
&
iSwapDummy
);
memcpy
(
pBuffer
,
&
iSwapDummy
,
sizeof
(
VistaType
::
sint32
)
);
try
{
int
nRet
=
m_pConnection
->
WriteRawBuffer
(
m_oOutgoing
.
GetBuffer
(),
m_oOutgoing
.
GetBufferSize
()
);
m_pConnection
->
WaitForSendFinish
();
if
(
nRet
!=
m_oOutgoing
.
GetBufferSize
()
)
ITA_EXCEPT1
(
UNKNOWN
,
"Could not write the expected number of bytes"
);
}
catch
(
VistaExceptionBase
&
ex
)
{
ITA_EXCEPT1
(
UNKNOWN
,
ex
.
GetExceptionText
()
);
}
}
void
CITANetAudioMessage
::
ReadAnswer
()
{
try
{
VistaType
::
sint32
nMessageSize
;
int
nReturn
;
try
{
nReturn
=
m_pConnection
->
ReadInt32
(
nMessageSize
);
}
catch
(
...
)
{
nReturn
=
-
1
;
// Network connection error
}
if
(
nReturn
!=
sizeof
(
VistaType
::
sint32
)
)
{
ITA_EXCEPT1
(
UNKNOWN
,
"Protokoll error, Received less bytes than expected"
);
}
// we need at least the two protocol types
assert
(
nMessageSize
>=
2
*
sizeof
(
VistaType
::
sint32
)
);
if
(
nMessageSize
>
(
int
)
m_vecIncomingBuffer
.
size
()
)
m_vecIncomingBuffer
.
resize
(
nMessageSize
);
// jst: hier nicht while( nReturn < nMessageSize) ReadRawBuffer??
nReturn
=
m_pConnection
->
ReadRawBuffer
(
&
m_vecIncomingBuffer
[
0
],
nMessageSize
);
if
(
nReturn
!=
nMessageSize
)
ITA_EXCEPT1
(
UNKNOWN
,
"Protokoll error, Received less bytes than expected"
);
m_oIncoming
.
SetBuffer
(
&
m_vecIncomingBuffer
[
0
],
nReturn
);
}
catch
(
VistaExceptionBase
&
ex
)
{
// Probable connection loss
return
;