Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
opendht
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Model registry
Analyze
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
opendht
Commits
70c92d6c
Commit
70c92d6c
authored
5 years ago
by
Seva
Committed by
Adrien Béraud
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
http: replace service by url
parent
fd7f6445
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/opendht/http.h
+3
-4
3 additions, 4 deletions
include/opendht/http.h
src/dht_proxy_server.cpp
+2
-2
2 additions, 2 deletions
src/dht_proxy_server.cpp
src/http.cpp
+9
-15
9 additions, 15 deletions
src/http.cpp
with
14 additions
and
21 deletions
include/opendht/http.h
+
3
−
4
View file @
70c92d6c
...
...
@@ -142,7 +142,7 @@ public:
Resolver
(
asio
::
io_context
&
ctx
,
const
std
::
string
&
url
,
std
::
shared_ptr
<
dht
::
Logger
>
logger
=
{});
Resolver
(
asio
::
io_context
&
ctx
,
const
std
::
string
&
host
,
const
std
::
string
&
service
=
"80"
,
std
::
shared_ptr
<
dht
::
Logger
>
logger
=
{});
const
bool
ssl
=
false
,
std
::
shared_ptr
<
dht
::
Logger
>
logger
=
{});
// use already resolved endpoints with classes using this resolver
Resolver
(
asio
::
io_context
&
ctx
,
std
::
vector
<
asio
::
ip
::
tcp
::
endpoint
>
endpoints
,
...
...
@@ -160,11 +160,10 @@ private:
std
::
mutex
mutex_
;
Url
url_
;
asio
::
error_code
ec_
;
std
::
string
service_
;
asio
::
ip
::
tcp
::
resolver
resolver_
;
std
::
vector
<
asio
::
ip
::
tcp
::
endpoint
>
endpoints_
;
Url
url_
;
bool
completed_
{
false
};
std
::
queue
<
ResolverCb
>
cbs_
;
...
...
@@ -196,7 +195,7 @@ public:
// resolves implicitly
Request
(
asio
::
io_context
&
ctx
,
const
std
::
string
&
url
,
std
::
shared_ptr
<
dht
::
Logger
>
logger
=
{});
Request
(
asio
::
io_context
&
ctx
,
const
std
::
string
&
host
,
const
std
::
string
&
service
=
"80"
,
std
::
shared_ptr
<
dht
::
Logger
>
logger
=
{});
const
bool
ssl
=
false
,
std
::
shared_ptr
<
dht
::
Logger
>
logger
=
{});
// user defined resolver
Request
(
asio
::
io_context
&
ctx
,
std
::
shared_ptr
<
Resolver
>
resolver
,
std
::
shared_ptr
<
dht
::
Logger
>
logger
=
{});
...
...
This diff is collapsed.
Click to expand it.
src/dht_proxy_server.cpp
+
2
−
2
View file @
70c92d6c
...
...
@@ -860,8 +860,8 @@ DhtProxyServer::sendPushNotification(const std::string& token, Json::Value&& jso
if
(
pushServer_
.
empty
())
return
;
auto
request
=
std
::
make_shared
<
http
::
Request
>
(
io_context
(),
pushHostPort_
.
first
,
pushHostPort_
.
second
,
logger_
);
auto
request
=
std
::
make_shared
<
http
::
Request
>
(
io_context
(),
pushHostPort_
.
first
,
pushHostPort_
.
second
,
httpsServer_
?
true
:
false
,
logger_
);
auto
reqid
=
request
->
id
();
try
{
request
->
set_target
(
"/api/push"
);
...
...
This diff is collapsed.
Click to expand it.
src/http.cpp
+
9
−
15
View file @
70c92d6c
...
...
@@ -306,26 +306,26 @@ Connection::timeout(const std::chrono::seconds timeout, HandlerCb cb)
// Resolver
Resolver
::
Resolver
(
asio
::
io_context
&
ctx
,
const
std
::
string
&
url
,
std
::
shared_ptr
<
dht
::
Logger
>
logger
)
:
resolver_
(
ctx
),
url_
(
url
),
logger_
(
logger
)
:
url_
(
url
),
resolver_
(
ctx
),
logger_
(
logger
)
{
service_
=
url_
.
service
;
resolve
(
url_
.
host
,
url_
.
service
);
}
Resolver
::
Resolver
(
asio
::
io_context
&
ctx
,
const
std
::
string
&
host
,
const
std
::
string
&
service
,
std
::
shared_ptr
<
dht
::
Logger
>
logger
)
const
bool
ssl
,
std
::
shared_ptr
<
dht
::
Logger
>
logger
)
:
resolver_
(
ctx
),
logger_
(
logger
)
{
service_
=
service
;
resolve
(
host
,
service
);
url_
.
host
=
host
;
url_
.
service
=
service
;
url_
.
protocol
=
(
ssl
?
"https"
:
"http"
);
resolve
(
url_
.
host
,
url_
.
service
);
}
Resolver
::
Resolver
(
asio
::
io_context
&
ctx
,
std
::
vector
<
asio
::
ip
::
tcp
::
endpoint
>
endpoints
,
const
bool
ssl
,
std
::
shared_ptr
<
dht
::
Logger
>
logger
)
:
resolver_
(
ctx
),
logger_
(
logger
)
{
if
(
ssl
)
url_
.
protocol
=
"https"
;
url_
.
protocol
=
(
ssl
?
"https"
:
"http"
);
endpoints_
=
std
::
move
(
endpoints
);
completed_
=
true
;
}
...
...
@@ -351,12 +351,6 @@ Resolver::get_url() const
return
url_
;
}
std
::
string
Resolver
::
get_service
()
const
{
return
service_
;
}
void
Resolver
::
add_callback
(
ResolverCb
cb
)
{
...
...
@@ -420,11 +414,11 @@ Request::Request(asio::io_context& ctx, const std::string& url, std::shared_ptr<
}
Request
::
Request
(
asio
::
io_context
&
ctx
,
const
std
::
string
&
host
,
const
std
::
string
&
service
,
std
::
shared_ptr
<
dht
::
Logger
>
logger
)
const
bool
ssl
,
std
::
shared_ptr
<
dht
::
Logger
>
logger
)
:
id_
(
Request
::
ids_
++
),
ctx_
(
ctx
),
logger_
(
logger
)
{
cbs_
=
std
::
make_unique
<
Callbacks
>
();
resolver_
=
std
::
make_shared
<
Resolver
>
(
ctx
,
host
,
service
,
logger_
);
resolver_
=
std
::
make_shared
<
Resolver
>
(
ctx
,
host
,
service
,
ssl
,
logger_
);
set_target
(
resolver_
->
get_url
().
target
);
}
...
...
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