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.15 by pcg, Thu Mar 3 16:54:34 2005 UTC

1/* 1/*
2 sockinfo.c -- socket address management 2 sockinfo.C -- socket address management
3 Copyright (C) 2003 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
5 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
6 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
7 (at your option) any later version. 10 (at your 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,
10 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but 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
12 GNU General Public License for more details. 15 GNU General 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
15 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
16 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17*/ 20*/
18 21
19#include "config.h" 22#include "config.h"
20 23
21#include "arpa/inet.h" 24#include <netdb.h>
22 25
23#include "gettext.h" 26#include "gettext.h"
24 27
25#include "sockinfo.h" 28#include "sockinfo.h"
26#include "slog.h" 29#include "slog.h"
27 30
31// all ipv4-based protocols
32#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4)
33
28void sockinfo::set (const sockaddr_in *sa, u8 prot_) 34void sockinfo::set (const sockaddr_in *sa, u8 prot_)
29{ 35{
30 host = sa->sin_addr.s_addr; 36 host = sa->sin_addr.s_addr;
31 port = prot_ == PROT_IPv4 ? 0 : sa->sin_port; 37 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port;
32 prot = prot_; 38 prot = prot_;
33} 39}
34 40
35void 41void sockinfo::set (const char *hostname, u16 port_, u8 prot_)
36sockinfo::set (const conf_node *conf)
37{ 42{
43 prot = prot_;
38 host = 0; 44 host = 0;
39 port = htons (conf->udp_port); 45 port = htons (port_);
40 46
41 if (conf->hostname) 47 if (prot & PROTv4
48 && hostname)
42 { 49 {
43 struct hostent *he = gethostbyname (conf->hostname); 50 struct hostent *he = gethostbyname (hostname);
44 51
45 if (he 52 if (he
46 && he->h_addrtype == AF_INET && he->h_length == 4 && he->h_addr_list[0]) 53 && he->h_addrtype == AF_INET && he->h_length == 4 && he->h_addr_list[0])
47 { 54 {
48 //sa->sin_family = he->h_addrtype; 55 //sa->sin_family = he->h_addrtype;
49 memcpy (&host, he->h_addr_list[0], 4); 56 memcpy (&host, he->h_addr_list[0], 4);
50
51 prot = PROT_UDPv4 | PROT_IPv4;
52 } 57 }
53 else 58 else
54 slog (L_NOTICE, _("unable to resolve host '%s'"), conf->hostname); 59 slog (L_NOTICE, _("unable to resolve host '%s'"), hostname);
55 } 60 }
56} 61}
57 62
63void
64sockinfo::set (const conf_node *conf, u8 prot_)
65{
66 if (prot_ == PROT_DNSv4)
67 set (conf->dns_hostname, conf->dns_hostname ? conf->dns_port : 0, prot_);
68 else
69 set (conf->hostname,
70 prot_ == PROT_UDPv4 ? conf->udp_port
71 : prot_ == PROT_TCPv4 ? conf->tcp_port
72 : prot_ == PROT_DNSv4 ? conf->dns_port
73 : 0,
74 prot_);
75}
58 76
59const sockaddr * 77const sockaddr *
60sockinfo::sav4() const 78sockinfo::sav4() const
61{ 79{
62 static sockaddr_in sa; 80 static sockaddr_in sa;
… …
66 sa.sin_addr.s_addr = host; 84 sa.sin_addr.s_addr = host;
67 85
68 return (const sockaddr *)&sa; 86 return (const sockaddr *)&sa;
69} 87}
70 88
71static char hostport[15 + 1 + 5 + 1]; // IPv4 : port 89static char hostport[10 + 15 + 1 + 5 + 1]; // proto / IPv4 : port
72 90
73const char * 91const char *
74sockinfo::ntoa () const 92sockinfo::ntoa () const
75{ 93{
76 in_addr ia = { host }; 94 in_addr ia = { host };
… …
82 100
83sockinfo::operator const char *() const 101sockinfo::operator const char *() const
84{ 102{
85 in_addr ia = { host }; 103 in_addr ia = { host };
86 104
87 sprintf (hostport, "%.15s:%d", inet_ntoa (ia), ntohs (port) & 0xffff); 105 sprintf (hostport, "%s/%.15s:%d", strprotocol (prot), inet_ntoa (ia), ntohs (port) & 0xffff);
88 106
89 return hostport; 107 return hostport;
90} 108}
91 109
110u8
111sockinfo::supported_protocols (conf_node *conf)
112{
113 u8 protocols = prot;
114
115 if (prot & (PROT_UDPv4 | PROT_TCPv4))
116 protocols |= PROT_IPv4 | PROT_ICMPv4;
117
118 if (conf
119 && prot & PROTv4
120 && conf->protocols & PROT_UDPv4
121 && conf->udp_port)
122 protocols |= PROT_UDPv4;
123
124 if (conf
125 && prot & PROTv4
126 && conf->protocols & PROT_TCPv4
127 && conf->tcp_port)
128 protocols |= PROT_TCPv4;
129
130 if (conf
131 && prot & PROTv4
132 && conf->protocols & PROT_DNSv4
133 && conf->dns_port)
134 protocols |= PROT_DNSv4;
135
136 return protocols;
137}
138
139bool
140sockinfo::upgrade_protocol (u8 prot_, conf_node *conf)
141{
142 if (prot_ == prot)
143 return true;
144
145 if (prot & PROTv4
146 && prot_ & PROTv4)
147 {
148 if (prot_ & (PROT_IPv4 | PROT_ICMPv4))
149 {
150 prot = prot_;
151 port = 0;
152 return true;
153 }
154
155 if (conf
156 && prot_ & PROT_UDPv4
157 && conf->protocols & PROT_UDPv4
158 && conf->udp_port)
159 {
160 prot = prot_;
161 port = htons (conf->udp_port);
162 return true;
163 }
164
165 if (conf
166 && prot_ & PROT_TCPv4
167 && conf->protocols & PROT_TCPv4
168 && conf->tcp_port)
169 {
170 prot = prot_;
171 port = htons (conf->tcp_port);
172 return true;
173 }
174
175#if ENABLE_DNS
176 if (conf
177 && prot_ & PROT_DNSv4
178 && conf->protocols & PROT_DNSv4
179 && conf->dns_port)
180 {
181 set (::conf.dns_forw_host, ::conf.dns_forw_port, prot_);
182 return true;
183 }
184#endif
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