From c3c0793ddc26a53cde20dfaa869925d26f7ab8b2 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 18 Feb 2013 09:39:52 -0800 Subject: [PATCH] mixer needs to send port as unsigned short --- interface/src/main.cpp | 2 +- mixer/src/main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 51c2558ed8..a42c06d6c1 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -60,7 +60,7 @@ int simulate_on = 1; const int MAX_PACKET_SIZE = 1500; char DOMAIN_HOSTNAME[] = "highfidelity.below92.com"; -char DOMAIN_IP[100] = "192.168.1.47"; // IP Address will be used first if not empty string +char DOMAIN_IP[100] = ""; // IP Address will be used first if not empty string const int DOMAINSERVER_PORT = 40102; UDPSocket agentSocket(AGENT_UDP_PORT); diff --git a/mixer/src/main.cpp b/mixer/src/main.cpp index 26fca7fe78..011e27f82b 100644 --- a/mixer/src/main.cpp +++ b/mixer/src/main.cpp @@ -229,7 +229,7 @@ void *reportAliveToDS(void *args) { while (true) { gettimeofday(&lastSend, NULL); - sprintf(output, "%c %f,%f,%f,54.241.92.53 %hd", 'M', 0.f, 0.f, 0.f, MIXER_LISTEN_PORT); + sprintf(output, "%c %f,%f,%f,54.241.92.53 %hd", 'M', 0.f, 0.f, 0.f, (unsigned short)MIXER_LISTEN_PORT); int packetSize = strlen(output); audioSocket.send(DOMAIN_IP, DOMAINSERVER_PORT, output, packetSize);