Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
actor-incubator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
actor-incubator
Commits
99ef2a98
Commit
99ef2a98
authored
Aug 25, 2019
by
Joseph Noir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix formatting
parent
d17f4394
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
11 deletions
+9
-11
libcaf_net/caf/net/tcp_stream_socket.hpp
libcaf_net/caf/net/tcp_stream_socket.hpp
+2
-4
libcaf_net/src/ip.cpp
libcaf_net/src/ip.cpp
+6
-6
libcaf_net/test/doorman.cpp
libcaf_net/test/doorman.cpp
+1
-1
No files found.
libcaf_net/caf/net/tcp_stream_socket.hpp
View file @
99ef2a98
...
...
@@ -54,16 +54,14 @@ struct tcp_stream_socket : abstract_socket<tcp_stream_socket> {
/// @preferred Preferred IP version.
/// @returns The connected socket or an error.
/// @relates stream_socket
expected
<
stream_socket
>
make_connected_socket
(
ip_address
host
,
uint16_t
port
);
expected
<
stream_socket
>
make_connected_socket
(
ip_address
host
,
uint16_t
port
);
/// Create a `stream_socket` connected to `auth`.
/// @param authority The remote host to connecto to.
/// @preferred Preferred IP version.
/// @returns The connected socket or an error.
/// @relates stream_socket
expected
<
stream_socket
>
make_connected_socket
(
const
uri
::
authority_type
&
auth
);
expected
<
stream_socket
>
make_connected_socket
(
const
uri
::
authority_type
&
auth
);
}
// namespace net
}
// namespace caf
libcaf_net/src/ip.cpp
View file @
99ef2a98
...
...
@@ -46,12 +46,12 @@
#include "caf/string_view.hpp"
#ifndef HOST_NAME_MAX
#define HOST_NAME_MAX 255
#
define HOST_NAME_MAX 255
#endif
using
std
::
pair
;
using
std
::
string
;
using
std
::
vector
;
using
std
::
pair
;
namespace
caf
{
namespace
net
{
...
...
@@ -128,10 +128,10 @@ std::vector<ip_address> resolve(const std::string& host) {
}
}
// TODO: Should we just prefer ipv6 or use a config option?
//std::stable_sort(std::begin(results), std::end(results),
// [](const ip_address& lhs, const ip_address& rhs) {
// return !lhs.embeds_v4() && rhs.embeds_v4();
// });
//
std::stable_sort(std::begin(results), std::end(results),
//
[](const ip_address& lhs, const ip_address& rhs) {
//
return !lhs.embeds_v4() && rhs.embeds_v4();
//
});
return
results
;
}
...
...
libcaf_net/test/doorman.cpp
View file @
99ef2a98
...
...
@@ -21,11 +21,11 @@
#include "caf/policy/doorman.hpp"
#include "caf/net/endpoint_manager.hpp"
#include "caf/net/ip.hpp"
#include "caf/net/make_endpoint_manager.hpp"
#include "caf/net/multiplexer.hpp"
#include "caf/net/tcp_accept_socket.hpp"
#include "caf/uri.hpp"
#include "caf/net/ip.hpp"
#include "caf/test/dsl.hpp"
...
...
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