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.25 by root, Thu Mar 24 21:52:49 2011 UTC vs.
Revision 1.30 by root, Tue Dec 4 13:51:45 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 host = in.s_addr;
65 struct hostent *he = gethostbyname (hostname); 76 else if ((he = gethostbyname (hostname))
66 77 && he->h_addrtype == AF_INET
67 if (he 78 && he->h_length == 4
68 && he->h_addrtype == AF_INET && he->h_length == 4 && he->h_addr_list[0]) 79 && he->h_addr_list[0])
69 { 80 memcpy (&host, he->h_addr_list[0], 4); //sa->sin_family = he->h_addrtype;
70 //sa->sin_family = he->h_addrtype;
71 memcpy (&host, he->h_addr_list[0], 4);
72 }
73 else 81 else
74 slog (L_NOTICE, _("unable to resolve host '%s'"), hostname); 82 slog (L_NOTICE, _("unable to resolve host '%s'"), hostname);
75 } 83 }
76} 84}
77 85
111 in_addr ia = { host }; 119 in_addr ia = { host };
112 120
113 sprintf (hostport, "%.15s", inet_ntoa (ia)); 121 sprintf (hostport, "%.15s", inet_ntoa (ia));
114 122
115 return hostport; 123 return hostport;
124}
125
126bool
127sockinfo::valid () const
128{
129 return (prot & THISNODE->protocols) && host;
116} 130}
117 131
118sockinfo::operator const char *() const 132sockinfo::operator const char *() const
119{ 133{
120 in_addr ia = { host }; 134 in_addr ia = { host };

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines