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.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-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
47void
29void sockinfo::set (const sockaddr_in *sa, u8 prot_) 48sockinfo::set (const sockaddr_in *sa, u8 prot_)
30{ 49{
31 host = sa->sin_addr.s_addr; 50 host = sa->sin_addr.s_addr;
32 port = prot_ == PROT_IPv4 ? 0 : sa->sin_port; 51 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port;
33 prot = prot_; 52 prot = prot_;
34} 53}
35 54
55void
36void sockinfo::set (const char *hostname, u16 port_, u8 prot_) 56sockinfo::set (const char *hostname, u16 port_, u8 prot_)
37{ 57{
38 prot = prot_; 58 prot = prot_;
39 host = 0; 59 host = 0;
40 port = htons (port_); 60 port = htons (port_);
41 61
42 if (prot & (PROT_UDPv4 | PROT_TCPv4 | PROT_IPv4) 62 if (prot & PROTv4
43 && hostname) 63 && hostname)
44 { 64 {
45 struct hostent *he = gethostbyname (hostname); 65 struct hostent *he = gethostbyname (hostname);
46 66
47 if (he 67 if (he
… …
56} 76}
57 77
58void 78void
59sockinfo::set (const conf_node *conf, u8 prot_) 79sockinfo::set (const conf_node *conf, u8 prot_)
60{ 80{
81 if (prot_ == PROT_DNSv4)
82 {
83 host = htonl (conf->id); port = 0; prot = prot_;
84 }
85 else
61 set (conf->hostname, 86 set (conf->hostname,
62 prot_ == PROT_UDPv4 ? conf->udp_port 87 prot_ == PROT_UDPv4 ? conf->udp_port
63 : prot_ == PROT_TCPv4 ? conf->tcp_port 88 : prot_ == PROT_TCPv4 ? conf->tcp_port
89 : prot_ == PROT_DNSv4 ? conf->dns_port
64 : 0, 90 : 0,
65 prot_); 91 prot_);
66} 92}
67 93
68const sockaddr * 94const sockaddr *
69sockinfo::sav4() const 95sockinfo::sav4() const
70{ 96{
… …
101u8 127u8
102sockinfo::supported_protocols (conf_node *conf) 128sockinfo::supported_protocols (conf_node *conf)
103{ 129{
104 u8 protocols = prot; 130 u8 protocols = prot;
105 131
106 if (prot & (PROT_UDPv4 | PROT_TCPv4)) 132 if (prot & (PROT_IPv4 | PROT_ICMPv4 | PROT_UDPv4 | PROT_TCPv4))
107 protocols |= PROT_IPv4; 133 protocols |= PROT_IPv4 | PROT_ICMPv4;
108 134
109 if (conf 135 if (conf && prot & PROTv4)
110 && prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4) 136 {
111 && conf->protocols & PROT_UDPv4 137 if (conf->protocols & PROT_UDPv4 && conf->udp_port)
112 && conf->udp_port)
113 protocols |= PROT_UDPv4; 138 protocols |= PROT_UDPv4;
114 139
115 if (conf 140 if (conf->protocols & PROT_TCPv4 && conf->tcp_port)
116 && prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4)
117 && conf->protocols & PROT_TCPv4
118 && conf->tcp_port)
119 protocols |= PROT_TCPv4; 141 protocols |= PROT_TCPv4;
142
143 if (conf->protocols & PROT_DNSv4 && conf->dns_port)
144 protocols |= PROT_DNSv4;
145 }
120 146
121 return protocols; 147 return protocols;
122} 148}
123 149
124bool 150bool
125sockinfo::upgrade_protocol (u8 prot_, conf_node *conf) 151sockinfo::upgrade_protocol (u8 prot_, conf_node *conf)
126{ 152{
127 if (prot_ == prot) 153 if (prot_ == prot)
128 return true; 154 return true;
129 155
130 if (prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4)
131 && prot_ & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4))
132 {
133 if (prot_ & PROT_IPv4) 156 if (prot & PROTv4
157 && prot_ & PROTv4)
158 {
159 if (prot_ & (PROT_IPv4 | PROT_ICMPv4))
134 { 160 {
135 prot = prot_; 161 prot = prot_;
136 port = 0; 162 port = 0;
137 return true; 163 return true;
138 } 164 }

Diff Legend

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