dad47317e6
when CUDPSocket::open() is called with m_address (in CUDPSocket) is nothing, IPv4 socket is created by "0.0.0.0" (INADDR_ANY) address. This causes a problem that DMRGateway cannot connect to reflector on IPv6. To choose default INADDR_ANY/IN6ADDR_ANY_INIT address, added open(address_family) in UDPSocket.cpp. Following code sets address string at construction, not modified. NXDNNetwork.cpp POCSAGNetwork.cpp YSFNetwork.cpp Other codes does not set, modified open() -> open(address_family) DMRNetwork.cpp DStarNetwork.cpp MMDVMHost.cpp MobileGPS.cpp P25Network.cpp RemoteCommand.cpp RemoteControl.cpp I think there is more clever method, but I have no other idea. Maybe IPv6 support for digital radio works, but RemoteControl can work IPv4 only.
86 lines
2 KiB
C++
86 lines
2 KiB
C++
/*
|
|
* Copyright (C) 2019 by Jonathan Naylor G4KLX
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include "RemoteCommand.h"
|
|
|
|
#include "UDPSocket.h"
|
|
#include "Log.h"
|
|
|
|
#include <cstdio>
|
|
|
|
int main(int argc, char** argv)
|
|
{
|
|
if (argc < 3) {
|
|
::fprintf(stderr, "Usage: RemoteCommand <port> <command>\n");
|
|
return 1;
|
|
}
|
|
|
|
unsigned int port = (unsigned int)::atoi(argv[1]);
|
|
std::string cmd = std::string(argv[2]);
|
|
|
|
for (int i = 3; i < argc; i++) {
|
|
cmd += " ";
|
|
cmd += std::string(argv[i]);
|
|
}
|
|
|
|
if (port == 0U) {
|
|
::fprintf(stderr, "RemoteCommand: invalid port number - %s\n", argv[1]);
|
|
return 1;
|
|
}
|
|
|
|
CRemoteCommand* command = new CRemoteCommand(port);
|
|
|
|
return command->send(cmd);
|
|
}
|
|
|
|
CRemoteCommand::CRemoteCommand(unsigned int port) :
|
|
m_port(port)
|
|
{
|
|
::LogInitialise(".", "RemoteCommand", 2U, 2U);
|
|
}
|
|
|
|
CRemoteCommand::~CRemoteCommand()
|
|
{
|
|
::LogFinalise();
|
|
}
|
|
|
|
int CRemoteCommand::send(const std::string& command)
|
|
{
|
|
sockaddr_storage address;
|
|
unsigned int addrlen;
|
|
CUDPSocket::lookup("127.0.0.1", m_port, address, addrlen);
|
|
|
|
CUDPSocket socket(0U);
|
|
|
|
bool ret = socket.open(address.ss_family);
|
|
if (!ret)
|
|
return 1;
|
|
|
|
ret = socket.write((unsigned char*)command.c_str(), command.length(), address, addrlen);
|
|
if (!ret) {
|
|
socket.close();
|
|
return 1;
|
|
}
|
|
|
|
LogMessage("Command sent: \"%s\" to port: %u", command.c_str(), m_port);
|
|
|
|
socket.close();
|
|
|
|
return 0;
|
|
}
|