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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
dhtnet
Commits
872e82fb
Commit
872e82fb
authored
7 months ago
by
François-Simon Fauteux-Chapleau
Browse files
Options
Downloads
Patches
Plain Diff
upnp_context: handle failure to get available port
GitLab:
#42
Change-Id: I0d51ee475d98bb1cf1b2b92e4fb9642bcb3e51da
parent
9e064bf9
No related branches found
No related tags found
Loading
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/upnp/upnp_context.cpp
+9
-5
9 additions, 5 deletions
src/upnp/upnp_context.cpp
with
9 additions
and
5 deletions
src/upnp/upnp_context.cpp
+
9
−
5
View file @
872e82fb
...
...
@@ -483,7 +483,7 @@ UPnPContext::getAvailablePortNumber(PortType type)
}
// Very unlikely to get here.
if
(
logger_
)
logger_
->
error
(
"Could not find an available port after
%i
trials"
,
MAX_REQUEST_RETRIES
);
if
(
logger_
)
logger_
->
error
(
"Could not find an available port after
{}
trials"
,
MAX_REQUEST_RETRIES
);
return
0
;
}
...
...
@@ -530,6 +530,7 @@ UPnPContext::provisionNewMappings(PortType type, int portCount)
}
else
{
// Very unlikely to get here!
if
(
logger_
)
logger_
->
error
(
"Cannot provision port: no available port number"
);
return
;
}
}
}
...
...
@@ -1145,9 +1146,14 @@ UPnPContext::setIgdDiscoveryTimeout(std::chrono::milliseconds timeout)
Mapping
::
sharedPtr_t
UPnPContext
::
registerMapping
(
Mapping
&
map
)
{
Mapping
::
sharedPtr_t
mapPtr
;
if
(
map
.
getExternalPort
()
==
0
)
{
// JAMI_DBG("Port number not set. Will set a random port number");
auto
port
=
getAvailablePortNumber
(
map
.
getType
());
if
(
port
==
0
)
{
if
(
logger_
)
logger_
->
error
(
"Unable to register mapping: no available port number"
);
return
mapPtr
;
}
map
.
setExternalPort
(
port
);
map
.
setInternalPort
(
port
);
}
...
...
@@ -1155,8 +1161,6 @@ UPnPContext::registerMapping(Mapping& map)
// Newly added mapping must be in pending state by default.
map
.
setState
(
MappingState
::
PENDING
);
Mapping
::
sharedPtr_t
mapPtr
;
{
std
::
lock_guard
lock
(
mappingMutex_
);
auto
&
mappingList
=
getMappingList
(
map
.
getType
());
...
...
@@ -1175,7 +1179,7 @@ UPnPContext::registerMapping(Mapping& map)
std
::
lock_guard
lock
(
igdDiscoveryMutex_
);
// IGD discovery is in progress, the mapping request will be made once an IGD becomes available
if
(
igdDiscoveryInProgress_
)
{
if
(
logger_
)
logger_
->
debug
(
"
Request for m
apping {} will be requested when an IGD becomes available"
,
if
(
logger_
)
logger_
->
debug
(
"
M
apping {} will be requested when an IGD becomes available"
,
map
.
toString
());
}
else
{
// it's not in the IGD discovery phase, the mapping request will fail
...
...
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