Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Icecast-Server
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
93
Issues
93
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
External Wiki
External Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
Icecast-Server
Commits
e6ce60e6
Commit
e6ce60e6
authored
Oct 31, 2014
by
Philipp Schafft
🦁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename ICE_LISTEN_QUEUE, ICE_RUNNING and ICE_HALTING so they have a prefix of ICECAST_
svn path=/icecast/trunk/icecast/; revision=19258
parent
2b7cb1c6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
11 deletions
+11
-11
src/connection.c
src/connection.c
+2
-2
src/global.h
src/global.h
+3
-3
src/main.c
src/main.c
+2
-2
src/sighandler.c
src/sighandler.c
+1
-1
src/source.c
src/source.c
+3
-3
No files found.
src/connection.c
View file @
e6ce60e6
...
...
@@ -713,7 +713,7 @@ void connection_accept_loop (void)
get_ssl_certificate
(
config
);
config_release_config
();
while
(
global
.
running
==
ICE_RUNNING
)
while
(
global
.
running
==
ICE
CAST
_RUNNING
)
{
con
=
_accept_connection
(
duration
);
...
...
@@ -1434,7 +1434,7 @@ int connection_setup_sockets (ice_config_t *config)
sock_t
sock
=
sock_get_server_socket
(
listener
->
port
,
listener
->
bind_address
);
if
(
sock
==
SOCK_ERROR
)
break
;
if
(
sock_listen
(
sock
,
ICE_LISTEN_QUEUE
)
==
SOCK_ERROR
)
if
(
sock_listen
(
sock
,
ICE
CAST
_LISTEN_QUEUE
)
==
SOCK_ERROR
)
{
sock_close
(
sock
);
break
;
...
...
src/global.h
View file @
e6ce60e6
...
...
@@ -13,10 +13,10 @@
#ifndef __GLOBAL_H__
#define __GLOBAL_H__
#define ICE_LISTEN_QUEUE 5
#define ICE
CAST
_LISTEN_QUEUE 5
#define ICE_RUNNING 1
#define ICE_HALTING 2
#define ICE
CAST
_RUNNING 1
#define ICE
CAST
_HALTING 2
#define ICECAST_VERSION_STRING "Icecast " PACKAGE_VERSION
...
...
src/main.c
View file @
e6ce60e6
...
...
@@ -286,7 +286,7 @@ static int _start_listening(void)
{
int
i
;
for
(
i
=
0
;
i
<
global
.
server_sockets
;
i
++
)
{
if
(
sock_listen
(
global
.
serversock
[
i
],
ICE_LISTEN_QUEUE
)
==
SOCK_ERROR
)
if
(
sock_listen
(
global
.
serversock
[
i
],
ICE
CAST
_LISTEN_QUEUE
)
==
SOCK_ERROR
)
return
0
;
sock_set_blocking
(
global
.
serversock
[
i
],
0
);
...
...
@@ -511,7 +511,7 @@ int main(int argc, char **argv)
/* REM 3D Graphics */
/* let her rip */
global
.
running
=
ICE_RUNNING
;
global
.
running
=
ICE
CAST
_RUNNING
;
/* Startup yp thread */
yp_initialize
();
...
...
src/sighandler.c
View file @
e6ce60e6
...
...
@@ -70,7 +70,7 @@ void _sig_die(int signo)
ICECAST_LOG_INFO
(
"Caught signal %d, shutting down..."
,
signo
);
/* inform the server to start shutting down */
global
.
running
=
ICE_HALTING
;
global
.
running
=
ICE
CAST
_HALTING
;
}
#endif
src/source.c
View file @
e6ce60e6
...
...
@@ -462,7 +462,7 @@ static refbuf_t *get_next_buffer (source_t *source)
if
(
source
->
short_delay
)
delay
=
0
;
while
(
global
.
running
==
ICE_RUNNING
&&
source
->
running
)
while
(
global
.
running
==
ICE
CAST
_RUNNING
&&
source
->
running
)
{
int
fds
=
0
;
time_t
current
=
time
(
NULL
);
...
...
@@ -702,7 +702,7 @@ void source_main (source_t *source)
source_init
(
source
);
while
(
global
.
running
==
ICE_RUNNING
&&
source
->
running
)
{
while
(
global
.
running
==
ICE
CAST
_RUNNING
&&
source
->
running
)
{
int
remove_from_q
;
refbuf
=
get_next_buffer
(
source
);
...
...
@@ -1455,7 +1455,7 @@ void source_recheck_mounts (int update_all)
stats_event
(
mount
->
mountname
,
NULL
,
NULL
);
/* check for fallback to file */
if
(
global
.
running
==
ICE_RUNNING
&&
mount
->
fallback_mount
)
if
(
global
.
running
==
ICE
CAST
_RUNNING
&&
mount
->
fallback_mount
)
{
source_t
*
fallback
=
source_find_mount
(
mount
->
fallback_mount
);
if
(
fallback
==
NULL
)
...
...
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