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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
opendht
Commits
949cbb9f
Commit
949cbb9f
authored
2 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
sockaddr: allow to release ownership
parent
37cfbffd
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
c/opendht.cpp
+2
-8
2 additions, 8 deletions
c/opendht.cpp
include/opendht/sockaddr.h
+9
-0
9 additions, 0 deletions
include/opendht/sockaddr.h
with
11 additions
and
8 deletions
c/opendht.cpp
+
2
−
8
View file @
949cbb9f
...
...
@@ -504,14 +504,8 @@ struct sockaddr** dht_runner_get_public_address(const dht_runner* r) {
if
(
addrs
.
empty
())
return
nullptr
;
auto
ret
=
(
struct
sockaddr
**
)
malloc
(
sizeof
(
struct
sockaddr
*
)
*
(
addrs
.
size
()
+
1
));
for
(
size_t
i
=
0
;
i
<
addrs
.
size
();
i
++
)
{
if
(
const
auto
&
addr
=
addrs
[
i
])
{
ret
[
i
]
=
(
struct
sockaddr
*
)
malloc
(
addr
.
getLength
());
memcpy
((
struct
sockaddr
*
)
ret
[
i
],
addr
.
get
(),
addr
.
getLength
());
}
else
{
ret
[
i
]
=
nullptr
;
}
}
for
(
size_t
i
=
0
;
i
<
addrs
.
size
();
i
++
)
ret
[
i
]
=
addrs
[
i
].
release
();
ret
[
addrs
.
size
()]
=
nullptr
;
return
ret
;
}
...
...
This diff is collapsed.
Click to expand it.
include/opendht/sockaddr.h
+
9
−
0
View file @
949cbb9f
...
...
@@ -236,6 +236,15 @@ public:
return
*
reinterpret_cast
<
sockaddr_in6
*>
(
get
());
}
/**
* Releases the ownership of the managed object, if any.
* The caller is responsible for deleting the object with free().
*/
inline
sockaddr
*
release
()
{
len
=
0
;
return
addr
.
release
();
}
/**
* Return true if address is a loopback IP address.
*/
...
...
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