mirror of
https://github.com/samba-team/samba.git
synced 2024-12-24 21:34:56 +03:00
more fixes from the static changes; please move static functions to the top of files to prevent this from happening
(This used to be commit 7a61c2ae45
)
This commit is contained in:
parent
19b8f496f8
commit
45616e18a8
@ -29,6 +29,29 @@ int lastport=0;
|
||||
|
||||
int smb_read_error = 0;
|
||||
|
||||
static char *get_socket_addr(int fd)
|
||||
{
|
||||
struct sockaddr sa;
|
||||
struct sockaddr_in *sockin = (struct sockaddr_in *) (&sa);
|
||||
int length = sizeof(sa);
|
||||
static fstring addr_buf;
|
||||
|
||||
fstrcpy(addr_buf,"0.0.0.0");
|
||||
|
||||
if (fd == -1) {
|
||||
return addr_buf;
|
||||
}
|
||||
|
||||
if (getsockname(fd, &sa, &length) < 0) {
|
||||
DEBUG(0,("getpeername failed. Error was %s\n", strerror(errno) ));
|
||||
return addr_buf;
|
||||
}
|
||||
|
||||
fstrcpy(addr_buf,(char *)inet_ntoa(sockin->sin_addr));
|
||||
|
||||
return addr_buf;
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
Determine if a file descriptor is in fact a socket.
|
||||
****************************************************************************/
|
||||
@ -958,29 +981,6 @@ char *get_peer_addr(int fd)
|
||||
return addr_buf;
|
||||
}
|
||||
|
||||
static char *get_socket_addr(int fd)
|
||||
{
|
||||
struct sockaddr sa;
|
||||
struct sockaddr_in *sockin = (struct sockaddr_in *) (&sa);
|
||||
int length = sizeof(sa);
|
||||
static fstring addr_buf;
|
||||
|
||||
fstrcpy(addr_buf,"0.0.0.0");
|
||||
|
||||
if (fd == -1) {
|
||||
return addr_buf;
|
||||
}
|
||||
|
||||
if (getsockname(fd, &sa, &length) < 0) {
|
||||
DEBUG(0,("getpeername failed. Error was %s\n", strerror(errno) ));
|
||||
return addr_buf;
|
||||
}
|
||||
|
||||
fstrcpy(addr_buf,(char *)inet_ntoa(sockin->sin_addr));
|
||||
|
||||
return addr_buf;
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
Create protected unix domain socket.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user