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.8 by pcg, Mon Apr 7 01:12:56 2003 UTC vs.
Revision 1.12 by pcg, Fri Apr 2 14:42:45 2004 UTC

1/* 1/*
2 sockinfo.C -- socket address management 2 sockinfo.C -- socket address management
3 Copyright (C) 2003 Marc Lehmann <pcg@goof.com>
3 4
4 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 6 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 7 the Free Software Foundation; either version 2 of the License, or
7 (at your option) any later version. 8 (at your option) any later version.
… …
16 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17*/ 18*/
18 19
19#include "config.h" 20#include "config.h"
20 21
21#include <arpa/inet.h>
22#include <netdb.h> 22#include <netdb.h>
23 23
24#include "gettext.h" 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
30#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4)
31
29void sockinfo::set (const sockaddr_in *sa, u8 prot_) 32void sockinfo::set (const sockaddr_in *sa, u8 prot_)
30{ 33{
31 host = sa->sin_addr.s_addr; 34 host = sa->sin_addr.s_addr;
32 port = prot_ == PROT_IPv4 ? 0 : sa->sin_port; 35 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port;
33 prot = prot_; 36 prot = prot_;
34} 37}
35 38
36void sockinfo::set (const char *hostname, u16 port_, u8 prot_) 39void sockinfo::set (const char *hostname, u16 port_, u8 prot_)
37{ 40{
38 prot = prot_; 41 prot = prot_;
39 host = 0; 42 host = 0;
40 port = htons (port_); 43 port = htons (port_);
41 44
42 if (prot & (PROT_UDPv4 | PROT_TCPv4 | PROT_IPv4) 45 if (prot & PROTv4
43 && hostname) 46 && hostname)
44 { 47 {
45 struct hostent *he = gethostbyname (hostname); 48 struct hostent *he = gethostbyname (hostname);
46 49
47 if (he 50 if (he
… …
59sockinfo::set (const conf_node *conf, u8 prot_) 62sockinfo::set (const conf_node *conf, u8 prot_)
60{ 63{
61 set (conf->hostname, 64 set (conf->hostname,
62 prot_ == PROT_UDPv4 ? conf->udp_port 65 prot_ == PROT_UDPv4 ? conf->udp_port
63 : prot_ == PROT_TCPv4 ? conf->tcp_port 66 : prot_ == PROT_TCPv4 ? conf->tcp_port
67 : prot_ == PROT_DNSv4 ? conf->dns_port
64 : 0, 68 : 0,
65 prot_); 69 prot_);
66} 70}
67 71
68const sockaddr * 72const sockaddr *
… …
102sockinfo::supported_protocols (conf_node *conf) 106sockinfo::supported_protocols (conf_node *conf)
103{ 107{
104 u8 protocols = prot; 108 u8 protocols = prot;
105 109
106 if (prot & (PROT_UDPv4 | PROT_TCPv4)) 110 if (prot & (PROT_UDPv4 | PROT_TCPv4))
107 protocols |= PROT_IPv4; 111 protocols |= PROT_IPv4 | PROT_ICMPv4;
108 112
109 if (conf 113 if (conf
110 && prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4) 114 && prot & PROTv4
111 && conf->protocols & PROT_UDPv4 115 && conf->protocols & PROT_UDPv4
112 && conf->udp_port) 116 && conf->udp_port)
113 protocols |= PROT_UDPv4; 117 protocols |= PROT_UDPv4;
114 118
115 if (conf 119 if (conf
116 && prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4) 120 && prot & PROTv4
117 && conf->protocols & PROT_TCPv4 121 && conf->protocols & PROT_TCPv4
118 && conf->tcp_port) 122 && conf->tcp_port)
119 protocols |= PROT_TCPv4; 123 protocols |= PROT_TCPv4;
124
125 if (conf
126 && prot & PROTv4
127 && conf->protocols & PROT_DNSv4)
128 protocols |= PROT_DNSv4;
120 129
121 return protocols; 130 return protocols;
122} 131}
123 132
124bool 133bool
125sockinfo::upgrade_protocol (u8 prot_, conf_node *conf) 134sockinfo::upgrade_protocol (u8 prot_, conf_node *conf)
126{ 135{
127 if (prot_ == prot) 136 if (prot_ == prot)
128 return true; 137 return true;
129 138
130 if (prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4) 139 if (prot & PROTv4
131 && prot_ & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4)) 140 && prot_ & PROTv4)
132 { 141 {
133 if (prot_ & PROT_IPv4) 142 if (prot_ & (PROT_IPv4 | PROT_ICMPv4))
134 { 143 {
135 prot = prot_; 144 prot = prot_;
136 port = 0; 145 port = 0;
137 return true; 146 return true;
138 } 147 }

Diff Legend

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