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.24 by root, Tue Feb 8 23:11:36 2011 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-2008 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 it
6 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
7 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
8 (at your option) any later version. 10 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, but
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 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 GNU General
13 GNU General Public License for more details. 15 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 along
16 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
18*/ 30*/
19 31
20#include "config.h" 32#include "config.h"
21 33
22#include <arpa/inet.h>
23#include <netdb.h> 34#include <netdb.h>
24 35
25#include "gettext.h" 36#include "gettext.h"
26 37
27#include "sockinfo.h" 38#include "sockinfo.h"
28#include "slog.h" 39#include "slog.h"
29 40
41#include <cstring>
42#include <cstdio>
43
30// all ipv4-based protocols 44// all ipv4-based protocols
31#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4) 45#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4)
32 46
47void
33void sockinfo::set (const sockaddr_in *sa, u8 prot_) 48sockinfo::set (const sockaddr_in *sa, u8 prot_)
34{ 49{
35 host = sa->sin_addr.s_addr; 50 host = sa->sin_addr.s_addr;
36 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port; 51 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port;
37 prot = prot_; 52 prot = prot_;
38} 53}
39 54
55void
40void sockinfo::set (const char *hostname, u16 port_, u8 prot_) 56sockinfo::set (const char *hostname, u16 port_, u8 prot_)
41{ 57{
42 prot = prot_; 58 prot = prot_;
43 host = 0; 59 host = 0;
44 port = htons (port_); 60 port = htons (port_);
45 61
60} 76}
61 77
62void 78void
63sockinfo::set (const conf_node *conf, u8 prot_) 79sockinfo::set (const conf_node *conf, u8 prot_)
64{ 80{
81 if (prot_ == PROT_DNSv4)
82 {
83 host = htonl (conf->id); port = 0; prot = prot_;
84 }
85 else
65 set (conf->hostname, 86 set (conf->hostname,
66 prot_ == PROT_UDPv4 ? conf->udp_port 87 prot_ == PROT_UDPv4 ? conf->udp_port
67 : prot_ == PROT_TCPv4 ? conf->tcp_port 88 : prot_ == PROT_TCPv4 ? conf->tcp_port
89 : prot_ == PROT_DNSv4 ? conf->dns_port
68 : 0, 90 : 0,
69 prot_); 91 prot_);
70} 92}
71 93
72const sockaddr * 94const sockaddr *
73sockinfo::sav4() const 95sockinfo::sav4() const
74{ 96{
120 && prot & PROTv4 142 && prot & PROTv4
121 && conf->protocols & PROT_TCPv4 143 && conf->protocols & PROT_TCPv4
122 && conf->tcp_port) 144 && conf->tcp_port)
123 protocols |= PROT_TCPv4; 145 protocols |= PROT_TCPv4;
124 146
147 if (conf
148 && prot & PROTv4
149 && conf->protocols & PROT_DNSv4
150 && conf->dns_port)
151 protocols |= PROT_DNSv4;
152
125 return protocols; 153 return protocols;
126} 154}
127 155
128bool 156bool
129sockinfo::upgrade_protocol (u8 prot_, conf_node *conf) 157sockinfo::upgrade_protocol (u8 prot_, conf_node *conf)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines