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

Diff Legend

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