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
47cef92f
Commit
47cef92f
authored
Jun 03, 2003
by
brendan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Karl's patch for a namespace collision he reports on some BSD systems.
svn path=/trunk/net/; revision=4861
parent
9e8e9a50
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
src/net/sock.c
src/net/sock.c
+8
-7
No files found.
src/net/sock.c
View file @
47cef92f
/* -*- c-basic-offset: 4; -*- */
/* sock.c
* - General Socket Functions
*
...
...
@@ -592,7 +593,7 @@ sock_t sock_get_server_socket(const int port, char *sinterface)
#else
struct
sockaddr_in
sa
;
#endif
int
sa_family
,
sa_
len
,
error
,
opt
;
int
family
,
len
,
error
,
opt
;
sock_t
sock
;
char
ip
[
MAX_ADDR_LEN
];
...
...
@@ -601,8 +602,8 @@ sock_t sock_get_server_socket(const int port, char *sinterface)
/* defaults */
memset
(
&
sa
,
0
,
sizeof
(
sa
));
sa_
family
=
AF_INET
;
sa_
len
=
sizeof
(
struct
sockaddr_in
);
family
=
AF_INET
;
len
=
sizeof
(
struct
sockaddr_in
);
/* set the interface to bind to if specified */
if
(
sinterface
!=
NULL
)
{
...
...
@@ -615,8 +616,8 @@ sock_t sock_get_server_socket(const int port, char *sinterface)
((
struct
sockaddr_in
*
)
&
sa
)
->
sin_port
=
htons
(
port
);
}
else
if
(
inet_pton
(
AF_INET6
,
ip
,
&
((
struct
sockaddr_in6
*
)
&
sa
)
->
sin6_addr
)
>
0
)
{
sa_
family
=
AF_INET6
;
sa_
len
=
sizeof
(
struct
sockaddr_in6
);
family
=
AF_INET6
;
len
=
sizeof
(
struct
sockaddr_in6
);
((
struct
sockaddr_in6
*
)
&
sa
)
->
sin6_family
=
AF_INET6
;
((
struct
sockaddr_in6
*
)
&
sa
)
->
sin6_port
=
htons
(
port
);
}
else
{
...
...
@@ -637,7 +638,7 @@ sock_t sock_get_server_socket(const int port, char *sinterface)
}
/* get a socket */
sock
=
socket
(
sa_
family
,
SOCK_STREAM
,
0
);
sock
=
socket
(
family
,
SOCK_STREAM
,
0
);
if
(
sock
==
-
1
)
return
SOCK_ERROR
;
...
...
@@ -646,7 +647,7 @@ sock_t sock_get_server_socket(const int port, char *sinterface)
setsockopt
(
sock
,
SOL_SOCKET
,
SO_REUSEADDR
,
(
const
void
*
)
&
opt
,
sizeof
(
int
));
/* bind socket to port */
error
=
bind
(
sock
,
(
struct
sockaddr
*
)
&
sa
,
sa_
len
);
error
=
bind
(
sock
,
(
struct
sockaddr
*
)
&
sa
,
len
);
if
(
error
==
-
1
)
return
SOCK_ERROR
;
...
...
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