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

Comparing gvpe/src/sockinfo.C (file contents):
Revision 1.16 by pcg, Sat Mar 5 19:13:15 2005 UTC vs.
Revision 1.22 by pcg, Tue Dec 4 15:01:12 2007 UTC

     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
     You should have received a copy of the GNU General Public License
     along with gvpe; if not, write to the Free Software
-    Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include "config.h"
 #include <netdb.h>
 #include "gettext.h"
 #include "sockinfo.h"
 #include "slog.h"
+#include <cstring>
+#include <cstdio>
 // all ipv4-based protocols
 #define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4)
 void sockinfo::set (const sockaddr_in *sa, u8 prot_)
 void
 sockinfo::set (const conf_node *conf, u8 prot_)
 {
   if (prot_ == PROT_DNSv4)
     {
-      host = 0x01010101; port = htons (conf->id); prot = prot_;
+      host = htonl (conf->id); port = 0; prot = prot_;
     }
   else
     set (conf->hostname,
          prot_ == PROT_UDPv4   ? conf->udp_port
          : prot_ == PROT_TCPv4 ? conf->tcp_port
         {
           prot = prot_;
           port = htons (conf->tcp_port);
           return true;
         }
-#if ENABLE_DNS
-      if (conf
-          && prot_ & PROT_DNSv4
-          && conf->protocols & PROT_DNSv4
-          && conf->dns_port)
-        {
-          set (::conf.dns_forw_host, ::conf.dns_forw_port, prot_);
-          return true;
-        }
-#endif
     }
   return false;
 }

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