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.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 <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. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 25
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
34// all ipv4-based protocols
35#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4)
36
29void sockinfo::set (const sockaddr_in *sa, u8 prot_) 37void sockinfo::set (const sockaddr_in *sa, u8 prot_)
30{ 38{
31 host = sa->sin_addr.s_addr; 39 host = sa->sin_addr.s_addr;
32 port = prot_ == PROT_IPv4 ? 0 : sa->sin_port; 40 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port;
33 prot = prot_; 41 prot = prot_;
34} 42}
35 43
36void 44void sockinfo::set (const char *hostname, u16 port_, u8 prot_)
37sockinfo::set (const conf_node *conf, u8 prot_)
38{ 45{
39 prot = prot_; 46 prot = prot_;
40 host = 0; 47 host = 0;
41 port = prot == PROT_UDPv4 ? htons (conf->udp_port) 48 port = htons (port_);
42 : prot == PROT_TCPv4 ? htons (conf->tcp_port)
43 : 0;
44 49
45 if (prot && conf->hostname) 50 if (prot & PROTv4
51 && hostname)
46 { 52 {
47 struct hostent *he = gethostbyname (conf->hostname); 53 struct hostent *he = gethostbyname (hostname);
48 54
49 if (he 55 if (he
50 && he->h_addrtype == AF_INET && he->h_length == 4 && he->h_addr_list[0]) 56 && he->h_addrtype == AF_INET && he->h_length == 4 && he->h_addr_list[0])
51 { 57 {
52 //sa->sin_family = he->h_addrtype; 58 //sa->sin_family = he->h_addrtype;
53 memcpy (&host, he->h_addr_list[0], 4); 59 memcpy (&host, he->h_addr_list[0], 4);
54
55 } 60 }
56 else 61 else
57 slog (L_NOTICE, _("unable to resolve host '%s'"), conf->hostname); 62 slog (L_NOTICE, _("unable to resolve host '%s'"), hostname);
58 } 63 }
59} 64}
60 65
66void
67sockinfo::set (const conf_node *conf, u8 prot_)
68{
69 if (prot_ == PROT_DNSv4)
70 {
71 host = htonl (conf->id); port = 0; prot = prot_;
72 }
73 else
74 set (conf->hostname,
75 prot_ == PROT_UDPv4 ? conf->udp_port
76 : prot_ == PROT_TCPv4 ? conf->tcp_port
77 : prot_ == PROT_DNSv4 ? conf->dns_port
78 : 0,
79 prot_);
80}
61 81
62const sockaddr * 82const sockaddr *
63sockinfo::sav4() const 83sockinfo::sav4() const
64{ 84{
65 static sockaddr_in sa; 85 static sockaddr_in sa;
… …
69 sa.sin_addr.s_addr = host; 89 sa.sin_addr.s_addr = host;
70 90
71 return (const sockaddr *)&sa; 91 return (const sockaddr *)&sa;
72} 92}
73 93
74static char hostport[10 + 15 + 1 + 5 + 1]; // protype / IPv4 : port 94static char hostport[10 + 15 + 1 + 5 + 1]; // proto / IPv4 : port
75 95
76const char * 96const char *
77sockinfo::ntoa () const 97sockinfo::ntoa () const
78{ 98{
79 in_addr ia = { host }; 99 in_addr ia = { host };
… …
96sockinfo::supported_protocols (conf_node *conf) 116sockinfo::supported_protocols (conf_node *conf)
97{ 117{
98 u8 protocols = prot; 118 u8 protocols = prot;
99 119
100 if (prot & (PROT_UDPv4 | PROT_TCPv4)) 120 if (prot & (PROT_UDPv4 | PROT_TCPv4))
101 protocols |= PROT_IPv4; 121 protocols |= PROT_IPv4 | PROT_ICMPv4;
102 122
103 if (conf 123 if (conf
104 && prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4) 124 && prot & PROTv4
105 && conf->protocols & PROT_UDPv4 125 && conf->protocols & PROT_UDPv4
106 && conf->udp_port) 126 && conf->udp_port)
107 protocols |= PROT_UDPv4; 127 protocols |= PROT_UDPv4;
108 128
109 if (conf 129 if (conf
110 && prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4) 130 && prot & PROTv4
111 && conf->protocols & PROT_TCPv4 131 && conf->protocols & PROT_TCPv4
112 && conf->tcp_port) 132 && conf->tcp_port)
113 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;
114 140
115 return protocols; 141 return protocols;
116} 142}
117 143
118bool 144bool
119sockinfo::upgrade_protocol (u8 prot_, conf_node *conf) 145sockinfo::upgrade_protocol (u8 prot_, conf_node *conf)
120{ 146{
121 if (prot_ == prot) 147 if (prot_ == prot)
122 return true; 148 return true;
123 149
124 if (prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4) 150 if (prot & PROTv4
125 && prot_ & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4)) 151 && prot_ & PROTv4)
126 { 152 {
127 if (prot_ & PROT_IPv4) 153 if (prot_ & (PROT_IPv4 | PROT_ICMPv4))
128 { 154 {
129 prot = prot_; 155 prot = prot_;
130 port = 0; 156 port = 0;
131 return true; 157 return true;
132 } 158 }

Diff Legend

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