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.9 by pcg, Tue Apr 8 02:00:54 2003 UTC

… …
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
… …
102sockinfo::supported_protocols (conf_node *conf) 105sockinfo::supported_protocols (conf_node *conf)
103{ 106{
104 u8 protocols = prot; 107 u8 protocols = prot;
105 108
106 if (prot & (PROT_UDPv4 | PROT_TCPv4)) 109 if (prot & (PROT_UDPv4 | PROT_TCPv4))
107 protocols |= PROT_IPv4; 110 protocols |= PROT_IPv4 | PROT_ICMPv4;
108 111
109 if (conf 112 if (conf
110 && prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4) 113 && prot & PROTv4
111 && conf->protocols & PROT_UDPv4 114 && conf->protocols & PROT_UDPv4
112 && conf->udp_port) 115 && conf->udp_port)
113 protocols |= PROT_UDPv4; 116 protocols |= PROT_UDPv4;
114 117
115 if (conf 118 if (conf
116 && prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4) 119 && prot & PROTv4
117 && conf->protocols & PROT_TCPv4 120 && conf->protocols & PROT_TCPv4
118 && conf->tcp_port) 121 && conf->tcp_port)
119 protocols |= PROT_TCPv4; 122 protocols |= PROT_TCPv4;
120 123
121 return protocols; 124 return protocols;
… …
125sockinfo::upgrade_protocol (u8 prot_, conf_node *conf) 128sockinfo::upgrade_protocol (u8 prot_, conf_node *conf)
126{ 129{
127 if (prot_ == prot) 130 if (prot_ == prot)
128 return true; 131 return true;
129 132
130 if (prot & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4) 133 if (prot & PROTv4
131 && prot_ & (PROT_IPv4 | PROT_UDPv4 | PROT_TCPv4)) 134 && prot_ & PROTv4)
132 { 135 {
133 if (prot_ & PROT_IPv4) 136 if (prot_ & (PROT_IPv4 | PROT_ICMPv4))
134 { 137 {
135 prot = prot_; 138 prot = prot_;
136 port = 0; 139 port = 0;
137 return true; 140 return true;
138 } 141 }

Diff Legend

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