Node metadata framework

[oweals/minetest.git] / src / socket.cpp

diff --git a/src/socket.cpp b/src/socket.cpp
index 91b2ef73a717ecf78a522177b5a38ebf9be2869a..b159fa14c5177b92b51bd8a7aca1495c3d98f4d0 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -1,12 +1,34 @@
+/*
+Minetest-c55
+Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+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 this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
 #include "socket.h"
 #include "debug.h"
 #include <stdio.h>
 #include <iostream>
 #include <stdlib.h>
 #include <errno.h>
+#include "utility.h"
 
 // Debug printing options
+// Set to 1 for debug output
 #define DP 0
+// This is prepended to everything printed here
 #define DPS ""
 
 bool g_sockets_initialized = false;
@@ -88,6 +110,12 @@ void Address::setAddress(unsigned int address)
        m_address = address;
 }
 
+void Address::setAddress(unsigned int a, unsigned int b,
+               unsigned int c, unsigned int d)
+{
+       m_address = (a<<24) | (b<<16) | ( c<<8) | d;
+}
+
 void Address::setPort(unsigned short port)
 {
        m_port = port;
@@ -164,7 +192,9 @@ void UDPSocket::Bind(unsigned short port)
 
     if(bind(m_handle, (const sockaddr*)&address, sizeof(sockaddr_in)) < 0)
     {
+#ifndef DISABLE_ERRNO
                dstream<<(int)m_handle<<": Bind failed: "<<strerror(errno)<<std::endl;
+#endif
                throw SocketException("Failed to bind socket");
     }
 }
@@ -173,8 +203,8 @@ void UDPSocket::Send(const Address & destination, const void * data, int size)
 {
        bool dumping_packet = false;
        if(INTERNET_SIMULATOR)
-               dumping_packet = (rand()%10==0); //easy
-               //dumping_packet = (rand()%4==0); // hard
+               dumping_packet = (myrand()%10==0); //easy
+               //dumping_packet = (myrand()%4==0); // hard
 
        if(DP){
                /*dstream<<DPS<<"UDPSocket("<<(int)m_handle
@@ -184,7 +214,7 @@ void UDPSocket::Send(const Address & destination, const void * data, int size)
                destination.print();
                dstream<<", size="<<size<<", data=";
                for(int i=0; i<size && i<20; i++){
-                       if(i%2==0) printf(" ");
+                       if(i%2==0) DEBUGPRINT(" ");
                        DEBUGPRINT("%.2X", ((int)((const char*)data)[i])&0xff);
                }
                if(size>20)
@@ -246,7 +276,7 @@ int UDPSocket::Receive(Address & sender, void * data, int size)
                //dstream<<", received="<<received<<std::endl;
                dstream<<", size="<<received<<", data=";
                for(int i=0; i<received && i<20; i++){
-                       if(i%2==0) printf(" ");
+                       if(i%2==0) DEBUGPRINT(" ");
                        DEBUGPRINT("%.2X", ((int)((const char*)data)[i])&0xff);
                }
                if(received>20)
@@ -291,9 +321,17 @@ bool UDPSocket::WaitData(int timeout_ms)
        }
        else if(result < 0){
                // Error
+#ifndef DISABLE_ERRNO
                dstream<<(int)m_handle<<": Select failed: "<<strerror(errno)<<std::endl;
+#endif
 #ifdef _WIN32
-               dstream<<(int)m_handle<<": WSAGetLastError()="<<WSAGetLastError()<<std::endl;
+               int e = WSAGetLastError();
+               dstream<<(int)m_handle<<": WSAGetLastError()="<<e<<std::endl;
+               if(e == 10004 /*=WSAEINTR*/)
+               {
+                       dstream<<"WARNING: Ignoring WSAEINTR."<<std::endl;
+                       return false;
+               }
 #endif
                throw SocketException("Select failed");
        }