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.6 by pcg, Sat Apr 5 18:03:20 2003 UTC vs.
Revision 1.25 by root, Thu Mar 24 21:52:49 2011 UTC

1/* 1/*
2 sockinfo.C -- socket address management 2 sockinfo.C -- socket address management
3 Copyright (C) 2003-2008 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 it
5 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
6 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
7 (at your option) any later version. 10 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, but
10 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 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 GNU General
12 GNU General Public License for more details. 15 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 along
15 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
16 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.
17*/ 30*/
18 31
19#include "config.h" 32#include "config.h"
20 33
21#include <arpa/inet.h>
22#include <netdb.h> 34#include <netdb.h>
23 35
24#include "gettext.h" 36#include "gettext.h"
25 37
26#include "sockinfo.h" 38#include "sockinfo.h"
27#include "slog.h" 39#include "slog.h"
28 40
41#include <cstring>
42#include <cstdio>
43
44// all ipv4-based protocols
45#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4)
46
47void
29void sockinfo::set (const sockaddr_in *sa, u8 prot_) 48sockinfo::set (const sockaddr_in *sa, u8 prot_)
30{ 49{
31 host = sa->sin_addr.s_addr; 50 host = sa->sin_addr.s_addr;
32 port = prot_ == PROT_IPv4 ? 0 : sa->sin_port; 51 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port;
33 prot = prot_; 52 prot = prot_;
53}
54
55void
56sockinfo::set (const char *hostname, u16 port_, u8 prot_)
57{
58 prot = prot_;
59 host = 0;
60 port = htons (port_);
61
62 if (prot & PROTv4
63 && hostname)
64 {
65 struct hostent *he = gethostbyname (hostname);
66
67 if (he
68 && he->h_addrtype == AF_INET && he->h_length == 4 && he->h_addr_list[0])
69 {
70 //sa->sin_family = he->h_addrtype;
71 memcpy (&host, he->h_addr_list[0], 4);
72 }
73 else
74 slog (L_NOTICE, _("unable to resolve host '%s'"), hostname);
75 }
34} 76}
35 77
36void 78void
37sockinfo::set (const conf_node *conf, u8 prot_) 79sockinfo::set (const conf_node *conf, u8 prot_)
38{ 80{
39 prot = prot_; 81 if (prot_ == PROT_DNSv4)
40 host = 0; 82 {
83 host = htonl (conf->id); port = 0; prot = prot_;
84 }
85 else
86 set (conf->hostname,
41 port = prot == PROT_UDPv4 ? htons (conf->udp_port) 87 prot_ == PROT_UDPv4 ? conf->udp_port
42 : prot == PROT_TCPv4 ? htons (conf->tcp_port) 88 : prot_ == PROT_TCPv4 ? conf->tcp_port
89 : prot_ == PROT_DNSv4 ? conf->dns_port
43 : 0; 90 : 0,
44 91 prot_);
45 if (prot && conf->hostname)
46 {
47 struct hostent *he = gethostbyname (conf->hostname);
48
49 if (he
50 && he->h_addrtype == AF_INET && he->h_length == 4 && he->h_addr_list[0])
51 {
52 //sa->sin_family = he->h_addrtype;
53 memcpy (&host, he->h_addr_list[0], 4);
54
55 }
56 else
57 slog (L_NOTICE, _("unable to resolve host '%s'"), conf->hostname);
58 }
59} 92}
60
61 93
62const sockaddr * 94const sockaddr *
63sockinfo::sav4() const 95sockinfo::sav4() const
64{ 96{
65 static sockaddr_in sa; 97 static sockaddr_in sa;
… …
69 sa.sin_addr.s_addr = host; 101 sa.sin_addr.s_addr = host;
70 102
71 return (const sockaddr *)&sa; 103 return (const sockaddr *)&sa;
72} 104}
73 105
74static char hostport[10 + 15 + 1 + 5 + 1]; // protype / IPv4 : port 106static char hostport[10 + 15 + 1 + 5 + 1]; // proto / IPv4 : port
75 107
76const char * 108const char *
77sockinfo::ntoa () const 109sockinfo::ntoa () const
78{ 110{
79 in_addr ia = { host }; 111 in_addr ia = { host };
… …
95u8 127u8
96sockinfo::supported_protocols (conf_node *conf) 128sockinfo::supported_protocols (conf_node *conf)
97{ 129{
98 u8 protocols = prot; 130 u8 protocols = prot;
99 131
100 if (prot & (PROT_UDPv4 | PROT_TCPv4)) 132 if (prot & (PROT_IPv4 | PROT_ICMPv4 | PROT_UDPv4 | PROT_TCPv4))
101 protocols |= PROT_IPv4; 133 protocols |= PROT_IPv4 | PROT_ICMPv4;
102 134
103 if (conf 135 if (conf && prot & PROTv4)
104 && prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4) 136 {
105 && conf->protocols & PROT_UDPv4 137 if (conf->protocols & PROT_UDPv4 && conf->udp_port)
106 && conf->udp_port)
107 protocols |= PROT_UDPv4; 138 protocols |= PROT_UDPv4;
108 139
109 if (conf 140 if (conf->protocols & PROT_TCPv4 && conf->tcp_port)
110 && prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4)
111 && conf->protocols & PROT_TCPv4
112 && conf->tcp_port)
113 protocols |= PROT_TCPv4; 141 protocols |= PROT_TCPv4;
142
143 if (conf->protocols & PROT_DNSv4 && conf->dns_port)
144 protocols |= PROT_DNSv4;
145 }
114 146
115 return protocols; 147 return protocols;
116} 148}
117 149
118bool 150bool
119sockinfo::upgrade_protocol (u8 prot_, conf_node *conf) 151sockinfo::upgrade_protocol (u8 prot_, conf_node *conf)
120{ 152{
121 if (prot_ == prot) 153 if (prot_ == prot)
122 return true; 154 return true;
123 155
124 if (prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4)
125 && prot_ & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4))
126 {
127 if (prot_ & PROT_IPv4) 156 if (prot & PROTv4
157 && prot_ & PROTv4)
158 {
159 if (prot_ & (PROT_IPv4 | PROT_ICMPv4))
128 { 160 {
129 prot = prot_; 161 prot = prot_;
130 port = 0; 162 port = 0;
131 return true; 163 return true;
132 } 164 }

Diff Legend

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