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

Diff Legend

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