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.8 by pcg, Mon Apr 7 01:12:56 2003 UTC vs.
Revision 1.23 by pcg, Thu Aug 7 17:54:27 2008 UTC

1/* 1/*
2 sockinfo.C -- socket address management 2 sockinfo.C -- socket address management
3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
3 4
5 This file is part of GVPE.
6
4 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
5 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
6 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
7 (at your option) any later version. 10 option) any later version.
8 11
9 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
10 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
12 GNU General Public License for more details. 15 Public License for more details.
13 16
14 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
15 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
16 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.
17*/ 30*/
18 31
19#include "config.h" 32#include "config.h"
20 33
21#include <arpa/inet.h>
22#include <netdb.h> 34#include <netdb.h>
23 35
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
44// all ipv4-based protocols
45#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4)
46
29void sockinfo::set (const sockaddr_in *sa, u8 prot_) 47void sockinfo::set (const sockaddr_in *sa, u8 prot_)
30{ 48{
31 host = sa->sin_addr.s_addr; 49 host = sa->sin_addr.s_addr;
32 port = prot_ == PROT_IPv4 ? 0 : sa->sin_port; 50 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port;
33 prot = prot_; 51 prot = prot_;
34} 52}
35 53
36void sockinfo::set (const char *hostname, u16 port_, u8 prot_) 54void sockinfo::set (const char *hostname, u16 port_, u8 prot_)
37{ 55{
38 prot = prot_; 56 prot = prot_;
39 host = 0; 57 host = 0;
40 port = htons (port_); 58 port = htons (port_);
41 59
42 if (prot & (PROT_UDPv4 | PROT_TCPv4 | PROT_IPv4) 60 if (prot & PROTv4
43 && hostname) 61 && hostname)
44 { 62 {
45 struct hostent *he = gethostbyname (hostname); 63 struct hostent *he = gethostbyname (hostname);
46 64
47 if (he 65 if (he
… …
56} 74}
57 75
58void 76void
59sockinfo::set (const conf_node *conf, u8 prot_) 77sockinfo::set (const conf_node *conf, u8 prot_)
60{ 78{
79 if (prot_ == PROT_DNSv4)
80 {
81 host = htonl (conf->id); port = 0; prot = prot_;
82 }
83 else
61 set (conf->hostname, 84 set (conf->hostname,
62 prot_ == PROT_UDPv4 ? conf->udp_port 85 prot_ == PROT_UDPv4 ? conf->udp_port
63 : prot_ == PROT_TCPv4 ? conf->tcp_port 86 : prot_ == PROT_TCPv4 ? conf->tcp_port
87 : prot_ == PROT_DNSv4 ? conf->dns_port
64 : 0, 88 : 0,
65 prot_); 89 prot_);
66} 90}
67 91
68const sockaddr * 92const sockaddr *
69sockinfo::sav4() const 93sockinfo::sav4() const
70{ 94{
… …
102sockinfo::supported_protocols (conf_node *conf) 126sockinfo::supported_protocols (conf_node *conf)
103{ 127{
104 u8 protocols = prot; 128 u8 protocols = prot;
105 129
106 if (prot & (PROT_UDPv4 | PROT_TCPv4)) 130 if (prot & (PROT_UDPv4 | PROT_TCPv4))
107 protocols |= PROT_IPv4; 131 protocols |= PROT_IPv4 | PROT_ICMPv4;
108 132
109 if (conf 133 if (conf
110 && prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4) 134 && prot & PROTv4
111 && conf->protocols & PROT_UDPv4 135 && conf->protocols & PROT_UDPv4
112 && conf->udp_port) 136 && conf->udp_port)
113 protocols |= PROT_UDPv4; 137 protocols |= PROT_UDPv4;
114 138
115 if (conf 139 if (conf
116 && prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4) 140 && prot & PROTv4
117 && conf->protocols & PROT_TCPv4 141 && conf->protocols & PROT_TCPv4
118 && conf->tcp_port) 142 && conf->tcp_port)
119 protocols |= PROT_TCPv4; 143 protocols |= PROT_TCPv4;
120 144
145 if (conf
146 && prot & PROTv4
147 && conf->protocols & PROT_DNSv4
148 && conf->dns_port)
149 protocols |= PROT_DNSv4;
150
121 return protocols; 151 return protocols;
122} 152}
123 153
124bool 154bool
125sockinfo::upgrade_protocol (u8 prot_, conf_node *conf) 155sockinfo::upgrade_protocol (u8 prot_, conf_node *conf)
126{ 156{
127 if (prot_ == prot) 157 if (prot_ == prot)
128 return true; 158 return true;
129 159
130 if (prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4) 160 if (prot & PROTv4
131 && prot_ & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4)) 161 && prot_ & PROTv4)
132 { 162 {
133 if (prot_ & PROT_IPv4) 163 if (prot_ & (PROT_IPv4 | PROT_ICMPv4))
134 { 164 {
135 prot = prot_; 165 prot = prot_;
136 port = 0; 166 port = 0;
137 return true; 167 return true;
138 } 168 }

Diff Legend

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