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.6 by pcg, Sat Apr 5 18:03:20 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#include <netdb.h>
23 23
24#include "gettext.h" 24#include "gettext.h"
25 25
26#include "sockinfo.h" 26#include "sockinfo.h"
27#include "slog.h" 27#include "slog.h"
28 28
29// all ipv4-based protocols
30#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4)
31
29void sockinfo::set (const sockaddr_in *sa, u8 prot_) 32void sockinfo::set (const sockaddr_in *sa, u8 prot_)
30{ 33{
31 host = sa->sin_addr.s_addr; 34 host = sa->sin_addr.s_addr;
32 port = prot_ == PROT_IPv4 ? 0 : sa->sin_port; 35 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port;
33 prot = prot_; 36 prot = prot_;
34} 37}
35 38
36void 39void sockinfo::set (const char *hostname, u16 port_, u8 prot_)
37sockinfo::set (const conf_node *conf, u8 prot_)
38{ 40{
39 prot = prot_; 41 prot = prot_;
40 host = 0; 42 host = 0;
41 port = prot == PROT_UDPv4 ? htons (conf->udp_port) 43 port = htons (port_);
42 : prot == PROT_TCPv4 ? htons (conf->tcp_port)
43 : 0;
44 44
45 if (prot && conf->hostname) 45 if (prot & PROTv4
46 && hostname)
46 { 47 {
47 struct hostent *he = gethostbyname (conf->hostname); 48 struct hostent *he = gethostbyname (hostname);
48 49
49 if (he 50 if (he
50 && 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])
51 { 52 {
52 //sa->sin_family = he->h_addrtype; 53 //sa->sin_family = he->h_addrtype;
53 memcpy (&host, he->h_addr_list[0], 4); 54 memcpy (&host, he->h_addr_list[0], 4);
54
55 } 55 }
56 else 56 else
57 slog (L_NOTICE, _("unable to resolve host '%s'"), conf->hostname); 57 slog (L_NOTICE, _("unable to resolve host '%s'"), hostname);
58 } 58 }
59} 59}
60 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}
61 72
62const sockaddr * 73const sockaddr *
63sockinfo::sav4() const 74sockinfo::sav4() const
64{ 75{
65 static sockaddr_in sa; 76 static sockaddr_in sa;
… …
69 sa.sin_addr.s_addr = host; 80 sa.sin_addr.s_addr = host;
70 81
71 return (const sockaddr *)&sa; 82 return (const sockaddr *)&sa;
72} 83}
73 84
74static char hostport[10 + 15 + 1 + 5 + 1]; // protype / IPv4 : port 85static char hostport[10 + 15 + 1 + 5 + 1]; // proto / IPv4 : port
75 86
76const char * 87const char *
77sockinfo::ntoa () const 88sockinfo::ntoa () const
78{ 89{
79 in_addr ia = { host }; 90 in_addr ia = { host };
… …
96sockinfo::supported_protocols (conf_node *conf) 107sockinfo::supported_protocols (conf_node *conf)
97{ 108{
98 u8 protocols = prot; 109 u8 protocols = prot;
99 110
100 if (prot & (PROT_UDPv4 | PROT_TCPv4)) 111 if (prot & (PROT_UDPv4 | PROT_TCPv4))
101 protocols |= PROT_IPv4; 112 protocols |= PROT_IPv4 | PROT_ICMPv4;
102 113
103 if (conf 114 if (conf
104 && prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4) 115 && prot & PROTv4
105 && conf->protocols & PROT_UDPv4 116 && conf->protocols & PROT_UDPv4
106 && conf->udp_port) 117 && conf->udp_port)
107 protocols |= PROT_UDPv4; 118 protocols |= PROT_UDPv4;
108 119
109 if (conf 120 if (conf
110 && prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4) 121 && prot & PROTv4
111 && conf->protocols & PROT_TCPv4 122 && conf->protocols & PROT_TCPv4
112 && conf->tcp_port) 123 && conf->tcp_port)
113 protocols |= PROT_TCPv4; 124 protocols |= PROT_TCPv4;
125
126 if (conf
127 && prot & PROTv4
128 && conf->protocols & PROT_DNSv4
129 && conf->dns_port)
130 protocols |= PROT_DNSv4;
114 131
115 return protocols; 132 return protocols;
116} 133}
117 134
118bool 135bool
119sockinfo::upgrade_protocol (u8 prot_, conf_node *conf) 136sockinfo::upgrade_protocol (u8 prot_, conf_node *conf)
120{ 137{
121 if (prot_ == prot) 138 if (prot_ == prot)
122 return true; 139 return true;
123 140
124 if (prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4) 141 if (prot & PROTv4
125 && prot_ & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4)) 142 && prot_ & PROTv4)
126 { 143 {
127 if (prot_ & PROT_IPv4) 144 if (prot_ & (PROT_IPv4 | PROT_ICMPv4))
128 { 145 {
129 prot = prot_; 146 prot = prot_;
130 port = 0; 147 port = 0;
131 return true; 148 return true;
132 } 149 }
… …
148 { 165 {
149 prot = prot_; 166 prot = prot_;
150 port = htons (conf->tcp_port); 167 port = htons (conf->tcp_port);
151 return true; 168 return true;
152 } 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 }
153 } 179 }
154 180
155 return false; 181 return false;
156} 182}
157 183

Diff Legend

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