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.11 by pcg, Sat Jan 17 16:01:59 2004 UTC vs.
Revision 1.22 by pcg, Tue Dec 4 15:01:12 2007 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. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18*/ 20*/
19 21
20#include "config.h" 22#include "config.h"
21 23
22#include <netdb.h> 24#include <netdb.h>
… …
24#include "gettext.h" 26#include "gettext.h"
25 27
26#include "sockinfo.h" 28#include "sockinfo.h"
27#include "slog.h" 29#include "slog.h"
28 30
31#include <cstring>
32#include <cstdio>
33
29// all ipv4-based protocols 34// all ipv4-based protocols
30#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4) 35#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4)
31 36
32void sockinfo::set (const sockaddr_in *sa, u8 prot_) 37void sockinfo::set (const sockaddr_in *sa, u8 prot_)
33{ 38{
34 host = sa->sin_addr.s_addr; 39 host = sa->sin_addr.s_addr;
35 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port; 40 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port;
… …
59} 64}
60 65
61void 66void
62sockinfo::set (const conf_node *conf, u8 prot_) 67sockinfo::set (const conf_node *conf, u8 prot_)
63{ 68{
69 if (prot_ == PROT_DNSv4)
70 {
71 host = htonl (conf->id); port = 0; prot = prot_;
72 }
73 else
64 set (conf->hostname, 74 set (conf->hostname,
65 prot_ == PROT_UDPv4 ? conf->udp_port 75 prot_ == PROT_UDPv4 ? conf->udp_port
66 : prot_ == PROT_TCPv4 ? conf->tcp_port 76 : prot_ == PROT_TCPv4 ? conf->tcp_port
77 : prot_ == PROT_DNSv4 ? conf->dns_port
67 : 0, 78 : 0,
68 prot_); 79 prot_);
69} 80}
70 81
71const sockaddr * 82const sockaddr *
72sockinfo::sav4() const 83sockinfo::sav4() const
73{ 84{
… …
118 if (conf 129 if (conf
119 && prot & PROTv4 130 && prot & PROTv4
120 && conf->protocols & PROT_TCPv4 131 && conf->protocols & PROT_TCPv4
121 && conf->tcp_port) 132 && conf->tcp_port)
122 protocols |= PROT_TCPv4; 133 protocols |= PROT_TCPv4;
134
135 if (conf
136 && prot & PROTv4
137 && conf->protocols & PROT_DNSv4
138 && conf->dns_port)
139 protocols |= PROT_DNSv4;
123 140
124 return protocols; 141 return protocols;
125} 142}
126 143
127bool 144bool

Diff Legend

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