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.19 by pcg, Fri Mar 18 01:53:05 2005 UTC vs.
Revision 1.27 by root, Tue Jan 17 21:25:50 2012 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 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
8 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
9 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
10 (at your option) any later version. 10 option) any later version.
11 11
12 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
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
15 GNU General Public License for more details. 15 Public License for more details.
16 16
17 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
18 along with gvpe; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
19 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.
20*/ 30*/
21 31
22#include "config.h" 32#include "config.h"
23 33
24#include <netdb.h> 34#include <netdb.h>
35
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
29// all ipv4-based protocols 44// all ipv4-based protocols
30#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4) 45#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4 | PROT_IPv42)
31 46
47void
32void sockinfo::set (const sockaddr_in *sa, u8 prot_) 48sockinfo::set (const sockaddr_in *sa, u8 prot_)
33{ 49{
34 host = sa->sin_addr.s_addr; 50 host = sa->sin_addr.s_addr;
35 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port; 51 port = prot_ & (PROT_IPv4 | PROT_ICMPv4 | PROT_IPv42) ? 0 : sa->sin_port;
36 prot = prot_; 52 prot = prot_;
37} 53}
38 54
55void
39void sockinfo::set (const char *hostname, u16 port_, u8 prot_) 56sockinfo::set (const char *hostname, u16 port_, u8 prot_)
40{ 57{
41 prot = prot_; 58 prot = prot_;
42 host = 0; 59 host = 0;
43 port = htons (port_); 60 port = htons (port_);
44 61
… …
96 sprintf (hostport, "%.15s", inet_ntoa (ia)); 113 sprintf (hostport, "%.15s", inet_ntoa (ia));
97 114
98 return hostport; 115 return hostport;
99} 116}
100 117
118bool
119sockinfo::valid () const
120{
121 return (prot & THISNODE->protocols) && host;
122}
123
101sockinfo::operator const char *() const 124sockinfo::operator const char *() const
102{ 125{
103 in_addr ia = { host }; 126 in_addr ia = { host };
104 127
105 sprintf (hostport, "%s/%.15s:%d", strprotocol (prot), inet_ntoa (ia), ntohs (port) & 0xffff); 128 sprintf (hostport, "%s/%.15s:%d", strprotocol (prot), inet_ntoa (ia), ntohs (port) & 0xffff);
… …
110u8 133u8
111sockinfo::supported_protocols (conf_node *conf) 134sockinfo::supported_protocols (conf_node *conf)
112{ 135{
113 u8 protocols = prot; 136 u8 protocols = prot;
114 137
115 if (prot & (PROT_UDPv4 | PROT_TCPv4)) 138 if (prot & (PROT_IPv4 | PROT_ICMPv4 | PROT_UDPv4 | PROT_TCPv4 | PROT_IPv42))
116 protocols |= PROT_IPv4 | PROT_ICMPv4; 139 protocols |= PROT_IPv4 | PROT_ICMPv4 | PROT_IPv42;
117 140
118 if (conf
119 && prot & PROTv4 141 if (conf && prot & PROTv4)
120 && conf->protocols & PROT_UDPv4 142 {
121 && conf->udp_port) 143 if (conf->protocols & PROT_UDPv4 && conf->udp_port)
122 protocols |= PROT_UDPv4; 144 protocols |= PROT_UDPv4;
123 145
124 if (conf 146 if (conf->protocols & PROT_TCPv4 && conf->tcp_port)
125 && prot & PROTv4
126 && conf->protocols & PROT_TCPv4
127 && conf->tcp_port)
128 protocols |= PROT_TCPv4; 147 protocols |= PROT_TCPv4;
129 148
130 if (conf 149 if (conf->protocols & PROT_DNSv4 && conf->dns_port)
131 && prot & PROTv4
132 && conf->protocols & PROT_DNSv4
133 && conf->dns_port)
134 protocols |= PROT_DNSv4; 150 protocols |= PROT_DNSv4;
151 }
135 152
136 return protocols; 153 return protocols;
137} 154}
138 155
139bool 156bool
… …
143 return true; 160 return true;
144 161
145 if (prot & PROTv4 162 if (prot & PROTv4
146 && prot_ & PROTv4) 163 && prot_ & PROTv4)
147 { 164 {
148 if (prot_ & (PROT_IPv4 | PROT_ICMPv4)) 165 if (prot_ & (PROT_IPv4 | PROT_ICMPv4 | PROT_IPv42))
149 { 166 {
150 prot = prot_; 167 prot = prot_;
151 port = 0; 168 port = 0;
152 return true; 169 return true;
153 } 170 }

Diff Legend

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