Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
data_exporter
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IA2
data_exporter
Commits
1f9c2e8a
Commit
1f9c2e8a
authored
11 years ago
by
Marco De Marco
Browse files
Options
Downloads
Patches
Plain Diff
File transfer minor fix
parent
523493c3
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/PlainSession.cpp
+3
-3
3 additions, 3 deletions
src/PlainSession.cpp
src/ProtocolManager.cpp
+6
-0
6 additions, 0 deletions
src/ProtocolManager.cpp
src/SSLSession.cpp
+3
-3
3 additions, 3 deletions
src/SSLSession.cpp
src/Session.cpp
+3
-3
3 additions, 3 deletions
src/Session.cpp
with
15 additions
and
9 deletions
src/PlainSession.cpp
+
3
−
3
View file @
1f9c2e8a
...
@@ -163,7 +163,7 @@ void PlainSession::startWriteResponse()
...
@@ -163,7 +163,7 @@ void PlainSession::startWriteResponse()
//==============================================================================
//==============================================================================
void
PlainSession
::
startWriteData
()
void
PlainSession
::
startWriteData
()
{
{
DEBUG_STREAM
<<
"PlainSession::startWriteData()"
<<
endl
;
//
DEBUG_STREAM << "PlainSession::startWriteData()" << endl;
try
try
{
{
...
@@ -173,7 +173,7 @@ void PlainSession::startWriteData()
...
@@ -173,7 +173,7 @@ void PlainSession::startWriteData()
{
{
int
leftToRead
=
m_inputStreamSize
-
m_inputStream
.
tellg
();
int
leftToRead
=
m_inputStreamSize
-
m_inputStream
.
tellg
();
DEBUG_STREAM
<<
"PlainSession::startWriteData() left to read "
<<
leftToRead
<<
endl
;
//
DEBUG_STREAM << "PlainSession::startWriteData() left to read " << leftToRead << endl;
int
bufferSize
=
0
;
int
bufferSize
=
0
;
...
@@ -182,7 +182,7 @@ void PlainSession::startWriteData()
...
@@ -182,7 +182,7 @@ void PlainSession::startWriteData()
else
else
bufferSize
=
BUFFER_SIZE
;
bufferSize
=
BUFFER_SIZE
;
DEBUG_STREAM
<<
"PlainSession::startWriteData() buffer size "
<<
bufferSize
<<
endl
;
//
DEBUG_STREAM << "PlainSession::startWriteData() buffer size " << bufferSize << endl;
std
::
vector
<
char
>
writeBuff
;
std
::
vector
<
char
>
writeBuff
;
writeBuff
.
resize
(
bufferSize
);
writeBuff
.
resize
(
bufferSize
);
...
...
This diff is collapsed.
Click to expand it.
src/ProtocolManager.cpp
+
6
−
0
View file @
1f9c2e8a
...
@@ -354,6 +354,12 @@ ResponseSP ProtocolManager::prepareKeepAlive(RequestSP request_sp)
...
@@ -354,6 +354,12 @@ ResponseSP ProtocolManager::prepareKeepAlive(RequestSP request_sp)
response_sp
->
set_type
(
Response
::
KEEPALIVE
);
response_sp
->
set_type
(
Response
::
KEEPALIVE
);
m_isTransferRequest
=
false
;
m_filePath
.
clear
();
m_fileSize
=
0
;
return
response_sp
;
return
response_sp
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/SSLSession.cpp
+
3
−
3
View file @
1f9c2e8a
...
@@ -198,7 +198,7 @@ void SSLSession::startWriteResponse()
...
@@ -198,7 +198,7 @@ void SSLSession::startWriteResponse()
//==============================================================================
//==============================================================================
void
SSLSession
::
startWriteData
()
void
SSLSession
::
startWriteData
()
{
{
DEBUG_STREAM
<<
"SSLSession::startWriteData()"
<<
endl
;
//
DEBUG_STREAM << "SSLSession::startWriteData()" << endl;
try
try
{
{
...
@@ -208,7 +208,7 @@ void SSLSession::startWriteData()
...
@@ -208,7 +208,7 @@ void SSLSession::startWriteData()
{
{
int
leftToRead
=
m_inputStreamSize
-
m_inputStream
.
tellg
();
int
leftToRead
=
m_inputStreamSize
-
m_inputStream
.
tellg
();
DEBUG_STREAM
<<
"SSLSession::startWriteData() left to read "
<<
leftToRead
<<
endl
;
//
DEBUG_STREAM << "SSLSession::startWriteData() left to read " << leftToRead << endl;
int
bufferSize
=
0
;
int
bufferSize
=
0
;
...
@@ -217,7 +217,7 @@ void SSLSession::startWriteData()
...
@@ -217,7 +217,7 @@ void SSLSession::startWriteData()
else
else
bufferSize
=
BUFFER_SIZE
;
bufferSize
=
BUFFER_SIZE
;
DEBUG_STREAM
<<
"SSLSession::startWriteData() buffer size "
<<
bufferSize
<<
endl
;
//
DEBUG_STREAM << "SSLSession::startWriteData() buffer size " << bufferSize << endl;
std
::
vector
<
char
>
writeBuff
;
std
::
vector
<
char
>
writeBuff
;
writeBuff
.
resize
(
bufferSize
);
writeBuff
.
resize
(
bufferSize
);
...
...
This diff is collapsed.
Click to expand it.
src/Session.cpp
+
3
−
3
View file @
1f9c2e8a
...
@@ -130,7 +130,7 @@ void Session::handleWriteResponse(const boost::system::error_code& errorCode)
...
@@ -130,7 +130,7 @@ void Session::handleWriteResponse(const boost::system::error_code& errorCode)
//==============================================================================
//==============================================================================
void
Session
::
handleWriteData
(
const
boost
::
system
::
error_code
&
errorCode
)
void
Session
::
handleWriteData
(
const
boost
::
system
::
error_code
&
errorCode
)
{
{
DEBUG_STREAM
<<
"Session::handleWriteData()"
<<
endl
;
//
DEBUG_STREAM << "Session::handleWriteData()" << endl;
if
(
!
errorCode
)
if
(
!
errorCode
)
{
{
...
@@ -138,12 +138,12 @@ void Session::handleWriteData(const boost::system::error_code& errorCode)
...
@@ -138,12 +138,12 @@ void Session::handleWriteData(const boost::system::error_code& errorCode)
}
}
else
if
(
errorCode
==
boost
::
asio
::
error
::
eof
)
else
if
(
errorCode
==
boost
::
asio
::
error
::
eof
)
{
{
DEBUG_STREAM
<<
"Session::handleWrite
Response
() end of file from "
DEBUG_STREAM
<<
"Session::handleWrite
Data
() end of file from "
<<
m_remoteEndpoint
<<
endl
;
<<
m_remoteEndpoint
<<
endl
;
}
}
else
else
{
{
ERROR_STREAM
<<
"Session::handleWrite
Response
() "
ERROR_STREAM
<<
"Session::handleWrite
Data
() "
<<
errorCode
.
message
()
<<
" from "
<<
m_remoteEndpoint
<<
endl
;
<<
errorCode
.
message
()
<<
" from "
<<
m_remoteEndpoint
<<
endl
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment