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.13 by pcg, Tue Mar 1 06:27:20 2005 UTC

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

Diff Legend

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