Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liblongpath-rsync
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liblongpath
liblongpath-rsync
Commits
fde045cd
Commit
fde045cd
authored
Sep 24, 2004
by
Wayne Davison
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Turned the various FERROR messages into (the more proper) FLOG.
parent
183150b7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
23 deletions
+13
-23
clientname.c
clientname.c
+13
-23
No files found.
clientname.c
View file @
fde045cd
...
@@ -122,7 +122,7 @@ char *client_name(int fd)
...
@@ -122,7 +122,7 @@ char *client_name(int fd)
hint
.
ai_socktype
=
SOCK_STREAM
;
hint
.
ai_socktype
=
SOCK_STREAM
;
if
((
err
=
getaddrinfo
(
addr
,
NULL
,
&
hint
,
&
answer
))
!=
0
)
{
if
((
err
=
getaddrinfo
(
addr
,
NULL
,
&
hint
,
&
answer
))
!=
0
)
{
rprintf
(
F
ERROR
,
RSYNC_NAME
":
malformed address %s: %s
\n
"
,
rprintf
(
F
LOG
,
"
malformed address %s: %s
\n
"
,
addr
,
gai_strerror
(
err
));
addr
,
gai_strerror
(
err
));
return
name_buf
;
return
name_buf
;
}
}
...
@@ -145,8 +145,8 @@ char *client_name(int fd)
...
@@ -145,8 +145,8 @@ char *client_name(int fd)
client_sockaddr
(
fd
,
&
ss
,
&
ss_len
);
client_sockaddr
(
fd
,
&
ss
,
&
ss_len
);
}
}
if
(
!
lookup_name
(
fd
,
&
ss
,
ss_len
,
name_buf
,
sizeof
name_buf
,
if
(
lookup_name
(
fd
,
&
ss
,
ss_len
,
name_buf
,
sizeof
name_buf
,
port_buf
,
sizeof
port_buf
))
port_buf
,
sizeof
port_buf
)
==
0
)
check_name
(
fd
,
&
ss
,
name_buf
);
check_name
(
fd
,
&
ss
,
name_buf
);
return
name_buf
;
return
name_buf
;
...
@@ -168,7 +168,7 @@ void client_sockaddr(int fd,
...
@@ -168,7 +168,7 @@ void client_sockaddr(int fd,
if
(
getpeername
(
fd
,
(
struct
sockaddr
*
)
ss
,
ss_len
))
{
if
(
getpeername
(
fd
,
(
struct
sockaddr
*
)
ss
,
ss_len
))
{
/* FIXME: Can we really not continue? */
/* FIXME: Can we really not continue? */
rsyserr
(
F
ERROR
,
errno
,
"getpeername on fd%d failed"
,
fd
);
rsyserr
(
F
LOG
,
errno
,
"getpeername on fd%d failed"
,
fd
);
exit_cleanup
(
RERR_SOCKETIO
);
exit_cleanup
(
RERR_SOCKETIO
);
}
}
...
@@ -223,9 +223,8 @@ int lookup_name(int fd, const struct sockaddr_storage *ss,
...
@@ -223,9 +223,8 @@ int lookup_name(int fd, const struct sockaddr_storage *ss,
NI_NAMEREQD
|
NI_NUMERICSERV
);
NI_NAMEREQD
|
NI_NUMERICSERV
);
if
(
name_err
!=
0
)
{
if
(
name_err
!=
0
)
{
strcpy
(
name_buf
,
default_name
);
strcpy
(
name_buf
,
default_name
);
rprintf
(
FERROR
,
RSYNC_NAME
": name lookup failed for %s: %s
\n
"
,
rprintf
(
FLOG
,
"name lookup failed for %s: %s
\n
"
,
client_addr
(
fd
),
client_addr
(
fd
),
gai_strerror
(
name_err
));
gai_strerror
(
name_err
));
return
name_err
;
return
name_err
;
}
}
...
@@ -246,8 +245,7 @@ int compare_addrinfo_sockaddr(const struct addrinfo *ai,
...
@@ -246,8 +245,7 @@ int compare_addrinfo_sockaddr(const struct addrinfo *ai,
const
char
fn
[]
=
"compare_addrinfo_sockaddr"
;
const
char
fn
[]
=
"compare_addrinfo_sockaddr"
;
if
(
ai
->
ai_family
!=
ss_family
)
{
if
(
ai
->
ai_family
!=
ss_family
)
{
rprintf
(
FERROR
,
rprintf
(
FLOG
,
"%s: response family %d != %d
\n
"
,
"%s: response family %d != %d
\n
"
,
fn
,
ai
->
ai_family
,
ss_family
);
fn
,
ai
->
ai_family
,
ss_family
);
return
1
;
return
1
;
}
}
...
@@ -271,8 +269,7 @@ int compare_addrinfo_sockaddr(const struct addrinfo *ai,
...
@@ -271,8 +269,7 @@ int compare_addrinfo_sockaddr(const struct addrinfo *ai,
sin2
=
(
const
struct
sockaddr_in6
*
)
ai
->
ai_addr
;
sin2
=
(
const
struct
sockaddr_in6
*
)
ai
->
ai_addr
;
if
(
ai
->
ai_addrlen
<
sizeof
(
struct
sockaddr_in6
))
{
if
(
ai
->
ai_addrlen
<
sizeof
(
struct
sockaddr_in6
))
{
rprintf
(
FERROR
,
rprintf
(
FLOG
,
"%s: too short sockaddr_in6; length=%d
\n
"
,
"%s: too short sockaddr_in6; length=%d
\n
"
,
fn
,
ai
->
ai_addrlen
);
fn
,
ai
->
ai_addrlen
);
return
1
;
return
1
;
}
}
...
@@ -318,8 +315,7 @@ int check_name(int fd,
...
@@ -318,8 +315,7 @@ int check_name(int fd,
hints
.
ai_socktype
=
SOCK_STREAM
;
hints
.
ai_socktype
=
SOCK_STREAM
;
error
=
getaddrinfo
(
name_buf
,
NULL
,
&
hints
,
&
res0
);
error
=
getaddrinfo
(
name_buf
,
NULL
,
&
hints
,
&
res0
);
if
(
error
)
{
if
(
error
)
{
rprintf
(
FERROR
,
rprintf
(
FLOG
,
"forward name lookup for %s failed: %s
\n
"
,
RSYNC_NAME
": forward name lookup for %s failed: %s
\n
"
,
name_buf
,
gai_strerror
(
error
));
name_buf
,
gai_strerror
(
error
));
strcpy
(
name_buf
,
default_name
);
strcpy
(
name_buf
,
default_name
);
return
error
;
return
error
;
...
@@ -336,23 +332,17 @@ int check_name(int fd,
...
@@ -336,23 +332,17 @@ int check_name(int fd,
if
(
!
res0
)
{
if
(
!
res0
)
{
/* We hit the end of the list without finding an
/* We hit the end of the list without finding an
* address that was the same as ss. */
* address that was the same as ss. */
rprintf
(
FERROR
,
RSYNC_NAME
rprintf
(
FLOG
,
"no known address for
\"
%s
\"
: "
": no known address for
\"
%s
\"
: "
"spoofed address?
\n
"
,
name_buf
);
"spoofed address?
\n
"
,
name_buf
);
strcpy
(
name_buf
,
default_name
);
strcpy
(
name_buf
,
default_name
);
}
else
if
(
res
==
NULL
)
{
}
else
if
(
res
==
NULL
)
{
/* We hit the end of the list without finding an
/* We hit the end of the list without finding an
* address that was the same as ss. */
* address that was the same as ss. */
rprintf
(
FERROR
,
RSYNC_NAME
rprintf
(
FLOG
,
"%s is not a known address for
\"
%s
\"
: "
": %s is not a known address for
\"
%s
\"
: "
"spoofed address?
\n
"
,
client_addr
(
fd
),
name_buf
);
"spoofed address?
\n
"
,
client_addr
(
fd
),
name_buf
);
strcpy
(
name_buf
,
default_name
);
strcpy
(
name_buf
,
default_name
);
}
}
freeaddrinfo
(
res0
);
freeaddrinfo
(
res0
);
return
0
;
return
0
;
}
}
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