From: Chris Tallon <chris@vomp.tv>
Date: Sun, 6 Jan 2013 14:25:47 +0000 (+0000)
Subject: Merge new vomp discovery protocol branch
X-Git-Tag: 0-4-0^2~11
X-Git-Url: https://git.vomp.tv/gitweb/?a=commitdiff_plain;h=e589f1701fb0d1e531bae080df60bad8574c40db;p=vompclient.git

Merge new vomp discovery protocol branch
---

e589f1701fb0d1e531bae080df60bad8574c40db
diff --cc vconnect.cc
index 724b3fc,c771aa5..e923665
--- a/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 b455330,724b558..678e767
--- a/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;