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.13 by pcg, Tue Mar 1 06:27:20 2005 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
59} 61}
60 62
61void 63void
62sockinfo::set (const conf_node *conf, u8 prot_) 64sockinfo::set (const conf_node *conf, u8 prot_)
63{ 65{
64 set (prot_ == PROT_DNSv4 ? ::conf.dns_forw_host 66 if (prot_ == PROT_DNSv4)
65 : conf->hostname, 67 set (conf->dns_hostname, conf->dns_hostname ? conf->dns_port : 0, prot_);
68 else
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
68 : prot_ == PROT_DNSv4 ? conf->dns_port 72 : prot_ == PROT_DNSv4 ? conf->dns_port
69 : 0, 73 : 0,
70 prot_); 74 prot_);
71} 75}
72 76
73const sockaddr * 77const sockaddr *
74sockinfo::sav4() const 78sockinfo::sav4() const
75{ 79{
166 prot = prot_; 170 prot = prot_;
167 port = htons (conf->tcp_port); 171 port = htons (conf->tcp_port);
168 return true; 172 return true;
169 } 173 }
170 174
175#if ENABLE_DNS
171 if (conf 176 if (conf
172 && prot_ & PROT_DNSv4 177 && prot_ & PROT_DNSv4
173 && conf->protocols & PROT_DNSv4 178 && conf->protocols & PROT_DNSv4
174 && conf->dns_port) 179 && conf->dns_port)
175 { 180 {
176 set (::conf.dns_forw_host, ::conf.dns_forw_port, prot_); 181 set (::conf.dns_forw_host, ::conf.dns_forw_port, prot_);
177 return true; 182 return true;
178 } 183 }
184#endif
179 } 185 }
180 186
181 return false; 187 return false;
182} 188}
183 189

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines