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.25 by root, Thu Mar 24 21:52:49 2011 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
24#include <netdb.h> 34#include <netdb.h>
… …
26#include "gettext.h" 36#include "gettext.h"
27 37
28#include "sockinfo.h" 38#include "sockinfo.h"
29#include "slog.h" 39#include "slog.h"
30 40
41#include <cstring>
42#include <cstdio>
43
31// all ipv4-based protocols 44// all ipv4-based protocols
32#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)
33 46
47void
34void sockinfo::set (const sockaddr_in *sa, u8 prot_) 48sockinfo::set (const sockaddr_in *sa, u8 prot_)
35{ 49{
36 host = sa->sin_addr.s_addr; 50 host = sa->sin_addr.s_addr;
37 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port; 51 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port;
38 prot = prot_; 52 prot = prot_;
39} 53}
40 54
55void
41void sockinfo::set (const char *hostname, u16 port_, u8 prot_) 56sockinfo::set (const char *hostname, u16 port_, u8 prot_)
42{ 57{
43 prot = prot_; 58 prot = prot_;
44 host = 0; 59 host = 0;
45 port = htons (port_); 60 port = htons (port_);
46 61
… …
62 77
63void 78void
64sockinfo::set (const conf_node *conf, u8 prot_) 79sockinfo::set (const conf_node *conf, u8 prot_)
65{ 80{
66 if (prot_ == PROT_DNSv4) 81 if (prot_ == PROT_DNSv4)
67 set (conf->dns_hostname, conf->dns_hostname ? conf->dns_port : 0, prot_); 82 {
83 host = htonl (conf->id); port = 0; prot = prot_;
84 }
68 else 85 else
69 set (conf->hostname, 86 set (conf->hostname,
70 prot_ == PROT_UDPv4 ? conf->udp_port 87 prot_ == PROT_UDPv4 ? conf->udp_port
71 : prot_ == PROT_TCPv4 ? conf->tcp_port 88 : prot_ == PROT_TCPv4 ? conf->tcp_port
72 : prot_ == PROT_DNSv4 ? conf->dns_port 89 : prot_ == PROT_DNSv4 ? conf->dns_port
… …
110u8 127u8
111sockinfo::supported_protocols (conf_node *conf) 128sockinfo::supported_protocols (conf_node *conf)
112{ 129{
113 u8 protocols = prot; 130 u8 protocols = prot;
114 131
115 if (prot & (PROT_UDPv4 | PROT_TCPv4)) 132 if (prot & (PROT_IPv4 | PROT_ICMPv4 | PROT_UDPv4 | PROT_TCPv4))
116 protocols |= PROT_IPv4 | PROT_ICMPv4; 133 protocols |= PROT_IPv4 | PROT_ICMPv4;
117 134
118 if (conf
119 && prot & PROTv4 135 if (conf && prot & PROTv4)
120 && conf->protocols & PROT_UDPv4 136 {
121 && conf->udp_port) 137 if (conf->protocols & PROT_UDPv4 && conf->udp_port)
122 protocols |= PROT_UDPv4; 138 protocols |= PROT_UDPv4;
123 139
124 if (conf 140 if (conf->protocols & PROT_TCPv4 && conf->tcp_port)
125 && prot & PROTv4
126 && conf->protocols & PROT_TCPv4
127 && conf->tcp_port)
128 protocols |= PROT_TCPv4; 141 protocols |= PROT_TCPv4;
129 142
130 if (conf 143 if (conf->protocols & PROT_DNSv4 && conf->dns_port)
131 && prot & PROTv4
132 && conf->protocols & PROT_DNSv4
133 && conf->dns_port)
134 protocols |= PROT_DNSv4; 144 protocols |= PROT_DNSv4;
145 }
135 146
136 return protocols; 147 return protocols;
137} 148}
138 149
139bool 150bool
… …
169 { 180 {
170 prot = prot_; 181 prot = prot_;
171 port = htons (conf->tcp_port); 182 port = htons (conf->tcp_port);
172 return true; 183 return true;
173 } 184 }
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 } 185 }
186 186
187 return false; 187 return false;
188} 188}
189 189

Diff Legend

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