ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/sockinfo.C
(Generate patch)

Comparing gvpe/src/sockinfo.C (file contents):
Revision 1.28 by root, Tue Jan 17 21:38:11 2012 UTC vs.
Revision 1.29 by root, Tue Dec 4 13:49:16 2012 UTC

29 covered work. 29 covered work.
30*/ 30*/
31 31
32#include "config.h" 32#include "config.h"
33 33
34// for gethostbyname
34#include <netdb.h> 35#include <netdb.h>
36
37// for inet_aton
38#include <sys/socket.h>
39#include <netinet/in.h>
40#include <arpa/inet.h>
35 41
36#include "gettext.h" 42#include "gettext.h"
37 43
38#include "sockinfo.h" 44#include "sockinfo.h"
39#include "slog.h" 45#include "slog.h"
60 port = htons (port_); 66 port = htons (port_);
61 67
62 if (prot & PROTv4 68 if (prot & PROTv4
63 && hostname) 69 && hostname)
64 { 70 {
71 struct in_addr in;
72 struct hostent *he;
73
74 if (inet_aton (hostname, &in))
75 {
76 host = in.s_addr;
77 }
65 struct hostent *he = gethostbyname (hostname); 78 else if ((he = gethostbyname (hostname))
66 79 && he->h_addrtype == AF_INET
67 if (he 80 && he->h_length == 4
68 && he->h_addrtype == AF_INET && he->h_length == 4 && he->h_addr_list[0]) 81 && he->h_addr_list[0])
69 { 82 {
70 //sa->sin_family = he->h_addrtype; 83 //sa->sin_family = he->h_addrtype;
71 memcpy (&host, he->h_addr_list[0], 4); 84 memcpy (&host, he->h_addr_list[0], 4);
72 } 85 }
73 else 86 else

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines