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.27 by root, Tue Jan 17 21:25:50 2012 UTC vs.
Revision 1.28 by root, Tue Jan 17 21:38:11 2012 UTC

40 40
41#include <cstring> 41#include <cstring>
42#include <cstdio> 42#include <cstdio>
43 43
44// all ipv4-based protocols 44// all ipv4-based protocols
45#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4 | PROT_IPv42) 45#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4)
46 46
47void 47void
48sockinfo::set (const sockaddr_in *sa, u8 prot_) 48sockinfo::set (const sockaddr_in *sa, u8 prot_)
49{ 49{
50 host = sa->sin_addr.s_addr; 50 host = sa->sin_addr.s_addr;
51 port = prot_ & (PROT_IPv4 | PROT_ICMPv4 | PROT_IPv42) ? 0 : sa->sin_port; 51 port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port;
52 prot = prot_; 52 prot = prot_;
53} 53}
54 54
55void 55void
56sockinfo::set (const char *hostname, u16 port_, u8 prot_) 56sockinfo::set (const char *hostname, u16 port_, u8 prot_)
133u8 133u8
134sockinfo::supported_protocols (conf_node *conf) 134sockinfo::supported_protocols (conf_node *conf)
135{ 135{
136 u8 protocols = prot; 136 u8 protocols = prot;
137 137
138 if (prot & (PROT_IPv4 | PROT_ICMPv4 | PROT_UDPv4 | PROT_TCPv4 | PROT_IPv42)) 138 if (prot & (PROT_IPv4 | PROT_ICMPv4 | PROT_UDPv4 | PROT_TCPv4))
139 protocols |= PROT_IPv4 | PROT_ICMPv4 | PROT_IPv42; 139 protocols |= PROT_IPv4 | PROT_ICMPv4;
140 140
141 if (conf && prot & PROTv4) 141 if (conf && prot & PROTv4)
142 { 142 {
143 if (conf->protocols & PROT_UDPv4 && conf->udp_port) 143 if (conf->protocols & PROT_UDPv4 && conf->udp_port)
144 protocols |= PROT_UDPv4; 144 protocols |= PROT_UDPv4;
160 return true; 160 return true;
161 161
162 if (prot & PROTv4 162 if (prot & PROTv4
163 && prot_ & PROTv4) 163 && prot_ & PROTv4)
164 { 164 {
165 if (prot_ & (PROT_IPv4 | PROT_ICMPv4 | PROT_IPv42)) 165 if (prot_ & (PROT_IPv4 | PROT_ICMPv4))
166 { 166 {
167 prot = prot_; 167 prot = prot_;
168 port = 0; 168 port = 0;
169 return true; 169 return true;
170 } 170 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines