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.10 by pcg, Thu Oct 16 02:41:21 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 <pcg@goof.com> 3 Copyright (C) 2003 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
6 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
7 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 10 (at your option) any later version.
9 11
10 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,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 15 GNU General Public License for more details.
14 16
15 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
16 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
17 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
18*/ 20*/
19 21
20#include "config.h" 22#include "config.h"
21 23
22#include <arpa/inet.h>
23#include <netdb.h> 24#include <netdb.h>
24 25
25#include "gettext.h" 26#include "gettext.h"
26 27
27#include "sockinfo.h" 28#include "sockinfo.h"
28#include "slog.h" 29#include "slog.h"
29 30
30// all ipv4-based protocols 31// all ipv4-based protocols
31#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4) 32#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4)
32 33
33void sockinfo::set (const sockaddr_in *sa, u8 prot_) 34void sockinfo::set (const sockaddr_in *sa, u8 prot_)
34{ 35{
35 host = sa->sin_addr.s_addr; 36 host = sa->sin_addr.s_addr;
36 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port; 37 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port;
… …
60} 61}
61 62
62void 63void
63sockinfo::set (const conf_node *conf, u8 prot_) 64sockinfo::set (const conf_node *conf, u8 prot_)
64{ 65{
66 if (prot_ == PROT_DNSv4)
67 set (conf->dns_hostname, conf->dns_hostname ? conf->dns_port : 0, prot_);
68 else
65 set (conf->hostname, 69 set (conf->hostname,
66 prot_ == PROT_UDPv4 ? conf->udp_port 70 prot_ == PROT_UDPv4 ? conf->udp_port
67 : prot_ == PROT_TCPv4 ? conf->tcp_port 71 : prot_ == PROT_TCPv4 ? conf->tcp_port
72 : prot_ == PROT_DNSv4 ? conf->dns_port
68 : 0, 73 : 0,
69 prot_); 74 prot_);
70} 75}
71 76
72const sockaddr * 77const sockaddr *
73sockinfo::sav4() const 78sockinfo::sav4() const
74{ 79{
… …
120 && prot & PROTv4 125 && prot & PROTv4
121 && conf->protocols & PROT_TCPv4 126 && conf->protocols & PROT_TCPv4
122 && conf->tcp_port) 127 && conf->tcp_port)
123 protocols |= PROT_TCPv4; 128 protocols |= PROT_TCPv4;
124 129
130 if (conf
131 && prot & PROTv4
132 && conf->protocols & PROT_DNSv4
133 && conf->dns_port)
134 protocols |= PROT_DNSv4;
135
125 return protocols; 136 return protocols;
126} 137}
127 138
128bool 139bool
129sockinfo::upgrade_protocol (u8 prot_, conf_node *conf) 140sockinfo::upgrade_protocol (u8 prot_, conf_node *conf)
… …
158 { 169 {
159 prot = prot_; 170 prot = prot_;
160 port = htons (conf->tcp_port); 171 port = htons (conf->tcp_port);
161 return true; 172 return true;
162 } 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
163 } 185 }
164 186
165 return false; 187 return false;
166} 188}
167 189

Diff Legend

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