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.14 by pcg, Thu Mar 3 07:24:57 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_;
37}
38
39void sockinfo::set (const char *hostname, u16 port_, u8 prot_)
40{
41 prot = prot_;
42 host = 0;
43 port = htons (port_);
44
45 if (prot & PROTv4
46 && hostname)
47 {
48 struct hostent *he = gethostbyname (hostname);
49
50 if (he
51 && he->h_addrtype == AF_INET && he->h_length == 4 && he->h_addr_list[0])
52 {
53 //sa->sin_family = he->h_addrtype;
54 memcpy (&host, he->h_addr_list[0], 4);
55 }
56 else
57 slog (L_NOTICE, _("unable to resolve host '%s'"), hostname);
58 }
34} 59}
35 60
36void 61void
37sockinfo::set (const conf_node *conf, u8 prot_) 62sockinfo::set (const conf_node *conf, u8 prot_)
38{ 63{
39 prot = prot_; 64 if (prot_ == PROT_DNSv4)
40 host = 0; 65 set (conf->dns_hostname, conf->dns_hostname ? conf->dns_port : 0, prot_);
66 else
67 set (conf->hostname,
41 port = prot == PROT_UDPv4 ? htons (conf->udp_port) 68 prot_ == PROT_UDPv4 ? conf->udp_port
42 : prot == PROT_TCPv4 ? htons (conf->tcp_port) 69 : prot_ == PROT_TCPv4 ? conf->tcp_port
70 : prot_ == PROT_DNSv4 ? conf->dns_port
43 : 0; 71 : 0,
44 72 prot_);
45 if (prot && conf->hostname)
46 {
47 struct hostent *he = gethostbyname (conf->hostname);
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 }
59} 73}
60
61 74
62const sockaddr * 75const sockaddr *
63sockinfo::sav4() const 76sockinfo::sav4() const
64{ 77{
65 static sockaddr_in sa; 78 static sockaddr_in sa;
… …
69 sa.sin_addr.s_addr = host; 82 sa.sin_addr.s_addr = host;
70 83
71 return (const sockaddr *)&sa; 84 return (const sockaddr *)&sa;
72} 85}
73 86
74static char hostport[10 + 15 + 1 + 5 + 1]; // protype / IPv4 : port 87static char hostport[10 + 15 + 1 + 5 + 1]; // proto / IPv4 : port
75 88
76const char * 89const char *
77sockinfo::ntoa () const 90sockinfo::ntoa () const
78{ 91{
79 in_addr ia = { host }; 92 in_addr ia = { host };
… …
96sockinfo::supported_protocols (conf_node *conf) 109sockinfo::supported_protocols (conf_node *conf)
97{ 110{
98 u8 protocols = prot; 111 u8 protocols = prot;
99 112
100 if (prot & (PROT_UDPv4 | PROT_TCPv4)) 113 if (prot & (PROT_UDPv4 | PROT_TCPv4))
101 protocols |= PROT_IPv4; 114 protocols |= PROT_IPv4 | PROT_ICMPv4;
102 115
103 if (conf 116 if (conf
104 && prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4) 117 && prot & PROTv4
105 && conf->protocols & PROT_UDPv4 118 && conf->protocols & PROT_UDPv4
106 && conf->udp_port) 119 && conf->udp_port)
107 protocols |= PROT_UDPv4; 120 protocols |= PROT_UDPv4;
108 121
109 if (conf 122 if (conf
110 && prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4) 123 && prot & PROTv4
111 && conf->protocols & PROT_TCPv4 124 && conf->protocols & PROT_TCPv4
112 && conf->tcp_port) 125 && conf->tcp_port)
113 protocols |= PROT_TCPv4; 126 protocols |= PROT_TCPv4;
114 127
128 if (conf
129 && prot & PROTv4
130 && conf->protocols & PROT_DNSv4
131 && conf->dns_port)
132 protocols |= PROT_DNSv4;
133
115 return protocols; 134 return protocols;
116} 135}
117 136
118bool 137bool
119sockinfo::upgrade_protocol (u8 prot_, conf_node *conf) 138sockinfo::upgrade_protocol (u8 prot_, conf_node *conf)
120{ 139{
121 if (prot_ == prot) 140 if (prot_ == prot)
122 return true; 141 return true;
123 142
124 if (prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4) 143 if (prot & PROTv4
125 && prot_ & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4)) 144 && prot_ & PROTv4)
126 { 145 {
127 if (prot_ & PROT_IPv4) 146 if (prot_ & (PROT_IPv4 | PROT_ICMPv4))
128 { 147 {
129 prot = prot_; 148 prot = prot_;
130 port = 0; 149 port = 0;
131 return true; 150 return true;
132 } 151 }
… …
148 { 167 {
149 prot = prot_; 168 prot = prot_;
150 port = htons (conf->tcp_port); 169 port = htons (conf->tcp_port);
151 return true; 170 return true;
152 } 171 }
172
173#if ENABLE_DNS
174 if (conf
175 && prot_ & PROT_DNSv4
176 && conf->protocols & PROT_DNSv4
177 && conf->dns_port)
178 {
179 set (::conf.dns_forw_host, ::conf.dns_forw_port, prot_);
180 return true;
181 }
182#endif
153 } 183 }
154 184
155 return false; 185 return false;
156} 186}
157 187

Diff Legend

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