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

Diff Legend

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