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.14 by pcg, Thu Mar 3 07:24:57 2005 UTC vs.
Revision 1.28 by root, Tue Jan 17 21:38:11 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
22#include <netdb.h> 34#include <netdb.h>
… …
24#include "gettext.h" 36#include "gettext.h"
25 37
26#include "sockinfo.h" 38#include "sockinfo.h"
27#include "slog.h" 39#include "slog.h"
28 40
41#include <cstring>
42#include <cstdio>
43
29// all ipv4-based protocols 44// all ipv4-based protocols
30#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4) 45#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4)
31 46
47void
32void sockinfo::set (const sockaddr_in *sa, u8 prot_) 48sockinfo::set (const sockaddr_in *sa, u8 prot_)
33{ 49{
34 host = sa->sin_addr.s_addr; 50 host = sa->sin_addr.s_addr;
35 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port; 51 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port;
36 prot = prot_; 52 prot = prot_;
37} 53}
38 54
55void
39void sockinfo::set (const char *hostname, u16 port_, u8 prot_) 56sockinfo::set (const char *hostname, u16 port_, u8 prot_)
40{ 57{
41 prot = prot_; 58 prot = prot_;
42 host = 0; 59 host = 0;
43 port = htons (port_); 60 port = htons (port_);
44 61
… …
60 77
61void 78void
62sockinfo::set (const conf_node *conf, u8 prot_) 79sockinfo::set (const conf_node *conf, u8 prot_)
63{ 80{
64 if (prot_ == PROT_DNSv4) 81 if (prot_ == PROT_DNSv4)
65 set (conf->dns_hostname, conf->dns_hostname ? conf->dns_port : 0, prot_); 82 {
83 host = htonl (conf->id); port = 0; prot = prot_;
84 }
66 else 85 else
67 set (conf->hostname, 86 set (conf->hostname,
68 prot_ == PROT_UDPv4 ? conf->udp_port 87 prot_ == PROT_UDPv4 ? conf->udp_port
69 : prot_ == PROT_TCPv4 ? conf->tcp_port 88 : prot_ == PROT_TCPv4 ? conf->tcp_port
70 : prot_ == PROT_DNSv4 ? conf->dns_port 89 : prot_ == PROT_DNSv4 ? conf->dns_port
… …
94 sprintf (hostport, "%.15s", inet_ntoa (ia)); 113 sprintf (hostport, "%.15s", inet_ntoa (ia));
95 114
96 return hostport; 115 return hostport;
97} 116}
98 117
118bool
119sockinfo::valid () const
120{
121 return (prot & THISNODE->protocols) && host;
122}
123
99sockinfo::operator const char *() const 124sockinfo::operator const char *() const
100{ 125{
101 in_addr ia = { host }; 126 in_addr ia = { host };
102 127
103 sprintf (hostport, "%s/%.15s:%d", strprotocol (prot), inet_ntoa (ia), ntohs (port) & 0xffff); 128 sprintf (hostport, "%s/%.15s:%d", strprotocol (prot), inet_ntoa (ia), ntohs (port) & 0xffff);
… …
108u8 133u8
109sockinfo::supported_protocols (conf_node *conf) 134sockinfo::supported_protocols (conf_node *conf)
110{ 135{
111 u8 protocols = prot; 136 u8 protocols = prot;
112 137
113 if (prot & (PROT_UDPv4 | PROT_TCPv4)) 138 if (prot & (PROT_IPv4 | PROT_ICMPv4 | PROT_UDPv4 | PROT_TCPv4))
114 protocols |= PROT_IPv4 | PROT_ICMPv4; 139 protocols |= PROT_IPv4 | PROT_ICMPv4;
115 140
116 if (conf
117 && prot & PROTv4 141 if (conf && prot & PROTv4)
118 && conf->protocols & PROT_UDPv4 142 {
119 && conf->udp_port) 143 if (conf->protocols & PROT_UDPv4 && conf->udp_port)
120 protocols |= PROT_UDPv4; 144 protocols |= PROT_UDPv4;
121 145
122 if (conf 146 if (conf->protocols & PROT_TCPv4 && conf->tcp_port)
123 && prot & PROTv4
124 && conf->protocols & PROT_TCPv4
125 && conf->tcp_port)
126 protocols |= PROT_TCPv4; 147 protocols |= PROT_TCPv4;
127 148
128 if (conf 149 if (conf->protocols & PROT_DNSv4 && conf->dns_port)
129 && prot & PROTv4
130 && conf->protocols & PROT_DNSv4
131 && conf->dns_port)
132 protocols |= PROT_DNSv4; 150 protocols |= PROT_DNSv4;
151 }
133 152
134 return protocols; 153 return protocols;
135} 154}
136 155
137bool 156bool
… …
167 { 186 {
168 prot = prot_; 187 prot = prot_;
169 port = htons (conf->tcp_port); 188 port = htons (conf->tcp_port);
170 return true; 189 return true;
171 } 190 }
172
173#if ENABLE_DNS
174 if (conf
175 && prot_ & PROT_DNSv4
176 && conf->protocols & PROT_DNSv4
177 && conf->dns_port)
178 {
179 set (::conf.dns_forw_host, ::conf.dns_forw_port, prot_);
180 return true;
181 }
182#endif
183 } 191 }
184 192
185 return false; 193 return false;
186} 194}
187 195

Diff Legend

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