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.30 by root, Tue Dec 4 13:51:45 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 host = in.s_addr;
45 struct hostent *he = gethostbyname (hostname); 76 else if ((he = gethostbyname (hostname))
46 77 && he->h_addrtype == AF_INET
47 if (he 78 && he->h_length == 4
48 && he->h_addrtype == AF_INET && he->h_length == 4 && he->h_addr_list[0]) 79 && he->h_addr_list[0])
49 { 80 memcpy (&host, he->h_addr_list[0], 4); //sa->sin_family = he->h_addrtype;
50 //sa->sin_family = he->h_addrtype;
51 memcpy (&host, he->h_addr_list[0], 4);
52 }
53 else 81 else
54 slog (L_NOTICE, _("unable to resolve host '%s'"), hostname); 82 slog (L_NOTICE, _("unable to resolve host '%s'"), hostname);
55 } 83 }
56} 84}
57 85
58void 86void
59sockinfo::set (const conf_node *conf, u8 prot_) 87sockinfo::set (const conf_node *conf, u8 prot_)
60{ 88{
89 if (prot_ == PROT_DNSv4)
90 {
91 host = htonl (conf->id); port = 0; prot = prot_;
92 }
93 else
61 set (conf->hostname, 94 set (conf->hostname,
62 prot_ == PROT_UDPv4 ? conf->udp_port 95 prot_ == PROT_UDPv4 ? conf->udp_port
63 : prot_ == PROT_TCPv4 ? conf->tcp_port 96 : prot_ == PROT_TCPv4 ? conf->tcp_port
97 : prot_ == PROT_DNSv4 ? conf->dns_port
64 : 0, 98 : 0,
65 prot_); 99 prot_);
66} 100}
67 101
68const sockaddr * 102const sockaddr *
69sockinfo::sav4() const 103sockinfo::sav4() const
70{ 104{
… …
87 sprintf (hostport, "%.15s", inet_ntoa (ia)); 121 sprintf (hostport, "%.15s", inet_ntoa (ia));
88 122
89 return hostport; 123 return hostport;
90} 124}
91 125
126bool
127sockinfo::valid () const
128{
129 return (prot & THISNODE->protocols) && host;
130}
131
92sockinfo::operator const char *() const 132sockinfo::operator const char *() const
93{ 133{
94 in_addr ia = { host }; 134 in_addr ia = { host };
95 135
96 sprintf (hostport, "%s/%.15s:%d", strprotocol (prot), inet_ntoa (ia), ntohs (port) & 0xffff); 136 sprintf (hostport, "%s/%.15s:%d", strprotocol (prot), inet_ntoa (ia), ntohs (port) & 0xffff);
… …
101u8 141u8
102sockinfo::supported_protocols (conf_node *conf) 142sockinfo::supported_protocols (conf_node *conf)
103{ 143{
104 u8 protocols = prot; 144 u8 protocols = prot;
105 145
106 if (prot & (PROT_UDPv4 | PROT_TCPv4)) 146 if (prot & (PROT_IPv4 | PROT_ICMPv4 | PROT_UDPv4 | PROT_TCPv4))
107 protocols |= PROT_IPv4; 147 protocols |= PROT_IPv4 | PROT_ICMPv4;
108 148
109 if (conf 149 if (conf && prot & PROTv4)
110 && prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4) 150 {
111 && conf->protocols & PROT_UDPv4 151 if (conf->protocols & PROT_UDPv4 && conf->udp_port)
112 && conf->udp_port)
113 protocols |= PROT_UDPv4; 152 protocols |= PROT_UDPv4;
114 153
115 if (conf 154 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; 155 protocols |= PROT_TCPv4;
156
157 if (conf->protocols & PROT_DNSv4 && conf->dns_port)
158 protocols |= PROT_DNSv4;
159 }
120 160
121 return protocols; 161 return protocols;
122} 162}
123 163
124bool 164bool
125sockinfo::upgrade_protocol (u8 prot_, conf_node *conf) 165sockinfo::upgrade_protocol (u8 prot_, conf_node *conf)
126{ 166{
127 if (prot_ == prot) 167 if (prot_ == prot)
128 return true; 168 return true;
129 169
130 if (prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4)
131 && prot_ & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4))
132 {
133 if (prot_ & PROT_IPv4) 170 if (prot & PROTv4
171 && prot_ & PROTv4)
172 {
173 if (prot_ & (PROT_IPv4 | PROT_ICMPv4))
134 { 174 {
135 prot = prot_; 175 prot = prot_;
136 port = 0; 176 port = 0;
137 return true; 177 return true;
138 } 178 }

Diff Legend

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