g4klx/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway.git synced 2025-12-06 05:32:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove RemoteCommandDMRG, as RemoteCommand from MMDVMHost's PR now works with DMRGatway too.

Browse source
This commit is contained in:
Daniel Caujolle-Bert 2021-03-22 20:16:35 +01:00
parent 41a49d5785
commit 579db99ae2
No known key found for this signature in database
GPG key ID: 51AED7171EC00614
3 changed files with 0 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -21,9 +21,6 @@ all: DMRGateway
DMRGateway: GitVersion.h $(OBJECTS) DMRGateway: GitVersion.h $(OBJECTS)
$(CXX) $(OBJECTS) $(CFLAGS) $(LIBS) -o DMRGateway $(CXX) $(OBJECTS) $(CFLAGS) $(LIBS) -o DMRGateway
RemoteCommandDMRG: Log.o RemoteCommandDMRG.o UDPSocket.o
$(CXX) Log.o RemoteCommandDMRG.o UDPSocket.o $(CFLAGS) $(LIBS) -o RemoteCommandDMRG
%.o: %.cpp %.o: %.cpp
$(CXX) $(CFLAGS) -c -o $@ $< $(CXX) $(CFLAGS) -c -o $@ $<

111
RemoteCommandDMRG.cpp
View file

@ -1,111 +0,0 @@
/*
* Copyright (C) 2019,2020 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 "RemoteCommandDMRG.h"
#include "UDPSocket.h"
#include "Log.h"
#include <cstdio>
#include <chrono>
#include <thread>
const unsigned int BUFFER_LENGTH = 100U;
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;
}
CRemoteCommandDMRG* command = new CRemoteCommandDMRG(port);
return command->send(cmd);
}
CRemoteCommandDMRG::CRemoteCommandDMRG(unsigned int port) :
m_port(port)
{
CUDPSocket::startup();
::LogInitialise(false, ".", "RemoteCommand", 2U, 2U, false);
}
CRemoteCommandDMRG::~CRemoteCommandDMRG()
{
::LogFinalise();
CUDPSocket::shutdown();
}
int CRemoteCommandDMRG::send(const std::string& command)
{
sockaddr_storage addr;
unsigned int addrLen;
char buffer[BUFFER_LENGTH];
int retStatus = 0;
if (CUDPSocket::lookup("127.0.0.1", m_port, addr, addrLen) != 0) {
LogError("Unable to resolve the address of the host");
return 1;
}
CUDPSocket socket(0U);
bool ret = socket.open(addr);
if (!ret)
return 1;
ret = socket.write((unsigned char*)command.c_str(), command.length(), addr, addrLen);
if (!ret) {
socket.close();
return 1;
}
LogMessage("Command sent: \"%s\" to port: %u", command.c_str(), m_port);
std::this_thread::sleep_for(std::chrono::milliseconds(50));
int len = socket.read((unsigned char*)&buffer[0], BUFFER_LENGTH, addr, addrLen);
if (len > 0) {
buffer[len] = '\0';
LogMessage("%s", buffer);
}
else
{
retStatus = 1;
}
socket.close();
return retStatus;
}

36
RemoteCommandDMRG.h
View file

@ -1,36 +0,0 @@
/*
* 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.
*/
#ifndef RemoteCommandDMRG_H
#define RemoteCommandDMRG_H
#include <string>
class CRemoteCommandDMRG
{
public:
CRemoteCommandDMRG(unsigned int port);
~CRemoteCommandDMRG();
int send(const std::string& command);
private:
unsigned int m_port;
};
#endif