Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
df5f9f4a
Commit
df5f9f4a
authored
Feb 05, 2014
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Listen: add Partition reference
parent
d9466cad
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
8 deletions
+11
-8
Listen.cxx
src/Listen.cxx
+7
-6
Listen.hxx
src/Listen.hxx
+2
-1
Main.cxx
src/Main.cxx
+2
-1
No files found.
src/Listen.cxx
View file @
df5f9f4a
...
...
@@ -19,8 +19,6 @@
#include "config.h"
#include "Listen.hxx"
#include "Main.hxx"
#include "Instance.hxx"
#include "client/Client.hxx"
#include "config/ConfigData.hxx"
#include "config/ConfigGlobal.hxx"
...
...
@@ -43,13 +41,16 @@ static constexpr Domain listen_domain("listen");
#define DEFAULT_PORT 6600
class
ClientListener
final
:
public
ServerSocket
{
Partition
&
partition
;
public
:
ClientListener
(
EventLoop
&
_loop
)
:
ServerSocket
(
_loop
)
{}
ClientListener
(
EventLoop
&
_loop
,
Partition
&
_partition
)
:
ServerSocket
(
_loop
),
partition
(
_partition
)
{}
private
:
virtual
void
OnAccept
(
int
fd
,
const
sockaddr
&
address
,
size_t
address_length
,
int
uid
)
{
client_new
(
GetEventLoop
(),
*
instance
->
partition
,
client_new
(
GetEventLoop
(),
partition
,
fd
,
&
address
,
address_length
,
uid
);
}
};
...
...
@@ -101,14 +102,14 @@ listen_systemd_activation(Error &error_r)
}
bool
listen_global_init
(
EventLoop
&
loop
,
Error
&
error
)
listen_global_init
(
EventLoop
&
loop
,
Partition
&
partition
,
Error
&
error
)
{
int
port
=
config_get_positive
(
CONF_PORT
,
DEFAULT_PORT
);
const
struct
config_param
*
param
=
config_get_next_param
(
CONF_BIND_TO_ADDRESS
,
nullptr
);
bool
success
;
listen_socket
=
new
ClientListener
(
loop
);
listen_socket
=
new
ClientListener
(
loop
,
partition
);
if
(
listen_systemd_activation
(
error
))
return
true
;
...
...
src/Listen.hxx
View file @
df5f9f4a
...
...
@@ -22,11 +22,12 @@
class
EventLoop
;
class
Error
;
struct
Partition
;
extern
int
listen_port
;
bool
listen_global_init
(
EventLoop
&
loop
,
Error
&
error
);
listen_global_init
(
EventLoop
&
loop
,
Partition
&
partition
,
Error
&
error
);
void
listen_global_finish
(
void
);
...
...
src/Main.cxx
View file @
df5f9f4a
...
...
@@ -432,7 +432,8 @@ int mpd_main(int argc, char *argv[])
const
unsigned
max_clients
=
config_get_positive
(
CONF_MAX_CONN
,
10
);
instance
->
client_list
=
new
ClientList
(
max_clients
);
if
(
!
listen_global_init
(
*
instance
->
event_loop
,
error
))
{
if
(
!
listen_global_init
(
*
instance
->
event_loop
,
*
instance
->
partition
,
error
))
{
LogError
(
error
);
return
EXIT_FAILURE
;
}
...
...
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