From f9889ae6e47e51043ce1160363b690adf6ce04c1 Mon Sep 17 00:00:00 2001
From: Tom Early <n7tae@tearly.net>
Date: Sun, 5 Dec 2021 16:52:03 -0700
Subject: [PATCH] minor fixes

---
 rconfig                       | 11 +++++++----
 reflector/CodecStream.cpp     |  2 +-
 reflector/TCPacketDef.h       |  2 +-
 reflector/UnixDgramSocket.cpp |  9 ++++-----
 reflector/UnixDgramSocket.h   |  1 -
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/rconfig b/rconfig
index 7ae5ccb..c0cbe83 100755
--- a/rconfig
+++ b/rconfig
@@ -173,7 +173,10 @@ WriteTranscoderHFile ()
 	local file
 	file="$tcdh"
 	echo "// Created on `date`" > $file
-	echo "#define TRANSCODER_IP \"${tcaddress}\"" >> $file
+	if [ -n ${tcaddress+x} ] && [[ "$tcaddress" != "local" ]]; then
+		echo "#define TRANSCODER_IP \"${tcaddress}\"" >> $file
+	fi
+
 }
 
 WriteTranscoderMKFile ()
@@ -275,11 +278,11 @@ dbcr='configure.sql'
 urfserv='/etc/systemd/system/urfd.service'
 # default values
 callsign_d='CHNGME'
-modules_d='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+modules_d='ABCF'
 ip4addr_d='none'
 ip6addr_d='none'
 tcaddress_d='none'
-tcmodules_d='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+tcmodules_d='ABC'
 ysfautolink_d=false
 ysfmodule_d='D'
 g3support_d=false
@@ -323,7 +326,7 @@ while [[ "$key" != q* ]]
 do
 	clear
 	echo
-	echo "        Reflector Configuration, Version #211204"
+	echo "        Reflector Configuration, Version #211205"
 	echo
 	echo    "     ******* REFLECTOR ********"
 	echo -n "cs : Reflector Callsign     = "; EvaluateVar callsign{,_d}
diff --git a/reflector/CodecStream.cpp b/reflector/CodecStream.cpp
index 2daea27..691197a 100644
--- a/reflector/CodecStream.cpp
+++ b/reflector/CodecStream.cpp
@@ -108,7 +108,7 @@ void CCodecStream::Task(void)
 	STCPacket pack;
 
 	// any packet from transcoder
-	if ( ! m_TCReader->Receive(&pack, 5) )
+	if (m_TCReader->Receive(&pack, 5))
 	{
 		// tickle
 		m_TimeoutTimer.start();
diff --git a/reflector/TCPacketDef.h b/reflector/TCPacketDef.h
index 52c5c82..712d414 100644
--- a/reflector/TCPacketDef.h
+++ b/reflector/TCPacketDef.h
@@ -1,6 +1,5 @@
 #pragma once
 
-// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
@@ -18,6 +17,7 @@
 
 #include <cstdint>
 
+// unix socket names
 #define TC2REF "TC2URFMod"
 #define REF2TC "URF2TC"
 
diff --git a/reflector/UnixDgramSocket.cpp b/reflector/UnixDgramSocket.cpp
index b760ac6..dddf4cf 100644
--- a/reflector/UnixDgramSocket.cpp
+++ b/reflector/UnixDgramSocket.cpp
@@ -1,4 +1,3 @@
-// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify
@@ -64,7 +63,7 @@ bool CUnixDgramReader::Receive(STCPacket *pack, unsigned timeout) const
 {
 	// socket valid ?
 	if ( 0 > fd )
-		return true;
+		return false;
 
 	// control socket
 	fd_set FdSet;
@@ -79,16 +78,16 @@ bool CUnixDgramReader::Receive(STCPacket *pack, unsigned timeout) const
 		if (rval < 0) {
 			std::cerr << "select() error on transcoder socket: " << strerror(errno) << std::endl;
 		}
-		return true;
+		return false;
 	}
 
 	auto len = read(fd, pack, sizeof(STCPacket));
 	if (len != sizeof(STCPacket)) {
 		std::cerr << "Received transcoder packet is wrong size: " << len << " but should be " << sizeof(STCPacket) << std::endl;
-		return true;
+		return false;
 	}
 
-	return false;
+	return true;
 }
 
 void CUnixDgramReader::Close()
diff --git a/reflector/UnixDgramSocket.h b/reflector/UnixDgramSocket.h
index f1f9eb9..2b06d87 100644
--- a/reflector/UnixDgramSocket.h
+++ b/reflector/UnixDgramSocket.h
@@ -1,6 +1,5 @@
 #pragma once
 
-// urfd -- The universal reflector
 // Copyright © 2021 Thomas A. Early N7TAE
 //
 // This program is free software: you can redistribute it and/or modify