[ViewVC] Diff of: cvs/gvpe/src/sockinfo.C

Comparing gvpe/src/sockinfo.C (file contents):
Revision 1.24 by root, Tue Feb 8 23:11:36 2011 UTC vs.
Revision 1.28 by root, Tue Jan 17 21:38:11 2012 UTC

   sprintf (hostport, "%.15s", inet_ntoa (ia));
   return hostport;
 }
+bool
+sockinfo::valid () const
+{
+  return (prot & THISNODE->protocols) && host;
+}
 sockinfo::operator const char *() const
 {
   in_addr ia = { host };
   sprintf (hostport, "%s/%.15s:%d", strprotocol (prot), inet_ntoa (ia), ntohs (port) & 0xffff);
 u8
 sockinfo::supported_protocols (conf_node *conf)
 {
   u8 protocols = prot;
-  if (prot & (PROT_UDPv4 | PROT_TCPv4))
+  if (prot & (PROT_IPv4 | PROT_ICMPv4 | PROT_UDPv4 | PROT_TCPv4))
     protocols |= PROT_IPv4 | PROT_ICMPv4;
-  if (conf
-      && prot & PROTv4
+  if (conf && prot & PROTv4)
-      && conf->protocols & PROT_UDPv4
+    {
-      && conf->udp_port)
+      if (conf->protocols & PROT_UDPv4 && conf->udp_port)
-    protocols |= PROT_UDPv4;
+        protocols |= PROT_UDPv4;
-  if (conf
+      if (conf->protocols & PROT_TCPv4 && conf->tcp_port)
-      && prot & PROTv4
-      && conf->protocols & PROT_TCPv4
-      && conf->tcp_port)
-    protocols |= PROT_TCPv4;
+        protocols |= PROT_TCPv4;
-  if (conf
+      if (conf->protocols & PROT_DNSv4 && conf->dns_port)
-      && prot & PROTv4
-      && conf->protocols & PROT_DNSv4
-      && conf->dns_port)
-    protocols |= PROT_DNSv4;
+        protocols |= PROT_DNSv4;
+    }
   return protocols;
 }
 bool

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