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.22 by pcg, Tue Dec 4 15:01:12 2007 UTC vs.
Revision 1.29 by root, Tue Dec 4 13:49:16 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. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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
34// for gethostbyname
24#include <netdb.h> 35#include <netdb.h>
36
37// for inet_aton
38#include <sys/socket.h>
39#include <netinet/in.h>
40#include <arpa/inet.h>
25 41
26#include "gettext.h" 42#include "gettext.h"
27 43
28#include "sockinfo.h" 44#include "sockinfo.h"
29#include "slog.h" 45#include "slog.h"
… …
32#include <cstdio> 48#include <cstdio>
33 49
34// all ipv4-based protocols 50// all ipv4-based protocols
35#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4) 51#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4)
36 52
53void
37void sockinfo::set (const sockaddr_in *sa, u8 prot_) 54sockinfo::set (const sockaddr_in *sa, u8 prot_)
38{ 55{
39 host = sa->sin_addr.s_addr; 56 host = sa->sin_addr.s_addr;
40 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port; 57 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port;
41 prot = prot_; 58 prot = prot_;
42} 59}
43 60
61void
44void sockinfo::set (const char *hostname, u16 port_, u8 prot_) 62sockinfo::set (const char *hostname, u16 port_, u8 prot_)
45{ 63{
46 prot = prot_; 64 prot = prot_;
47 host = 0; 65 host = 0;
48 port = htons (port_); 66 port = htons (port_);
49 67
50 if (prot & PROTv4 68 if (prot & PROTv4
51 && hostname) 69 && hostname)
52 { 70 {
71 struct in_addr in;
72 struct hostent *he;
73
74 if (inet_aton (hostname, &in))
75 {
76 host = in.s_addr;
77 }
53 struct hostent *he = gethostbyname (hostname); 78 else if ((he = gethostbyname (hostname))
54 79 && he->h_addrtype == AF_INET
55 if (he 80 && he->h_length == 4
56 && he->h_addrtype == AF_INET && he->h_length == 4 && he->h_addr_list[0]) 81 && he->h_addr_list[0])
57 { 82 {
58 //sa->sin_family = he->h_addrtype; 83 //sa->sin_family = he->h_addrtype;
59 memcpy (&host, he->h_addr_list[0], 4); 84 memcpy (&host, he->h_addr_list[0], 4);
60 } 85 }
61 else 86 else
… …
101 sprintf (hostport, "%.15s", inet_ntoa (ia)); 126 sprintf (hostport, "%.15s", inet_ntoa (ia));
102 127
103 return hostport; 128 return hostport;
104} 129}
105 130
131bool
132sockinfo::valid () const
133{
134 return (prot & THISNODE->protocols) && host;
135}
136
106sockinfo::operator const char *() const 137sockinfo::operator const char *() const
107{ 138{
108 in_addr ia = { host }; 139 in_addr ia = { host };
109 140
110 sprintf (hostport, "%s/%.15s:%d", strprotocol (prot), inet_ntoa (ia), ntohs (port) & 0xffff); 141 sprintf (hostport, "%s/%.15s:%d", strprotocol (prot), inet_ntoa (ia), ntohs (port) & 0xffff);
… …
115u8 146u8
116sockinfo::supported_protocols (conf_node *conf) 147sockinfo::supported_protocols (conf_node *conf)
117{ 148{
118 u8 protocols = prot; 149 u8 protocols = prot;
119 150
120 if (prot & (PROT_UDPv4 | PROT_TCPv4)) 151 if (prot & (PROT_IPv4 | PROT_ICMPv4 | PROT_UDPv4 | PROT_TCPv4))
121 protocols |= PROT_IPv4 | PROT_ICMPv4; 152 protocols |= PROT_IPv4 | PROT_ICMPv4;
122 153
123 if (conf
124 && prot & PROTv4 154 if (conf && prot & PROTv4)
125 && conf->protocols & PROT_UDPv4 155 {
126 && conf->udp_port) 156 if (conf->protocols & PROT_UDPv4 && conf->udp_port)
127 protocols |= PROT_UDPv4; 157 protocols |= PROT_UDPv4;
128 158
129 if (conf 159 if (conf->protocols & PROT_TCPv4 && conf->tcp_port)
130 && prot & PROTv4
131 && conf->protocols & PROT_TCPv4
132 && conf->tcp_port)
133 protocols |= PROT_TCPv4; 160 protocols |= PROT_TCPv4;
134 161
135 if (conf 162 if (conf->protocols & PROT_DNSv4 && conf->dns_port)
136 && prot & PROTv4
137 && conf->protocols & PROT_DNSv4
138 && conf->dns_port)
139 protocols |= PROT_DNSv4; 163 protocols |= PROT_DNSv4;
164 }
140 165
141 return protocols; 166 return protocols;
142} 167}
143 168
144bool 169bool

Diff Legend

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