… | |
… | |
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) |
45 | #define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4 | PROT_IPv42) |
46 | |
46 | |
47 | void |
47 | void |
48 | sockinfo::set (const sockaddr_in *sa, u8 prot_) |
48 | sockinfo::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) ? 0 : sa->sin_port; |
51 | port = prot_ & (PROT_IPv4 | PROT_ICMPv4 | PROT_IPv42) ? 0 : sa->sin_port; |
52 | prot = prot_; |
52 | prot = prot_; |
53 | } |
53 | } |
54 | |
54 | |
55 | void |
55 | void |
56 | sockinfo::set (const char *hostname, u16 port_, u8 prot_) |
56 | sockinfo::set (const char *hostname, u16 port_, u8 prot_) |
… | |
… | |
113 | sprintf (hostport, "%.15s", inet_ntoa (ia)); |
113 | sprintf (hostport, "%.15s", inet_ntoa (ia)); |
114 | |
114 | |
115 | return hostport; |
115 | return hostport; |
116 | } |
116 | } |
117 | |
117 | |
|
|
118 | bool |
|
|
119 | sockinfo::valid () const |
|
|
120 | { |
|
|
121 | return (prot & THISNODE->protocols) && host; |
|
|
122 | } |
|
|
123 | |
118 | sockinfo::operator const char *() const |
124 | sockinfo::operator const char *() const |
119 | { |
125 | { |
120 | in_addr ia = { host }; |
126 | in_addr ia = { host }; |
121 | |
127 | |
122 | sprintf (hostport, "%s/%.15s:%d", strprotocol (prot), inet_ntoa (ia), ntohs (port) & 0xffff); |
128 | sprintf (hostport, "%s/%.15s:%d", strprotocol (prot), inet_ntoa (ia), ntohs (port) & 0xffff); |
… | |
… | |
127 | u8 |
133 | u8 |
128 | sockinfo::supported_protocols (conf_node *conf) |
134 | sockinfo::supported_protocols (conf_node *conf) |
129 | { |
135 | { |
130 | u8 protocols = prot; |
136 | u8 protocols = prot; |
131 | |
137 | |
132 | if (prot & (PROT_IPv4 | PROT_ICMPv4 | PROT_UDPv4 | PROT_TCPv4)) |
138 | if (prot & (PROT_IPv4 | PROT_ICMPv4 | PROT_UDPv4 | PROT_TCPv4 | PROT_IPv42)) |
133 | protocols |= PROT_IPv4 | PROT_ICMPv4; |
139 | protocols |= PROT_IPv4 | PROT_ICMPv4 | PROT_IPv42; |
134 | |
140 | |
135 | if (conf && prot & PROTv4) |
141 | if (conf && prot & PROTv4) |
136 | { |
142 | { |
137 | if (conf->protocols & PROT_UDPv4 && conf->udp_port) |
143 | if (conf->protocols & PROT_UDPv4 && conf->udp_port) |
138 | protocols |= PROT_UDPv4; |
144 | protocols |= PROT_UDPv4; |
… | |
… | |
154 | return true; |
160 | return true; |
155 | |
161 | |
156 | if (prot & PROTv4 |
162 | if (prot & PROTv4 |
157 | && prot_ & PROTv4) |
163 | && prot_ & PROTv4) |
158 | { |
164 | { |
159 | if (prot_ & (PROT_IPv4 | PROT_ICMPv4)) |
165 | if (prot_ & (PROT_IPv4 | PROT_ICMPv4 | PROT_IPv42)) |
160 | { |
166 | { |
161 | prot = prot_; |
167 | prot = prot_; |
162 | port = 0; |
168 | port = 0; |
163 | return true; |
169 | return true; |
164 | } |
170 | } |