minor fixes

unstable
Tom Early 4 years ago
parent 1e4de395ab
commit f9889ae6e4

@ -173,7 +173,10 @@ WriteTranscoderHFile ()
local file
file="$tcdh"
echo "// Created on `date`" > $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}

@ -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();

@ -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"

@ -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()

@ -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

Loading…
Cancel
Save

Powered by TurnKey Linux.