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.15 by pcg, Thu Mar 3 16:54:34 2005 UTC vs.
Revision 1.29 by root, Tue Dec 4 13:49:16 2012 UTC

1/* 1/*
2 sockinfo.C -- socket address management 2 sockinfo.C -- socket address management
3 Copyright (C) 2003 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
10 (at your option) any later version. 10 option) any later version.
11 11
12 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
15 GNU General Public License for more details. 15 Public License for more details.
16 16
17 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License along
18 along with gvpe; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
20*/ 30*/
21 31
22#include "config.h" 32#include "config.h"
23 33
34// for gethostbyname
24#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>
25 41
26#include "gettext.h" 42#include "gettext.h"
27 43
28#include "sockinfo.h" 44#include "sockinfo.h"
29#include "slog.h" 45#include "slog.h"
30 46
47#include <cstring>
48#include <cstdio>
49
31// all ipv4-based protocols 50// all ipv4-based protocols
32#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4) 51#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4)
33 52
53void
34void sockinfo::set (const sockaddr_in *sa, u8 prot_) 54sockinfo::set (const sockaddr_in *sa, u8 prot_)
35{ 55{
36 host = sa->sin_addr.s_addr; 56 host = sa->sin_addr.s_addr;
37 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port; 57 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port;
38 prot = prot_; 58 prot = prot_;
39} 59}
40 60
61void
41void sockinfo::set (const char *hostname, u16 port_, u8 prot_) 62sockinfo::set (const char *hostname, u16 port_, u8 prot_)
42{ 63{
43 prot = prot_; 64 prot = prot_;
44 host = 0; 65 host = 0;
45 port = htons (port_); 66 port = htons (port_);
46 67
47 if (prot & PROTv4 68 if (prot & PROTv4
48 && hostname) 69 && hostname)
49 { 70 {
71 struct in_addr in;
72 struct hostent *he;
73
74 if (inet_aton (hostname, &in))
75 {
76 host = in.s_addr;
77 }
50 struct hostent *he = gethostbyname (hostname); 78 else if ((he = gethostbyname (hostname))
51 79 && he->h_addrtype == AF_INET
52 if (he 80 && he->h_length == 4
53 && he->h_addrtype == AF_INET && he->h_length == 4 && he->h_addr_list[0]) 81 && he->h_addr_list[0])
54 { 82 {
55 //sa->sin_family = he->h_addrtype; 83 //sa->sin_family = he->h_addrtype;
56 memcpy (&host, he->h_addr_list[0], 4); 84 memcpy (&host, he->h_addr_list[0], 4);
57 } 85 }
58 else 86 else
… …
62 90
63void 91void
64sockinfo::set (const conf_node *conf, u8 prot_) 92sockinfo::set (const conf_node *conf, u8 prot_)
65{ 93{
66 if (prot_ == PROT_DNSv4) 94 if (prot_ == PROT_DNSv4)
67 set (conf->dns_hostname, conf->dns_hostname ? conf->dns_port : 0, prot_); 95 {
96 host = htonl (conf->id); port = 0; prot = prot_;
97 }
68 else 98 else
69 set (conf->hostname, 99 set (conf->hostname,
70 prot_ == PROT_UDPv4 ? conf->udp_port 100 prot_ == PROT_UDPv4 ? conf->udp_port
71 : prot_ == PROT_TCPv4 ? conf->tcp_port 101 : prot_ == PROT_TCPv4 ? conf->tcp_port
72 : prot_ == PROT_DNSv4 ? conf->dns_port 102 : prot_ == PROT_DNSv4 ? conf->dns_port
… …
96 sprintf (hostport, "%.15s", inet_ntoa (ia)); 126 sprintf (hostport, "%.15s", inet_ntoa (ia));
97 127
98 return hostport; 128 return hostport;
99} 129}
100 130
131bool
132sockinfo::valid () const
133{
134 return (prot & THISNODE->protocols) && host;
135}
136
101sockinfo::operator const char *() const 137sockinfo::operator const char *() const
102{ 138{
103 in_addr ia = { host }; 139 in_addr ia = { host };
104 140
105 sprintf (hostport, "%s/%.15s:%d", strprotocol (prot), inet_ntoa (ia), ntohs (port) & 0xffff); 141 sprintf (hostport, "%s/%.15s:%d", strprotocol (prot), inet_ntoa (ia), ntohs (port) & 0xffff);
… …
110u8 146u8
111sockinfo::supported_protocols (conf_node *conf) 147sockinfo::supported_protocols (conf_node *conf)
112{ 148{
113 u8 protocols = prot; 149 u8 protocols = prot;
114 150
115 if (prot & (PROT_UDPv4 | PROT_TCPv4)) 151 if (prot & (PROT_IPv4 | PROT_ICMPv4 | PROT_UDPv4 | PROT_TCPv4))
116 protocols |= PROT_IPv4 | PROT_ICMPv4; 152 protocols |= PROT_IPv4 | PROT_ICMPv4;
117 153
118 if (conf
119 && prot & PROTv4 154 if (conf && prot & PROTv4)
120 && conf->protocols & PROT_UDPv4 155 {
121 && conf->udp_port) 156 if (conf->protocols & PROT_UDPv4 && conf->udp_port)
122 protocols |= PROT_UDPv4; 157 protocols |= PROT_UDPv4;
123 158
124 if (conf 159 if (conf->protocols & PROT_TCPv4 && conf->tcp_port)
125 && prot & PROTv4
126 && conf->protocols & PROT_TCPv4
127 && conf->tcp_port)
128 protocols |= PROT_TCPv4; 160 protocols |= PROT_TCPv4;
129 161
130 if (conf 162 if (conf->protocols & PROT_DNSv4 && conf->dns_port)
131 && prot & PROTv4
132 && conf->protocols & PROT_DNSv4
133 && conf->dns_port)
134 protocols |= PROT_DNSv4; 163 protocols |= PROT_DNSv4;
164 }
135 165
136 return protocols; 166 return protocols;
137} 167}
138 168
139bool 169bool
… …
169 { 199 {
170 prot = prot_; 200 prot = prot_;
171 port = htons (conf->tcp_port); 201 port = htons (conf->tcp_port);
172 return true; 202 return true;
173 } 203 }
174
175#if ENABLE_DNS
176 if (conf
177 && prot_ & PROT_DNSv4
178 && conf->protocols & PROT_DNSv4
179 && conf->dns_port)
180 {
181 set (::conf.dns_forw_host, ::conf.dns_forw_port, prot_);
182 return true;
183 }
184#endif
185 } 204 }
186 205
187 return false; 206 return false;
188} 207}
189 208

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines