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.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 <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
… …
59} 76}
60 77
61void 78void
62sockinfo::set (const conf_node *conf, u8 prot_) 79sockinfo::set (const conf_node *conf, u8 prot_)
63{ 80{
64 set (prot_ == PROT_DNSv4 ? ::conf.dns_forw_host 81 if (prot_ == PROT_DNSv4)
65 : conf->hostname, 82 {
83 host = htonl (conf->id); port = 0; prot = prot_;
84 }
85 else
86 set (conf->hostname,
66 prot_ == PROT_UDPv4 ? conf->udp_port 87 prot_ == PROT_UDPv4 ? conf->udp_port
67 : prot_ == PROT_TCPv4 ? conf->tcp_port 88 : prot_ == PROT_TCPv4 ? conf->tcp_port
68 : prot_ == PROT_DNSv4 ? conf->dns_port 89 : prot_ == PROT_DNSv4 ? conf->dns_port
69 : 0, 90 : 0,
70 prot_); 91 prot_);
71} 92}
72 93
73const sockaddr * 94const sockaddr *
74sockinfo::sav4() const 95sockinfo::sav4() const
75{ 96{
… …
106u8 127u8
107sockinfo::supported_protocols (conf_node *conf) 128sockinfo::supported_protocols (conf_node *conf)
108{ 129{
109 u8 protocols = prot; 130 u8 protocols = prot;
110 131
111 if (prot & (PROT_UDPv4 | PROT_TCPv4)) 132 if (prot & (PROT_IPv4 | PROT_ICMPv4 | PROT_UDPv4 | PROT_TCPv4))
112 protocols |= PROT_IPv4 | PROT_ICMPv4; 133 protocols |= PROT_IPv4 | PROT_ICMPv4;
113 134
114 if (conf
115 && prot & PROTv4 135 if (conf && prot & PROTv4)
116 && conf->protocols & PROT_UDPv4 136 {
117 && conf->udp_port) 137 if (conf->protocols & PROT_UDPv4 && conf->udp_port)
118 protocols |= PROT_UDPv4; 138 protocols |= PROT_UDPv4;
119 139
120 if (conf 140 if (conf->protocols & PROT_TCPv4 && conf->tcp_port)
121 && prot & PROTv4
122 && conf->protocols & PROT_TCPv4
123 && conf->tcp_port)
124 protocols |= PROT_TCPv4; 141 protocols |= PROT_TCPv4;
125 142
126 if (conf 143 if (conf->protocols & PROT_DNSv4 && conf->dns_port)
127 && prot & PROTv4
128 && conf->protocols & PROT_DNSv4
129 && conf->dns_port)
130 protocols |= PROT_DNSv4; 144 protocols |= PROT_DNSv4;
145 }
131 146
132 return protocols; 147 return protocols;
133} 148}
134 149
135bool 150bool
… …
165 { 180 {
166 prot = prot_; 181 prot = prot_;
167 port = htons (conf->tcp_port); 182 port = htons (conf->tcp_port);
168 return true; 183 return true;
169 } 184 }
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 } 185 }
180 186
181 return false; 187 return false;
182} 188}
183 189

Diff Legend

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