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
94
Issues
94
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
2b4ee737
Commit
2b4ee737
authored
Nov 21, 2004
by
Karl Heyes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add per-mount no-yp tag handling
svn path=/icecast/trunk/icecast/; revision=8241
parent
c7432d66
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
0 deletions
+25
-0
conf/icecast.xml.in
conf/icecast.xml.in
+1
-0
doc/icecast2_config_file.html
doc/icecast2_config_file.html
+7
-0
src/cfgfile.c
src/cfgfile.c
+5
-0
src/cfgfile.h
src/cfgfile.h
+1
-0
src/source.c
src/source.c
+10
-0
src/source.h
src/source.h
+1
-0
No files found.
conf/icecast.xml.in
View file @
2b4ee737
...
...
@@ -91,6 +91,7 @@
<burst-size>65536</burst-size>
<fallback-mount>/example2.ogg</fallback-mount>
<fallback-override>1</fallback-override>
<no-yp>1</no-yp>
<authentication type="htpasswd">
<option name="filename" value="myauth"/>
<option name="allow_duplicate_users" value="0"/>
...
...
doc/icecast2_config_file.html
View file @
2b4ee737
...
...
@@ -320,6 +320,7 @@ If you are relaying a Shoutcast stream, you need to specify this indicator to al
<
dump-file
>
/tmp/dump-example1.ogg
<
/dump-file
>
<
fallback-mount
>
/example2.ogg
<
/fallback-mount
>
<
fallback-override
>
1
<
/fallback-override
>
<
no-yp
>
1
<
/no-yp
>
<
burst-size
>
65536
<
/burst-size
>
<
authentication type="htpasswd"
>
<
option name="filename" value="myauth"/
>
...
...
@@ -367,6 +368,12 @@ This multi-level fallback allows clients to cascade several mountpoints.
When enabled, this allows a connecting source client or relay on this mountpoint to move
listening clients back from the fallback mount.
</div>
<h4>
no-yp
</h4>
<div
class=
"indentedbox"
>
Setting this option prevents this mountpoint from advertising on YP. The default is 0 so YP
advertising occurs however you may want to prevent it here if you intend listeners to connect
to a local relay instead
</div>
<h4>
burst-size
</h4>
<div
class=
"indentedbox"
>
This optional setting allows for providing a burst size which overrides the default burst size
...
...
src/cfgfile.c
View file @
2b4ee737
...
...
@@ -553,6 +553,11 @@ static void _parse_mount(xmlDocPtr doc, xmlNodePtr node,
mount
->
no_mount
=
atoi
(
tmp
);
if
(
tmp
)
xmlFree
(
tmp
);
}
else
if
(
strcmp
(
node
->
name
,
"no-yp"
)
==
0
)
{
tmp
=
(
char
*
)
xmlNodeListGetString
(
doc
,
node
->
xmlChildrenNode
,
1
);
mount
->
no_yp
=
atoi
(
tmp
);
if
(
tmp
)
xmlFree
(
tmp
);
}
else
if
(
strcmp
(
node
->
name
,
"authentication"
)
==
0
)
{
mount
->
auth_type
=
xmlGetProp
(
node
,
"type"
);
option
=
node
->
xmlChildrenNode
;
...
...
src/cfgfile.h
View file @
2b4ee737
...
...
@@ -57,6 +57,7 @@ typedef struct _mount_proxy {
int
burst_size
;
/* amount to send to a new client if possible, -1 take
* from global setting */
unsigned
int
queue_size_limit
;
int
no_yp
;
/* Do we prevent YP on this mount */
unsigned
int
source_timeout
;
/* source timeout in seconds */
char
*
auth_type
;
/* Authentication type */
...
...
src/source.c
View file @
2b4ee737
...
...
@@ -242,6 +242,7 @@ void source_clear_source (source_t *source)
source
->
shoutcast_compat
=
0
;
source
->
max_listeners
=
-
1
;
source
->
yp_public
=
0
;
source
->
yp_prevent
=
0
;
util_dict_free
(
source
->
audio_info
);
source
->
audio_info
=
NULL
;
...
...
@@ -498,6 +499,9 @@ static void source_init (source_t *source)
do
{
str
=
"0"
;
if
(
source
->
yp_prevent
)
break
;
if
((
str
=
httpp_getvar
(
source
->
parser
,
"ice-public"
)))
break
;
if
((
str
=
httpp_getvar
(
source
->
parser
,
"icy-pub"
)))
...
...
@@ -877,6 +881,12 @@ void source_apply_mount (source_t *source, mount_proxy *mountinfo)
source
->
timeout
=
mountinfo
->
source_timeout
;
DEBUG1
(
"source timeout to %u"
,
source
->
timeout
);
}
if
(
mountinfo
->
no_yp
)
{
source
->
yp_prevent
=
1
;
DEBUG0
(
"preventing YP listings"
);
}
if
(
mountinfo
->
burst_size
>
-
1
)
source
->
burst_size
=
mountinfo
->
burst_size
;
DEBUG1
(
"amount to burst on client connect set to %u"
,
source
->
burst_size
);
...
...
src/source.h
View file @
2b4ee737
...
...
@@ -51,6 +51,7 @@ typedef struct source_tag
long
listeners
;
long
max_listeners
;
int
yp_public
;
int
yp_prevent
;
struct
auth_tag
*
authenticator
;
int
fallback_override
;
int
no_mount
;
...
...
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