Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
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
savoirfairelinux
jami-daemon
Commits
9c966b2b
Commit
9c966b2b
authored
Nov 9, 2020
by
Sébastien Blin
Browse files
Options
Downloads
Patches
Plain Diff
stream: remove unused method as we use setOnRecv
Change-Id: I9f7e256911ef9c59947f605fadc6fb08aec5d5d0
parent
d92eb322
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/data_transfer.cpp
+0
-36
0 additions, 36 deletions
src/data_transfer.cpp
src/ftp_server.cpp
+3
-32
3 additions, 32 deletions
src/ftp_server.cpp
src/ftp_server.h
+0
-1
0 additions, 1 deletion
src/ftp_server.h
src/peer_connection.h
+0
-5
0 additions, 5 deletions
src/peer_connection.h
with
3 additions
and
74 deletions
src/data_transfer.cpp
+
0
−
36
View file @
9c966b2b
...
@@ -280,7 +280,6 @@ public:
...
@@ -280,7 +280,6 @@ public:
void
close
()
noexcept
override
;
void
close
()
noexcept
override
;
void
closeAndEmit
(
DRing
::
DataTransferEventCode
code
)
const
noexcept
;
void
closeAndEmit
(
DRing
::
DataTransferEventCode
code
)
const
noexcept
;
bool
read
(
std
::
vector
<
uint8_t
>&
)
const
override
;
bool
write
(
std
::
string_view
)
override
;
bool
write
(
std
::
string_view
)
override
;
void
emit
(
DRing
::
DataTransferEventCode
code
)
const
override
;
void
emit
(
DRing
::
DataTransferEventCode
code
)
const
override
;
const
std
::
string
&
peer
()
{
return
peerUri_
;
}
const
std
::
string
&
peer
()
{
return
peerUri_
;
}
...
@@ -404,41 +403,6 @@ SubOutgoingFileTransfer::closeAndEmit(DRing::DataTransferEventCode code) const n
...
@@ -404,41 +403,6 @@ SubOutgoingFileTransfer::closeAndEmit(DRing::DataTransferEventCode code) const n
emit
(
code
);
emit
(
code
);
}
}
bool
SubOutgoingFileTransfer
::
read
(
std
::
vector
<
uint8_t
>&
buf
)
const
{
// Need to send headers?
if
(
!
headerSent_
)
{
sendHeader
(
buf
);
return
true
;
}
// Wait for peer ready reply?
if
(
!
peerReady_
)
{
buf
.
resize
(
0
);
return
true
;
}
// Sending file data...
input_
.
read
(
reinterpret_cast
<
char
*>
(
&
buf
[
0
]),
buf
.
size
());
buf
.
resize
(
input_
.
gcount
());
if
(
buf
.
size
())
{
std
::
lock_guard
<
std
::
mutex
>
lk
{
infoMutex_
};
info_
.
bytesProgress
+=
buf
.
size
();
metaInfo_
->
updateInfo
(
info_
);
return
true
;
}
// File end reached?
if
(
input_
.
eof
())
{
JAMI_DBG
()
<<
"FTP#"
<<
getId
()
<<
": sent "
<<
info_
.
bytesProgress
<<
" bytes"
;
emit
(
DRing
::
DataTransferEventCode
::
finished
);
return
false
;
}
throw
std
::
runtime_error
(
"FileTransfer IO read failed"
);
// TODO: better exception?
}
bool
bool
SubOutgoingFileTransfer
::
write
(
std
::
string_view
buffer
)
SubOutgoingFileTransfer
::
write
(
std
::
string_view
buffer
)
{
{
...
...
This diff is collapsed.
Click to expand it.
src/ftp_server.cpp
+
3
−
32
View file @
9c966b2b
...
@@ -135,36 +135,6 @@ FtpServer::closeCurrentFile()
...
@@ -135,36 +135,6 @@ FtpServer::closeCurrentFile()
}
}
}
}
bool
FtpServer
::
read
(
std
::
vector
<
uint8_t
>&
buffer
)
const
{
if
(
!
out_
.
stream
)
{
if
(
closed_
.
exchange
(
false
))
{
if
(
rx_
<
fileSize_
)
{
buffer
.
resize
(
4
);
buffer
[
0
]
=
'N'
;
buffer
[
1
]
=
'G'
;
buffer
[
2
]
=
'O'
;
buffer
[
3
]
=
'\n'
;
JAMI_DBG
()
<<
"[FTP] sending NGO (cancel) order"
;
return
true
;
}
}
buffer
.
resize
(
0
);
}
else
if
(
go_
)
{
go_
=
false
;
buffer
.
resize
(
3
);
buffer
[
0
]
=
'G'
;
buffer
[
1
]
=
'O'
;
buffer
[
2
]
=
'\n'
;
JAMI_DBG
()
<<
"[FTP] sending GO order"
;
}
else
{
// Nothing to send. Avoid to have an useless buffer filled with 0.
buffer
.
resize
(
0
);
}
return
true
;
}
bool
bool
FtpServer
::
write
(
std
::
string_view
buffer
)
FtpServer
::
write
(
std
::
string_view
buffer
)
{
{
...
@@ -191,7 +161,8 @@ FtpServer::write(std::string_view buffer)
...
@@ -191,7 +161,8 @@ FtpServer::write(std::string_view buffer)
closeCurrentFile
();
closeCurrentFile
();
// data may remains into the buffer: copy into the header stream for next header parsing
// data may remains into the buffer: copy into the header stream for next header parsing
if
(
read_size
<
buffer
.
size
())
if
(
read_size
<
buffer
.
size
())
headerStream_
.
write
((
const
char
*
)(
buffer
.
data
()
+
read_size
),
buffer
.
size
()
-
read_size
);
headerStream_
.
write
((
const
char
*
)
(
buffer
.
data
()
+
read_size
),
buffer
.
size
()
-
read_size
);
state_
=
FtpState
::
PARSE_HEADERS
;
state_
=
FtpState
::
PARSE_HEADERS
;
}
}
}
break
;
}
break
;
...
...
This diff is collapsed.
Click to expand it.
src/ftp_server.h
+
0
−
1
View file @
9c966b2b
...
@@ -40,7 +40,6 @@ public:
...
@@ -40,7 +40,6 @@ public:
const
DRing
::
DataTransferId
&
outId
=
0
,
const
DRing
::
DataTransferId
&
outId
=
0
,
InternalCompletionCb
&&
cb
=
{});
InternalCompletionCb
&&
cb
=
{});
bool
read
(
std
::
vector
<
uint8_t
>&
buffer
)
const
override
;
bool
write
(
std
::
string_view
data
)
override
;
bool
write
(
std
::
string_view
data
)
override
;
DRing
::
DataTransferId
getId
()
const
override
;
DRing
::
DataTransferId
getId
()
const
override
;
void
close
()
noexcept
override
;
void
close
()
noexcept
override
;
...
...
This diff is collapsed.
Click to expand it.
src/peer_connection.h
+
0
−
5
View file @
9c966b2b
...
@@ -63,11 +63,6 @@ public:
...
@@ -63,11 +63,6 @@ public:
virtual
~
Stream
()
{
close
();
}
virtual
~
Stream
()
{
close
();
}
virtual
void
close
()
noexcept
{}
virtual
void
close
()
noexcept
{}
virtual
DRing
::
DataTransferId
getId
()
const
=
0
;
virtual
DRing
::
DataTransferId
getId
()
const
=
0
;
virtual
bool
read
(
std
::
vector
<
uint8_t
>&
buffer
)
const
{
(
void
)
buffer
;
return
false
;
}
virtual
bool
write
(
std
::
string_view
)
{
return
false
;
};
virtual
bool
write
(
std
::
string_view
)
{
return
false
;
};
virtual
void
setOnRecv
(
std
::
function
<
void
(
std
::
string_view
)
>&&
)
virtual
void
setOnRecv
(
std
::
function
<
void
(
std
::
string_view
)
>&&
)
{
{
...
...
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
sign in
to comment