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.13 by pcg, Tue Mar 1 06:27:20 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 <pcg@goof.com> 3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
6 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
7 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
8 (at your option) any later version. 10 option) any later version.
9 11
10 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
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
13 GNU General Public License for more details. 15 Public License for more details.
14 16
15 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
16 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
17 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.
18*/ 30*/
19 31
20#include "config.h" 32#include "config.h"
21 33
34// for gethostbyname
22#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>
23 41
24#include "gettext.h" 42#include "gettext.h"
25 43
26#include "sockinfo.h" 44#include "sockinfo.h"
27#include "slog.h" 45#include "slog.h"
28 46
47#include <cstring>
48#include <cstdio>
49
29// all ipv4-based protocols 50// all ipv4-based protocols
30#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)
31 52
53void
32void sockinfo::set (const sockaddr_in *sa, u8 prot_) 54sockinfo::set (const sockaddr_in *sa, u8 prot_)
33{ 55{
34 host = sa->sin_addr.s_addr; 56 host = sa->sin_addr.s_addr;
35 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port; 57 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port;
36 prot = prot_; 58 prot = prot_;
37} 59}
38 60
61void
39void sockinfo::set (const char *hostname, u16 port_, u8 prot_) 62sockinfo::set (const char *hostname, u16 port_, u8 prot_)
40{ 63{
41 prot = prot_; 64 prot = prot_;
42 host = 0; 65 host = 0;
43 port = htons (port_); 66 port = htons (port_);
44 67
45 if (prot & PROTv4 68 if (prot & PROTv4
46 && hostname) 69 && hostname)
47 { 70 {
71 struct in_addr in;
72 struct hostent *he;
73
74 if (inet_aton (hostname, &in))
75 {
76 host = in.s_addr;
77 }
48 struct hostent *he = gethostbyname (hostname); 78 else if ((he = gethostbyname (hostname))
49 79 && he->h_addrtype == AF_INET
50 if (he 80 && he->h_length == 4
51 && he->h_addrtype == AF_INET && he->h_length == 4 && he->h_addr_list[0]) 81 && he->h_addr_list[0])
52 { 82 {
53 //sa->sin_family = he->h_addrtype; 83 //sa->sin_family = he->h_addrtype;
54 memcpy (&host, he->h_addr_list[0], 4); 84 memcpy (&host, he->h_addr_list[0], 4);
55 } 85 }
56 else 86 else
… …
59} 89}
60 90
61void 91void
62sockinfo::set (const conf_node *conf, u8 prot_) 92sockinfo::set (const conf_node *conf, u8 prot_)
63{ 93{
64 set (prot_ == PROT_DNSv4 ? ::conf.dns_forw_host 94 if (prot_ == PROT_DNSv4)
65 : conf->hostname, 95 {
96 host = htonl (conf->id); port = 0; prot = prot_;
97 }
98 else
99 set (conf->hostname,
66 prot_ == PROT_UDPv4 ? conf->udp_port 100 prot_ == PROT_UDPv4 ? conf->udp_port
67 : prot_ == PROT_TCPv4 ? conf->tcp_port 101 : prot_ == PROT_TCPv4 ? conf->tcp_port
68 : prot_ == PROT_DNSv4 ? conf->dns_port 102 : prot_ == PROT_DNSv4 ? conf->dns_port
69 : 0, 103 : 0,
70 prot_); 104 prot_);
71} 105}
72 106
73const sockaddr * 107const sockaddr *
74sockinfo::sav4() const 108sockinfo::sav4() const
75{ 109{
… …
92 sprintf (hostport, "%.15s", inet_ntoa (ia)); 126 sprintf (hostport, "%.15s", inet_ntoa (ia));
93 127
94 return hostport; 128 return hostport;
95} 129}
96 130
131bool
132sockinfo::valid () const
133{
134 return (prot & THISNODE->protocols) && host;
135}
136
97sockinfo::operator const char *() const 137sockinfo::operator const char *() const
98{ 138{
99 in_addr ia = { host }; 139 in_addr ia = { host };
100 140
101 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);
… …
106u8 146u8
107sockinfo::supported_protocols (conf_node *conf) 147sockinfo::supported_protocols (conf_node *conf)
108{ 148{
109 u8 protocols = prot; 149 u8 protocols = prot;
110 150
111 if (prot & (PROT_UDPv4 | PROT_TCPv4)) 151 if (prot & (PROT_IPv4 | PROT_ICMPv4 | PROT_UDPv4 | PROT_TCPv4))
112 protocols |= PROT_IPv4 | PROT_ICMPv4; 152 protocols |= PROT_IPv4 | PROT_ICMPv4;
113 153
114 if (conf
115 && prot & PROTv4 154 if (conf && prot & PROTv4)
116 && conf->protocols & PROT_UDPv4 155 {
117 && conf->udp_port) 156 if (conf->protocols & PROT_UDPv4 && conf->udp_port)
118 protocols |= PROT_UDPv4; 157 protocols |= PROT_UDPv4;
119 158
120 if (conf 159 if (conf->protocols & PROT_TCPv4 && conf->tcp_port)
121 && prot & PROTv4
122 && conf->protocols & PROT_TCPv4
123 && conf->tcp_port)
124 protocols |= PROT_TCPv4; 160 protocols |= PROT_TCPv4;
125 161
126 if (conf 162 if (conf->protocols & PROT_DNSv4 && conf->dns_port)
127 && prot & PROTv4
128 && conf->protocols & PROT_DNSv4
129 && conf->dns_port)
130 protocols |= PROT_DNSv4; 163 protocols |= PROT_DNSv4;
164 }
131 165
132 return protocols; 166 return protocols;
133} 167}
134 168
135bool 169bool
… …
165 { 199 {
166 prot = prot_; 200 prot = prot_;
167 port = htons (conf->tcp_port); 201 port = htons (conf->tcp_port);
168 return true; 202 return true;
169 } 203 }
170
171 if (conf
172 && prot_ & PROT_DNSv4
173 && conf->protocols & PROT_DNSv4
174 && conf->dns_port)
175 {
176 set (::conf.dns_forw_host, ::conf.dns_forw_port, prot_);
177 return true;
178 }
179 } 204 }
180 205
181 return false; 206 return false;
182} 207}
183 208

Diff Legend

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