Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
Beyond Protocol
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
Maintenance moved to Monday 17.3. at 13:00. ETA 60 - 90 minutes.
Show more breadcrumbs
Beyond AKA
Beyond Protocol
Commits
3a5f0ecc
Commit
3a5f0ecc
authored
2 years ago
by
Nicolas Pope
Browse files
Options
Downloads
Patches
Plain Diff
#3 Check socket address size
parent
64bcf49b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/socket/socket_linux.cpp
+7
-5
7 additions, 5 deletions
src/socket/socket_linux.cpp
src/socket/types.hpp
+2
-1
2 additions, 1 deletion
src/socket/types.hpp
with
9 additions
and
6 deletions
src/socket/socket_linux.cpp
+
7
−
5
View file @
3a5f0ecc
...
@@ -36,7 +36,9 @@ bool ftl::net::internal::resolve_inet_address(const std::string &hostname, int p
...
@@ -36,7 +36,9 @@ bool ftl::net::internal::resolve_inet_address(const std::string &hostname, int p
if
(
rc
!=
0
||
addrs
==
nullptr
)
return
false
;
if
(
rc
!=
0
||
addrs
==
nullptr
)
return
false
;
address
.
len
=
(
socklen_t
)
addrs
->
ai_addrlen
;
address
.
len
=
(
socklen_t
)
addrs
->
ai_addrlen
;
memcpy
(
&
address
.
addr
,
addrs
->
ai_addr
,
address
.
len
);
if
(
address
.
len
<=
sizeof
(
address
.
addr
))
{
memcpy
(
&
address
.
addr
,
addrs
->
ai_addr
,
address
.
len
);
}
freeaddrinfo
(
addrs
);
freeaddrinfo
(
addrs
);
return
true
;
return
true
;
}
}
...
@@ -70,7 +72,7 @@ ssize_t Socket::writev(const struct iovec *iov, int iovcnt) {
...
@@ -70,7 +72,7 @@ ssize_t Socket::writev(const struct iovec *iov, int iovcnt) {
}
}
int
Socket
::
bind
(
const
SocketAddress
&
addr
)
{
int
Socket
::
bind
(
const
SocketAddress
&
addr
)
{
auto
retval
=
::
bind
(
fd_
,
&
addr
.
addr
,
addr
.
len
);
auto
retval
=
::
bind
(
fd_
,
reinterpret_cast
<
const
sockaddr
*>
(
&
addr
.
addr
)
,
addr
.
len
);
if
(
retval
)
{
if
(
retval
)
{
status_
=
Socket
::
OPEN
;
status_
=
Socket
::
OPEN
;
}
}
...
@@ -84,7 +86,7 @@ int Socket::listen(int backlog) {
...
@@ -84,7 +86,7 @@ int Socket::listen(int backlog) {
Socket
Socket
::
accept
(
SocketAddress
&
addr
)
{
Socket
Socket
::
accept
(
SocketAddress
&
addr
)
{
addr
.
len
=
sizeof
(
SocketAddress
);
addr
.
len
=
sizeof
(
SocketAddress
);
Socket
socket
;
Socket
socket
;
int
retval
=
::
accept
(
fd_
,
&
(
addr
.
addr
),
&
(
addr
.
len
));
int
retval
=
::
accept
(
fd_
,
reinterpret_cast
<
sockaddr
*>
(
&
(
addr
.
addr
)
)
,
&
(
addr
.
len
));
if
(
retval
>
0
)
{
if
(
retval
>
0
)
{
socket
.
status_
=
STATUS
::
OPEN
;
socket
.
status_
=
STATUS
::
OPEN
;
socket
.
fd_
=
retval
;
socket
.
fd_
=
retval
;
...
@@ -99,7 +101,7 @@ Socket Socket::accept(SocketAddress &addr) {
...
@@ -99,7 +101,7 @@ Socket Socket::accept(SocketAddress &addr) {
int
Socket
::
connect
(
const
SocketAddress
&
address
)
{
int
Socket
::
connect
(
const
SocketAddress
&
address
)
{
int
err
=
0
;
int
err
=
0
;
if
(
status_
==
STATUS
::
UNCONNECTED
)
{
if
(
status_
==
STATUS
::
UNCONNECTED
)
{
err
=
::
connect
(
fd_
,
&
address
.
addr
,
address
.
len
);
err
=
::
connect
(
fd_
,
reinterpret_cast
<
const
sockaddr
*>
(
&
address
.
addr
)
,
address
.
len
);
if
(
err
==
0
)
{
if
(
err
==
0
)
{
status_
=
STATUS
::
OPEN
;
status_
=
STATUS
::
OPEN
;
return
0
;
return
0
;
...
@@ -203,7 +205,7 @@ Socket ftl::net::internal::create_tcp_socket() {
...
@@ -203,7 +205,7 @@ Socket ftl::net::internal::create_tcp_socket() {
std
::
string
ftl
::
net
::
internal
::
get_host
(
const
SocketAddress
&
addr
)
{
std
::
string
ftl
::
net
::
internal
::
get_host
(
const
SocketAddress
&
addr
)
{
char
hbuf
[
1024
];
char
hbuf
[
1024
];
int
err
=
getnameinfo
(
&
(
addr
.
addr
),
addr
.
len
,
hbuf
,
sizeof
(
hbuf
),
NULL
,
0
,
NI_NAMEREQD
);
int
err
=
getnameinfo
(
reinterpret_cast
<
const
sockaddr
*>
(
&
(
addr
.
addr
)
)
,
addr
.
len
,
hbuf
,
sizeof
(
hbuf
),
NULL
,
0
,
NI_NAMEREQD
);
if
(
err
==
0
)
{
return
std
::
string
(
hbuf
);
}
if
(
err
==
0
)
{
return
std
::
string
(
hbuf
);
}
else
if
(
err
==
EAI_NONAME
)
return
ftl
::
net
::
internal
::
get_ip
(
addr
);
else
if
(
err
==
EAI_NONAME
)
return
ftl
::
net
::
internal
::
get_ip
(
addr
);
else
else
...
...
This diff is collapsed.
Click to expand it.
src/socket/types.hpp
+
2
−
1
View file @
3a5f0ecc
...
@@ -27,6 +27,7 @@ typedef struct iovec {
...
@@ -27,6 +27,7 @@ typedef struct iovec {
#else
#else
// Linux
// Linux
#include
<sys/socket.h>
#include
<sys/socket.h>
#include
<netinet/in.h>
#endif
#endif
namespace
ftl
{
namespace
ftl
{
...
@@ -45,7 +46,7 @@ typedef int socket_t;
...
@@ -45,7 +46,7 @@ typedef int socket_t;
struct
SocketAddress
{
struct
SocketAddress
{
socklen_t
len
=
sizeof
(
struct
sockaddr
);
socklen_t
len
=
sizeof
(
struct
sockaddr
);
struct
sockaddr
addr
;
struct
sockaddr
_in
addr
;
};
};
#endif
#endif
...
...
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