Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1245887
)
don't need to lookup our own name in open_socket_in()
author
Andrew Tridgell
<tridge@samba.org>
Wed, 8 Aug 2001 08:55:24 +0000
(08:55 +0000)
committer
Andrew Tridgell
<tridge@samba.org>
Wed, 8 Aug 2001 08:55:24 +0000
(08:55 +0000)
socket.c
patch
|
blob
|
blame
|
history
diff --git
a/socket.c
b/socket.c
index
00a0b94
..
81bdb39
100644
(file)
--- a/
socket.c
+++ b/
socket.c
@@
-170,34
+170,19
@@
open a socket of the specified type, port and address for incoming data
****************************************************************************/
static int open_socket_in(int type, int port, struct in_addr *address)
{
****************************************************************************/
static int open_socket_in(int type, int port, struct in_addr *address)
{
- struct hostent *hp;
struct sockaddr_in sock;
struct sockaddr_in sock;
- char host_name[MAXHOSTNAMELEN];
int res;
int one=1;
int res;
int one=1;
- /* get my host name */
- if (gethostname(host_name, sizeof(host_name)) == -1) {
- rprintf(FERROR,"gethostname failed\n");
- return -1;
- }
-
- /* get host info */
- if ((hp = gethostbyname(host_name)) == 0) {
- rprintf(FERROR,"gethostbyname: Unknown host %s\n",host_name);
- return -1;
- }
-
memset((char *)&sock,0,sizeof(sock));
memset((char *)&sock,0,sizeof(sock));
- memcpy((char *)&sock.sin_addr,(char *)hp->h_addr, hp->h_length);
sock.sin_port = htons(port);
sock.sin_port = htons(port);
- sock.sin_family =
hp->h_addrtype
;
+ sock.sin_family =
AF_INET
;
if (address) {
sock.sin_addr = *address;
} else {
sock.sin_addr.s_addr = INADDR_ANY;
}
if (address) {
sock.sin_addr = *address;
} else {
sock.sin_addr.s_addr = INADDR_ANY;
}
- res = socket(
hp->h_addrtype
, type, 0);
+ res = socket(
AF_INET
, type, 0);
if (res == -1) {
rprintf(FERROR,"socket failed: %s\n",
strerror(errno));
if (res == -1) {
rprintf(FERROR,"socket failed: %s\n",
strerror(errno));