Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pistache
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
Libraries
pistache
Commits
cb716110
Unverified
Commit
cb716110
authored
Jun 14, 2021
by
Kip
Committed by
GitHub
Jun 14, 2021
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #937 from DerangedMonkeyNinja/master
listener: use sockaddr_storage for socket addrs
parents
1b96493e
efad6ddc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
include/pistache/listener.h
include/pistache/listener.h
+1
-1
src/server/listener.cc
src/server/listener.cc
+5
-4
No files found.
include/pistache/listener.h
View file @
cb716110
...
@@ -107,7 +107,7 @@ namespace Pistache::Tcp
...
@@ -107,7 +107,7 @@ namespace Pistache::Tcp
TransportFactory
defaultTransportFactory
()
const
;
TransportFactory
defaultTransportFactory
()
const
;
void
handleNewConnection
();
void
handleNewConnection
();
int
acceptConnection
(
struct
sockaddr_
in
&
peer_addr
)
const
;
int
acceptConnection
(
struct
sockaddr_
storage
&
peer_addr
)
const
;
void
dispatchPeer
(
const
std
::
shared_ptr
<
Peer
>&
peer
);
void
dispatchPeer
(
const
std
::
shared_ptr
<
Peer
>&
peer
);
bool
useSSL_
=
false
;
bool
useSSL_
=
false
;
...
...
src/server/listener.cc
View file @
cb716110
...
@@ -442,7 +442,7 @@ namespace Pistache::Tcp
...
@@ -442,7 +442,7 @@ namespace Pistache::Tcp
void
Listener
::
handleNewConnection
()
void
Listener
::
handleNewConnection
()
{
{
struct
sockaddr_
in
peer_addr
;
struct
sockaddr_
storage
peer_addr
;
int
client_fd
=
acceptConnection
(
peer_addr
);
int
client_fd
=
acceptConnection
(
peer_addr
);
void
*
ssl
=
nullptr
;
void
*
ssl
=
nullptr
;
...
@@ -479,19 +479,20 @@ namespace Pistache::Tcp
...
@@ -479,19 +479,20 @@ namespace Pistache::Tcp
make_non_blocking
(
client_fd
);
make_non_blocking
(
client_fd
);
std
::
shared_ptr
<
Peer
>
peer
;
std
::
shared_ptr
<
Peer
>
peer
;
auto
*
peer_alias
=
reinterpret_cast
<
struct
sockaddr
*>
(
&
peer_addr
);
if
(
this
->
useSSL_
)
if
(
this
->
useSSL_
)
{
{
peer
=
Peer
::
CreateSSL
(
client_fd
,
Address
::
fromUnix
(
&
peer_addr
),
ssl
);
peer
=
Peer
::
CreateSSL
(
client_fd
,
Address
::
fromUnix
(
peer_alias
),
ssl
);
}
}
else
else
{
{
peer
=
Peer
::
Create
(
client_fd
,
Address
::
fromUnix
(
&
peer_addr
));
peer
=
Peer
::
Create
(
client_fd
,
Address
::
fromUnix
(
peer_alias
));
}
}
dispatchPeer
(
peer
);
dispatchPeer
(
peer
);
}
}
int
Listener
::
acceptConnection
(
struct
sockaddr_
in
&
peer_addr
)
const
int
Listener
::
acceptConnection
(
struct
sockaddr_
storage
&
peer_addr
)
const
{
{
socklen_t
peer_addr_len
=
sizeof
(
peer_addr
);
socklen_t
peer_addr_len
=
sizeof
(
peer_addr
);
// Do not share open FD with forked processes
// Do not share open FD with forked processes
...
...
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