Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
dhtnet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
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
dhtnet
Commits
6b6a5d30
Commit
6b6a5d30
authored
Aug 15, 2023
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
cmake/tests: add DHTNET_TESTABLE
Change-Id: Id327a60cbd1afb57a35eedfcb73ff972acf6fb4b
parent
46d6286e
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+3
-0
3 additions, 0 deletions
CMakeLists.txt
include/multiplexed_socket.h
+2
-2
2 additions, 2 deletions
include/multiplexed_socket.h
src/multiplexed_socket.cpp
+2
-2
2 additions, 2 deletions
src/multiplexed_socket.cpp
with
7 additions
and
4 deletions
CMakeLists.txt
+
3
−
0
View file @
6b6a5d30
...
@@ -80,6 +80,9 @@ target_include_directories(dhtnet PUBLIC
...
@@ -80,6 +80,9 @@ target_include_directories(dhtnet PUBLIC
$<BUILD_INTERFACE:
${
CMAKE_CURRENT_SOURCE_DIR
}
/include>
$<BUILD_INTERFACE:
${
CMAKE_CURRENT_SOURCE_DIR
}
/include>
$<INSTALL_INTERFACE:include>
$<INSTALL_INTERFACE:include>
)
)
if
(
BUILD_TESTING
)
target_compile_definitions
(
dhtnet PUBLIC DHTNET_TESTABLE
)
endif
()
target_compile_definitions
(
dhtnet PUBLIC PJ_AUTOCONF=1
)
target_compile_definitions
(
dhtnet PUBLIC PJ_AUTOCONF=1
)
# set_target_properties(dhtnet PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/include/${dhtnet_HEADERS}")
# set_target_properties(dhtnet PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/include/${dhtnet_HEADERS}")
...
...
This diff is collapsed.
Click to expand it.
include/multiplexed_socket.h
+
2
−
2
View file @
6b6a5d30
...
@@ -162,7 +162,7 @@ public:
...
@@ -162,7 +162,7 @@ public:
void
eraseChannel
(
uint16_t
channel
);
void
eraseChannel
(
uint16_t
channel
);
#ifdef
LIBJAMI
_TESTABLE
#ifdef
DHTNET
_TESTABLE
/**
/**
* Check if we can send beacon on the socket
* Check if we can send beacon on the socket
*/
*/
...
@@ -341,7 +341,7 @@ public:
...
@@ -341,7 +341,7 @@ public:
*/
*/
std
::
shared_ptr
<
dht
::
crypto
::
Certificate
>
peerCertificate
()
const
;
std
::
shared_ptr
<
dht
::
crypto
::
Certificate
>
peerCertificate
()
const
;
#ifdef
LIBJAMI
_TESTABLE
#ifdef
DHTNET
_TESTABLE
std
::
shared_ptr
<
MultiplexedSocket
>
underlyingSocket
()
const
;
std
::
shared_ptr
<
MultiplexedSocket
>
underlyingSocket
()
const
;
#endif
#endif
...
...
This diff is collapsed.
Click to expand it.
src/multiplexed_socket.cpp
+
2
−
2
View file @
6b6a5d30
...
@@ -718,7 +718,7 @@ MultiplexedSocket::peerCertificate() const
...
@@ -718,7 +718,7 @@ MultiplexedSocket::peerCertificate() const
return
pimpl_
->
endpoint
->
peerCertificate
();
return
pimpl_
->
endpoint
->
peerCertificate
();
}
}
#ifdef
LIBJAMI
_TESTABLE
#ifdef
DHTNET
_TESTABLE
bool
bool
MultiplexedSocket
::
canSendBeacon
()
const
MultiplexedSocket
::
canSendBeacon
()
const
{
{
...
@@ -1038,7 +1038,7 @@ ChannelSocket::onRecv(std::vector<uint8_t>&& pkt)
...
@@ -1038,7 +1038,7 @@ ChannelSocket::onRecv(std::vector<uint8_t>&& pkt)
pimpl_
->
cv
.
notify_all
();
pimpl_
->
cv
.
notify_all
();
}
}
#ifdef
LIBJAMI
_TESTABLE
#ifdef
DHTNET
_TESTABLE
std
::
shared_ptr
<
MultiplexedSocket
>
std
::
shared_ptr
<
MultiplexedSocket
>
ChannelSocket
::
underlyingSocket
()
const
ChannelSocket
::
underlyingSocket
()
const
{
{
...
...
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