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.29 by root, Tue Dec 4 13:49:16 2012 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
34// for gethostbyname
35#include <netdb.h>
36
37// for inet_aton
38#include <sys/socket.h>
39#include <netinet/in.h>
21#include <arpa/inet.h> 40#include <arpa/inet.h>
22#include <netdb.h>
23 41
24#include "gettext.h" 42#include "gettext.h"
25 43
26#include "sockinfo.h" 44#include "sockinfo.h"
27#include "slog.h" 45#include "slog.h"
28 46
47#include <cstring>
48#include <cstdio>
49
50// all ipv4-based protocols
51#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4)
52
53void
29void sockinfo::set (const sockaddr_in *sa, u8 prot_) 54sockinfo::set (const sockaddr_in *sa, u8 prot_)
30{ 55{
31 host = sa->sin_addr.s_addr; 56 host = sa->sin_addr.s_addr;
32 port = prot_ == PROT_IPv4 ? 0 : sa->sin_port; 57 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port;
33 prot = prot_; 58 prot = prot_;
34} 59}
35 60
61void
36void sockinfo::set (const char *hostname, u16 port_, u8 prot_) 62sockinfo::set (const char *hostname, u16 port_, u8 prot_)
37{ 63{
38 prot = prot_; 64 prot = prot_;
39 host = 0; 65 host = 0;
40 port = htons (port_); 66 port = htons (port_);
41 67
42 if (prot & (PROT_UDPv4 | PROT_TCPv4 | PROT_IPv4) 68 if (prot & PROTv4
43 && hostname) 69 && hostname)
44 { 70 {
71 struct in_addr in;
72 struct hostent *he;
73
74 if (inet_aton (hostname, &in))
75 {
76 host = in.s_addr;
77 }
45 struct hostent *he = gethostbyname (hostname); 78 else if ((he = gethostbyname (hostname))
46 79 && he->h_addrtype == AF_INET
47 if (he 80 && he->h_length == 4
48 && he->h_addrtype == AF_INET && he->h_length == 4 && he->h_addr_list[0]) 81 && he->h_addr_list[0])
49 { 82 {
50 //sa->sin_family = he->h_addrtype; 83 //sa->sin_family = he->h_addrtype;
51 memcpy (&host, he->h_addr_list[0], 4); 84 memcpy (&host, he->h_addr_list[0], 4);
52 } 85 }
53 else 86 else
… …
56} 89}
57 90
58void 91void
59sockinfo::set (const conf_node *conf, u8 prot_) 92sockinfo::set (const conf_node *conf, u8 prot_)
60{ 93{
94 if (prot_ == PROT_DNSv4)
95 {
96 host = htonl (conf->id); port = 0; prot = prot_;
97 }
98 else
61 set (conf->hostname, 99 set (conf->hostname,
62 prot_ == PROT_UDPv4 ? conf->udp_port 100 prot_ == PROT_UDPv4 ? conf->udp_port
63 : prot_ == PROT_TCPv4 ? conf->tcp_port 101 : prot_ == PROT_TCPv4 ? conf->tcp_port
102 : prot_ == PROT_DNSv4 ? conf->dns_port
64 : 0, 103 : 0,
65 prot_); 104 prot_);
66} 105}
67 106
68const sockaddr * 107const sockaddr *
69sockinfo::sav4() const 108sockinfo::sav4() const
70{ 109{
… …
87 sprintf (hostport, "%.15s", inet_ntoa (ia)); 126 sprintf (hostport, "%.15s", inet_ntoa (ia));
88 127
89 return hostport; 128 return hostport;
90} 129}
91 130
131bool
132sockinfo::valid () const
133{
134 return (prot & THISNODE->protocols) && host;
135}
136
92sockinfo::operator const char *() const 137sockinfo::operator const char *() const
93{ 138{
94 in_addr ia = { host }; 139 in_addr ia = { host };
95 140
96 sprintf (hostport, "%s/%.15s:%d", strprotocol (prot), inet_ntoa (ia), ntohs (port) & 0xffff); 141 sprintf (hostport, "%s/%.15s:%d", strprotocol (prot), inet_ntoa (ia), ntohs (port) & 0xffff);
… …
101u8 146u8
102sockinfo::supported_protocols (conf_node *conf) 147sockinfo::supported_protocols (conf_node *conf)
103{ 148{
104 u8 protocols = prot; 149 u8 protocols = prot;
105 150
106 if (prot & (PROT_UDPv4 | PROT_TCPv4)) 151 if (prot & (PROT_IPv4 | PROT_ICMPv4 | PROT_UDPv4 | PROT_TCPv4))
107 protocols |= PROT_IPv4; 152 protocols |= PROT_IPv4 | PROT_ICMPv4;
108 153
109 if (conf 154 if (conf && prot & PROTv4)
110 && prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4) 155 {
111 && conf->protocols & PROT_UDPv4 156 if (conf->protocols & PROT_UDPv4 && conf->udp_port)
112 && conf->udp_port)
113 protocols |= PROT_UDPv4; 157 protocols |= PROT_UDPv4;
114 158
115 if (conf 159 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; 160 protocols |= PROT_TCPv4;
161
162 if (conf->protocols & PROT_DNSv4 && conf->dns_port)
163 protocols |= PROT_DNSv4;
164 }
120 165
121 return protocols; 166 return protocols;
122} 167}
123 168
124bool 169bool
125sockinfo::upgrade_protocol (u8 prot_, conf_node *conf) 170sockinfo::upgrade_protocol (u8 prot_, conf_node *conf)
126{ 171{
127 if (prot_ == prot) 172 if (prot_ == prot)
128 return true; 173 return true;
129 174
130 if (prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4)
131 && prot_ & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4))
132 {
133 if (prot_ & PROT_IPv4) 175 if (prot & PROTv4
176 && prot_ & PROTv4)
177 {
178 if (prot_ & (PROT_IPv4 | PROT_ICMPv4))
134 { 179 {
135 prot = prot_; 180 prot = prot_;
136 port = 0; 181 port = 0;
137 return true; 182 return true;
138 } 183 }

Diff Legend

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