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
4fe83b55
Commit
4fe83b55
authored
Oct 13, 2010
by
Pieter Noordhuis
Browse files
sockaddr_un.sun_path appears to never hold anything after accept()
parent
ab17b909
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/anet.c
View file @
4fe83b55
...
@@ -336,16 +336,12 @@ int anetTcpAccept(char *err, int s, char *ip, int *port) {
...
@@ -336,16 +336,12 @@ int anetTcpAccept(char *err, int s, char *ip, int *port) {
return
fd
;
return
fd
;
}
}
int
anetUnixAccept
(
char
*
err
,
int
s
,
char
*
path
,
int
len
)
{
int
anetUnixAccept
(
char
*
err
,
int
s
)
{
int
fd
;
int
fd
;
struct
sockaddr_un
sa
;
struct
sockaddr_un
sa
;
socklen_t
salen
=
sizeof
(
sa
);
socklen_t
salen
=
sizeof
(
sa
);
if
((
fd
=
anetGenericAccept
(
err
,
s
,(
struct
sockaddr
*
)
&
sa
,
&
salen
))
==
ANET_ERR
)
if
((
fd
=
anetGenericAccept
(
err
,
s
,(
struct
sockaddr
*
)
&
sa
,
&
salen
))
==
ANET_ERR
)
return
ANET_ERR
;
return
ANET_ERR
;
if
(
path
)
{
strncpy
(
path
,
sa
.
sun_path
,
len
-
1
);
path
[
len
-
1
]
=
0
;
}
return
fd
;
return
fd
;
}
}
src/anet.h
View file @
4fe83b55
...
@@ -44,7 +44,7 @@ int anetResolve(char *err, char *host, char *ipbuf);
...
@@ -44,7 +44,7 @@ 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
anetUnixServer
(
char
*
err
,
char
*
path
);
int
anetUnixServer
(
char
*
err
,
char
*
path
);
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
,
char
*
path
,
int
len
);
int
anetUnixAccept
(
char
*
err
,
int
serversock
);
int
anetWrite
(
int
fd
,
char
*
buf
,
int
count
);
int
anetWrite
(
int
fd
,
char
*
buf
,
int
count
);
int
anetNonBlock
(
char
*
err
,
int
fd
);
int
anetNonBlock
(
char
*
err
,
int
fd
);
int
anetTcpNoDelay
(
char
*
err
,
int
fd
);
int
anetTcpNoDelay
(
char
*
err
,
int
fd
);
...
...
src/networking.c
View file @
4fe83b55
...
@@ -199,12 +199,11 @@ void acceptTcpHandler(aeEventLoop *el, int fd, void *privdata, int mask) {
...
@@ -199,12 +199,11 @@ void acceptTcpHandler(aeEventLoop *el, int fd, void *privdata, int mask) {
void
acceptUnixHandler
(
aeEventLoop
*
el
,
int
fd
,
void
*
privdata
,
int
mask
)
{
void
acceptUnixHandler
(
aeEventLoop
*
el
,
int
fd
,
void
*
privdata
,
int
mask
)
{
int
cfd
;
int
cfd
;
char
cpath
[
128
];
REDIS_NOTUSED
(
el
);
REDIS_NOTUSED
(
el
);
REDIS_NOTUSED
(
mask
);
REDIS_NOTUSED
(
mask
);
REDIS_NOTUSED
(
privdata
);
REDIS_NOTUSED
(
privdata
);
cfd
=
anetUnixAccept
(
server
.
neterr
,
fd
,
cpath
,
sizeof
(
cpath
)
);
cfd
=
anetUnixAccept
(
server
.
neterr
,
fd
);
if
(
cfd
==
AE_ERR
)
{
if
(
cfd
==
AE_ERR
)
{
redisLog
(
REDIS_VERBOSE
,
"Accepting client connection: %s"
,
server
.
neterr
);
redisLog
(
REDIS_VERBOSE
,
"Accepting client connection: %s"
,
server
.
neterr
);
return
;
return
;
...
...
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