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.4 by pcg, Sat Apr 5 02:32:40 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_;
52}
53
54void sockinfo::set (const char *hostname, u16 port_, u8 prot_)
55{
56 prot = prot_;
57 host = 0;
58 port = htons (port_);
59
60 if (prot & PROTv4
61 && hostname)
62 {
63 struct hostent *he = gethostbyname (hostname);
64
65 if (he
66 && he->h_addrtype == AF_INET && he->h_length == 4 && he->h_addr_list[0])
67 {
68 //sa->sin_family = he->h_addrtype;
69 memcpy (&host, he->h_addr_list[0], 4);
70 }
71 else
72 slog (L_NOTICE, _("unable to resolve host '%s'"), hostname);
73 }
34} 74}
35 75
36void 76void
37sockinfo::set (const conf_node *conf, u8 prot_) 77sockinfo::set (const conf_node *conf, u8 prot_)
38{ 78{
39 prot = prot_; 79 if (prot_ == PROT_DNSv4)
40 host = 0;
41 port = prot == PROT_UDPv4 ? htons (conf->udp_port)
42 : prot == PROT_TCPv4 ? htons (conf->tcp_port)
43 : 0;
44
45 if (prot && conf->hostname)
46 { 80 {
47 struct hostent *he = gethostbyname (conf->hostname); 81 host = htonl (conf->id); port = 0; prot = prot_;
48
49 if (he
50 && he->h_addrtype == AF_INET && he->h_length == 4 && he->h_addr_list[0])
51 {
52 //sa->sin_family = he->h_addrtype;
53 memcpy (&host, he->h_addr_list[0], 4);
54
55 }
56 else
57 slog (L_NOTICE, _("unable to resolve host '%s'"), conf->hostname);
58 } 82 }
83 else
84 set (conf->hostname,
85 prot_ == PROT_UDPv4 ? conf->udp_port
86 : prot_ == PROT_TCPv4 ? conf->tcp_port
87 : prot_ == PROT_DNSv4 ? conf->dns_port
88 : 0,
89 prot_);
59} 90}
60
61 91
62const sockaddr * 92const sockaddr *
63sockinfo::sav4() const 93sockinfo::sav4() const
64{ 94{
65 static sockaddr_in sa; 95 static sockaddr_in sa;
… …
69 sa.sin_addr.s_addr = host; 99 sa.sin_addr.s_addr = host;
70 100
71 return (const sockaddr *)&sa; 101 return (const sockaddr *)&sa;
72} 102}
73 103
74static char hostport[10 + 15 + 1 + 5 + 1]; // protype / IPv4 : port 104static char hostport[10 + 15 + 1 + 5 + 1]; // proto / IPv4 : port
75 105
76const char * 106const char *
77sockinfo::ntoa () const 107sockinfo::ntoa () const
78{ 108{
79 in_addr ia = { host }; 109 in_addr ia = { host };
… …
88 in_addr ia = { host }; 118 in_addr ia = { host };
89 119
90 sprintf (hostport, "%s/%.15s:%d", strprotocol (prot), inet_ntoa (ia), ntohs (port) & 0xffff); 120 sprintf (hostport, "%s/%.15s:%d", strprotocol (prot), inet_ntoa (ia), ntohs (port) & 0xffff);
91 121
92 return hostport; 122 return hostport;
123}
124
125u8
126sockinfo::supported_protocols (conf_node *conf)
127{
128 u8 protocols = prot;
129
130 if (prot & (PROT_UDPv4 | PROT_TCPv4))
131 protocols |= PROT_IPv4 | PROT_ICMPv4;
132
133 if (conf
134 && prot & PROTv4
135 && conf->protocols & PROT_UDPv4
136 && conf->udp_port)
137 protocols |= PROT_UDPv4;
138
139 if (conf
140 && prot & PROTv4
141 && conf->protocols & PROT_TCPv4
142 && conf->tcp_port)
143 protocols |= PROT_TCPv4;
144
145 if (conf
146 && prot & PROTv4
147 && conf->protocols & PROT_DNSv4
148 && conf->dns_port)
149 protocols |= PROT_DNSv4;
150
151 return protocols;
152}
153
154bool
155sockinfo::upgrade_protocol (u8 prot_, conf_node *conf)
156{
157 if (prot_ == prot)
158 return true;
159
160 if (prot & PROTv4
161 && prot_ & PROTv4)
162 {
163 if (prot_ & (PROT_IPv4 | PROT_ICMPv4))
164 {
165 prot = prot_;
166 port = 0;
167 return true;
168 }
169
170 if (conf
171 && prot_ & PROT_UDPv4
172 && conf->protocols & PROT_UDPv4
173 && conf->udp_port)
174 {
175 prot = prot_;
176 port = htons (conf->udp_port);
177 return true;
178 }
179
180 if (conf
181 && prot_ & PROT_TCPv4
182 && conf->protocols & PROT_TCPv4
183 && conf->tcp_port)
184 {
185 prot = prot_;
186 port = htons (conf->tcp_port);
187 return true;
188 }
189 }
190
191 return false;
93} 192}
94 193
95bool 194bool
96operator == (const sockinfo &a, const sockinfo &b) 195operator == (const sockinfo &a, const sockinfo &b)
97{ 196{

Diff Legend

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