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.9 by pcg, Tue Apr 8 02:00:54 2003 UTC vs.
Revision 1.19 by pcg, Fri Mar 18 01:53:05 2005 UTC

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

Diff Legend

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