Merge new vomp discovery protocol branch

diff --cc vconnect.cc
index 724b3fc0fdaa9a8e164f73921389685502b99703,c771aa543dc1ff655402c80defd624d4dc8bca86..e9236655c8fe1ed5211e3ae70f7270f69246a290
--- 1/vconnect.cc
--- 2/vconnect.cc
+++ b/vconnect.cc
@@@ -139,11 -140,11 +140,11 @@@ void VConnect::threadMethod(
        return;
      }
  
-     logger->log("VConnect", Log::NOTICE, "Connecting to server at %s", servers[selectedServer].ip);
+     logger->log("VConnect", Log::NOTICE, "Connecting to server at %s %u", servers[selectedServer].ip, servers[selectedServer].port);
      Wol::getInstance()->setWakeUpIP(servers[selectedServer].ip);
      vdr->setServerIP(servers[selectedServer].ip);
- 
+     vdr->setServerPort(servers[selectedServer].port);
 -    
 +
      // Clear the serverIPs vector
      for(UINT k = 0; k < servers.size(); k++)
      {

diff --cc vdr.cc
index b45533035f8c48b64edb008647db0cc105803b2d,724b55880c2d3a38e5ea03f657d5e86425486218..678e767b8cbbe769afe182c4503130afe90b5c68
--- 1/vdr.cc
--- 2/vdr.cc
+++ b/vdr.cc
@@@ -672,23 -643,14 +685,24 @@@ bool VDR::LogExtern(const char* logStri
    int stringLength = strlen(logString);
    int packetLength = stringLength + 8;
    char *buffer=new char[packetLength + 1];
 -  *(ULONG*)&buffer[0] = htonl(CHANNEL_NETLOG);
 -  *(ULONG*)&buffer[4] = htonl(stringLength);
 +  int pos=0;
 +  ULONG ul=CHANNEL_NETLOG;
 +  buffer[pos++]=(ul>>24)&0xff;
 +  buffer[pos++]=(ul>>16)&0xff;
 +  buffer[pos++]=(ul>>8)&0xff;
 +  buffer[pos++]=ul &0xff;
 +  ul=stringLength;
 +  buffer[pos++]=(ul>>24)&0xff;
 +  buffer[pos++]=(ul>>16)&0xff;
 +  buffer[pos++]=(ul>>8)&0xff;
 +  buffer[pos++]=ul &0xff;
 +
    strcpy(&buffer[8], logString);
    
-   if ((ULONG)tcp->sendData(buffer, packetLength) != packetLength) {
-         delete [] buffer;
-         return false;
+   if (tcp->sendData(buffer, packetLength) != packetLength)
+   {
+     delete [] buffer;
+     return false;
    }
    delete [] buffer;
    return true;

diff --cc vdr.h
Simple merge