Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
bd234d62
Commit
bd234d62
authored
Jul 04, 2013
by
antirez
Browse files
anet.c: Allow creation of TCP listening sockets bound to N addresses.
parent
585b0a61
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/anet.c
View file @
bd234d62
...
@@ -331,9 +331,9 @@ static int anetListen(char *err, int s, struct sockaddr *sa, socklen_t len) {
...
@@ -331,9 +331,9 @@ static int anetListen(char *err, int s, struct sockaddr *sa, socklen_t len) {
return
ANET_OK
;
return
ANET_OK
;
}
}
int
anetTcpServer
(
char
*
err
,
int
port
,
char
*
bindaddr
)
int
anetTcpServer
(
char
*
err
,
int
port
,
char
*
*
bindaddr
,
int
bindaddr_count
)
{
{
int
s
;
int
s
,
j
;
struct
sockaddr_in
sa
;
struct
sockaddr_in
sa
;
if
((
s
=
anetCreateSocket
(
err
,
AF_INET
))
==
ANET_ERR
)
if
((
s
=
anetCreateSocket
(
err
,
AF_INET
))
==
ANET_ERR
)
...
@@ -343,13 +343,20 @@ int anetTcpServer(char *err, int port, char *bindaddr)
...
@@ -343,13 +343,20 @@ int anetTcpServer(char *err, int port, char *bindaddr)
sa
.
sin_family
=
AF_INET
;
sa
.
sin_family
=
AF_INET
;
sa
.
sin_port
=
htons
(
port
);
sa
.
sin_port
=
htons
(
port
);
sa
.
sin_addr
.
s_addr
=
htonl
(
INADDR_ANY
);
sa
.
sin_addr
.
s_addr
=
htonl
(
INADDR_ANY
);
if
(
bindaddr
&&
inet_aton
(
bindaddr
,
&
sa
.
sin_addr
)
==
0
)
{
if
(
bindaddr_count
)
{
anetSetError
(
err
,
"invalid bind address"
);
for
(
j
=
0
;
j
<
bindaddr_count
;
j
++
)
{
close
(
s
);
if
(
inet_aton
(
bindaddr
[
j
],
&
sa
.
sin_addr
)
==
0
)
{
return
ANET_ERR
;
anetSetError
(
err
,
"invalid bind address"
);
close
(
s
);
return
ANET_ERR
;
}
if
(
anetListen
(
err
,
s
,(
struct
sockaddr
*
)
&
sa
,
sizeof
(
sa
))
==
ANET_ERR
)
return
ANET_ERR
;
}
}
else
{
if
(
anetListen
(
err
,
s
,(
struct
sockaddr
*
)
&
sa
,
sizeof
(
sa
))
==
ANET_ERR
)
return
ANET_ERR
;
}
}
if
(
anetListen
(
err
,
s
,(
struct
sockaddr
*
)
&
sa
,
sizeof
(
sa
))
==
ANET_ERR
)
return
ANET_ERR
;
return
s
;
return
s
;
}
}
...
...
src/anet.h
View file @
bd234d62
...
@@ -45,7 +45,7 @@ int anetUnixConnect(char *err, char *path);
...
@@ -45,7 +45,7 @@ int anetUnixConnect(char *err, char *path);
int
anetUnixNonBlockConnect
(
char
*
err
,
char
*
path
);
int
anetUnixNonBlockConnect
(
char
*
err
,
char
*
path
);
int
anetRead
(
int
fd
,
char
*
buf
,
int
count
);
int
anetRead
(
int
fd
,
char
*
buf
,
int
count
);
int
anetResolve
(
char
*
err
,
char
*
host
,
char
*
ipbuf
);
int
anetResolve
(
char
*
err
,
char
*
host
,
char
*
ipbuf
);
int
anetTcpServer
(
char
*
err
,
int
port
,
char
*
bindaddr
);
int
anetTcpServer
(
char
*
err
,
int
port
,
char
*
*
bindaddr
,
int
bindaddr_count
);
int
anetUnixServer
(
char
*
err
,
char
*
path
,
mode_t
perm
);
int
anetUnixServer
(
char
*
err
,
char
*
path
,
mode_t
perm
);
int
anetTcpAccept
(
char
*
err
,
int
serversock
,
char
*
ip
,
int
*
port
);
int
anetTcpAccept
(
char
*
err
,
int
serversock
,
char
*
ip
,
int
*
port
);
int
anetUnixAccept
(
char
*
err
,
int
serversock
);
int
anetUnixAccept
(
char
*
err
,
int
serversock
);
...
...
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