Merge branch 'master' of github.com:g4klx/ircDDBGateway

This commit is contained in:
Jonathan Naylor 2018-06-26 22:04:42 +01:00
commit 076acc66ee
34 changed files with 349 additions and 39 deletions

1
.gitignore vendored
View file

@ -7,4 +7,5 @@ Release
*~ *~
*.bak *.bak
.vs .vs
*.a

16
APRSTransmit/Makefile Normal file
View file

@ -0,0 +1,16 @@
OBJECTS = APRSParser.o APRSTransmitAppD.o APRSTransmit.o
all: aprstransmitd
aprstransmitd: $(OBJECTS)
$(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o aprstransmitd
%.o: %.cpp
$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $<
install:
install -g bin -o root -m 0775 aprstransmitd $(BINDIR)
clean:
$(RM) aprstransmitd *.o *.d *.bak *~

22
Common/Makefile Normal file
View file

@ -0,0 +1,22 @@
OBJECTS = AMBEData.o AnnouncementUnit.o APRSCollector.o APRSWriter.o APRSWriterThread.o AudioUnit.o CacheManager.o CallsignList.o \
CallsignServer.o CCITTChecksum.o CCSData.o CCSHandler.o CCSProtocolHandler.o ConnectData.o DCSHandler.o DCSProtocolHandler.o \
DCSProtocolHandlerPool.o DDData.o DDHandler.o DExtraHandler.o DExtraProtocolHandler.o DExtraProtocolHandlerPool.o \
DPlusAuthenticator.o DPlusHandler.o DPlusProtocolHandler.o DPlusProtocolHandlerPool.o DRATSServer.o DTMF.o \
DummyRepeaterProtocolHandler.o DVTOOLFileReader.o EchoUnit.o G2Handler.o G2ProtocolHandler.o GatewayCache.o \
HBRepeaterProtocolHandler.o HeaderData.o HeaderLogger.o HeardData.o HostFile.o IcomRepeaterProtocolHandler.o IRCDDBGatewayConfig.o \
LogEvent.o Logger.o PollData.o RemoteHandler.o RemoteLinkData.o RemoteProtocolHandler.o RemoteRepeaterData.o RemoteStarNetGroup.o \
RemoteStarNetUser.o RepeaterCache.o RepeaterHandler.o SHA256.o SlowDataEncoder.o StarNetHandler.o StatusData.o \
TCPReaderWriterClient.o TCPReaderWriterServer.o TextCollector.o TextData.o Timer.o UDPReaderWriter.o UserCache.o Utils.o \
VersionUnit.o XLXHostsFileDownloader.o
all: Common.a
Common.a: $(OBJECTS)
$(AR) rcs Common.a $(OBJECTS)
%.o: %.cpp
$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../ircDDB -c -o $@ $<
clean:
$(RM) Common.a *.o *.d *.bak *~

36
Data/Makefile Normal file
View file

@ -0,0 +1,36 @@
install:
install -d -g bin -o root -m 0775 $(DATADIR)
install -g bin -o root -m 0664 CCS_Hosts.txt $(DATADIR)
install -g bin -o root -m 0664 DCS_Hosts.txt $(DATADIR)
install -g bin -o root -m 0664 DExtra_Hosts.txt $(DATADIR)
install -g bin -o root -m 0664 DPlus_Hosts.txt $(DATADIR)
install -g bin -o root -m 0664 TIME_de_DE.ambe $(DATADIR)
install -g bin -o root -m 0664 TIME_de_DE.indx $(DATADIR)
install -g bin -o root -m 0664 TIME_en_GB.ambe $(DATADIR)
install -g bin -o root -m 0664 TIME_en_GB.indx $(DATADIR)
install -g bin -o root -m 0664 TIME_en_US.ambe $(DATADIR)
install -g bin -o root -m 0664 TIME_en_US.indx $(DATADIR)
install -g bin -o root -m 0664 TIME_fr_FR.ambe $(DATADIR)
install -g bin -o root -m 0664 TIME_fr_FR.indx $(DATADIR)
install -g bin -o root -m 0664 TIME_se_SE.ambe $(DATADIR)
install -g bin -o root -m 0664 TIME_se_SE.indx $(DATADIR)
install -g bin -o root -m 0664 de_DE.ambe $(DATADIR)
install -g bin -o root -m 0664 de_DE.indx $(DATADIR)
install -g bin -o root -m 0664 dk_DK.ambe $(DATADIR)
install -g bin -o root -m 0664 dk_DK.indx $(DATADIR)
install -g bin -o root -m 0664 en_GB.ambe $(DATADIR)
install -g bin -o root -m 0664 en_GB.indx $(DATADIR)
install -g bin -o root -m 0664 en_US.ambe $(DATADIR)
install -g bin -o root -m 0664 en_US.indx $(DATADIR)
install -g bin -o root -m 0664 es_ES.ambe $(DATADIR)
install -g bin -o root -m 0664 es_ES.indx $(DATADIR)
install -g bin -o root -m 0664 fr_FR.ambe $(DATADIR)
install -g bin -o root -m 0664 fr_FR.indx $(DATADIR)
install -g bin -o root -m 0664 it_IT.ambe $(DATADIR)
install -g bin -o root -m 0664 it_IT.indx $(DATADIR)
install -g bin -o root -m 0664 no_NO.ambe $(DATADIR)
install -g bin -o root -m 0664 no_NO.indx $(DATADIR)
install -g bin -o root -m 0664 pl_PL.ambe $(DATADIR)
install -g bin -o root -m 0664 pl_PL.indx $(DATADIR)
install -g bin -o root -m 0664 se_SE.ambe $(DATADIR)
install -g bin -o root -m 0664 se_SE.indx $(DATADIR)

14
GUICommon/Makefile Normal file
View file

@ -0,0 +1,14 @@
OBJECTS = AddressTextCtrl.o CallsignTextCtrl.o DCSSet.o DescriptionTextCtrl.o DExtraSet.o DPlusSet.o DPRSSet.o PortTextCtrl.o RemoteSet.o \
RepeaterDataSet.o RepeaterInfoSet.o RestrictedTextCtrl.o StarNetSet.o XLXSet.o
all: GUICommon.a
GUICommon.a: $(OBJECTS)
$(AR) rcs GUICommon.a $(OBJECTS)
%.o: %.cpp
$(CXX) $(CFLAGS) -I../Common -c -o $@ $<
clean:
$(RM) GUICommon.a *.o *.d *.bak *~

76
Makefile Normal file
View file

@ -0,0 +1,76 @@
export DATADIR := "/usr/share/ircddbgateway"
export LOGDIR := "/var/log"
export CONFDIR := "/etc"
export BINDIR := "/usr/bin"
export CXX := $(shell wx-config --cxx)
export CFLAGS := -O2 -Wall $(shell wx-config --cxxflags) -DLOG_DIR='$(LOGDIR)' -DCONF_DIR='$(CONFDIR)' -DDATA_DIR='$(DATADIR)'
export GUILIBS := $(shell wx-config --libs adv,core,base)
export LIBS := $(shell wx-config --libs base)
export LDFLAGS :=
all: ircDDBGateway/ircddbgatewayd ircDDBGatewayConfig/ircddbgatewayconfig APRSTransmit/aprstransmitd RemoteControl/remotecontrold \
StarNetServer/starnetserverd TextTransmit/texttransmitd TimerControl/timercontrold TimeServer/timeserverd VoiceTransmit/voicetransmitd
ircDDBGateway/ircddbgatewayd: Common/Common.a ircDDB/IRCDDB.a
make -C ircDDBGateway
ircDDBGatewayConfig/ircddbgatewayconfig: GUICommon/GUICommon.a Common/Common.a
make -C ircDDBGatewayConfig
APRSTransmit/aprstransmitd: Common/Common.a
make -C APRSTransmit
RemoteControl/remotecontrold: Common/Common.a
make -C RemoteControl
StarNetServer/starnetserverd: Common/Common.a ircDDB/IRCDDB.a
make -C StarNetServer
TextTransmit/texttransmitd: Common/Common.a
make -C TextTransmit
TimerControl/timercontrold: Common/Common.a GUICommon/GUICommon.a
make -C TimerControl
TimeServer/timeserverd: Common/Common.a GUICommon/GUICommon.a
make -C TimeServer
VoiceTransmit/voicetransmitd: Common/Common.a
make -C VoiceTransmit
GUICommon/GUICommon.a:
make -C GUICommon
Common/Common.a:
make -C Common
ircDDB/IRCDDB.a:
make -C ircDDB
install: all
make -C Data install
make -C APRSTransmit install
make -C ircDDBGateway install
make -C RemoteControl install
make -C StarNetServer install
make -C TextTransmit install
make -C TimerControl install
make -C TimeServer install
make -C VoiceTransmit install
make -C ircDDBGatewayConfig install
clean:
make -C Common clean
make -C ircDDB clean
make -C GUICommon clean
make -C APRSTransmit clean
make -C ircDDBGateway clean
make -C RemoteControl clean
make -C StarNetServer clean
make -C TextTransmit clean
make -C TimerControl clean
make -C TimeServer clean
make -C VoiceTransmit clean
make -C ircDDBGatewayConfig clean

17
RemoteControl/Makefile Normal file
View file

@ -0,0 +1,17 @@
OBJECTS = RemoteControlAppD.o RemoteControlCallsignData.o RemoteControlConfig.o RemoteControlLinkData.o RemoteControlRemoteControlHandler.o \
RemoteControlRepeaterData.o RemoteControlStarNetGroup.o RemoteControlStarNetUser.o
all: remotecontrold
remotecontrold: $(OBJECTS)
$(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o remotecontrold
%.o: %.cpp
$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $<
install:
install -g bin -o root -m 0775 remotecontrold $(BINDIR)
clean:
$(RM) remotecontrold *.o *.d *.bak *~

View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2011,2012,2013 by Jonathan Naylor G4KLX * Copyright (C) 2011,2012,2013,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -23,7 +23,7 @@
#include <wx/config.h> #include <wx/config.h>
#include <wx/cmdline.h> #include <wx/cmdline.h>
IMPLEMENT_APP(CRemoteControlApp) wxIMPLEMENT_APP(CRemoteControlApp);
const wxChar* NAME_PARAM = wxT("Name"); const wxChar* NAME_PARAM = wxT("Name");

View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2011,2012,2013 by Jonathan Naylor G4KLX * Copyright (C) 2011,2012,2013 b,2018y Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -54,6 +54,6 @@ private:
CRemoteControlConfig* m_config; CRemoteControlConfig* m_config;
}; };
DECLARE_APP(CRemoteControlApp) wxDECLARE_APP(CRemoteControlApp);
#endif #endif

View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2011-2015 by Jonathan Naylor G4KLX * Copyright (C) 2011-2015,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -179,7 +179,7 @@ void CRemoteControlFrame::onAbout(wxCommandEvent&)
{ {
wxAboutDialogInfo info; wxAboutDialogInfo info;
info.AddDeveloper(wxT("Jonathan Naylor, G4KLX")); info.AddDeveloper(wxT("Jonathan Naylor, G4KLX"));
info.SetCopyright(wxT("(C) 2011-2015 using GPL v2 or later")); info.SetCopyright(wxT("(C) 2011-2018 using GPL v2 or later"));
info.SetName(APPLICATION_NAME); info.SetName(APPLICATION_NAME);
info.SetVersion(VERSION); info.SetVersion(VERSION);
info.SetDescription(_("This program allows for the controlling of\nircDDB Gateway and STARnet Digital Server.")); info.SetDescription(_("This program allows for the controlling of\nircDDB Gateway and STARnet Digital Server."));

16
StarNetServer/Makefile Normal file
View file

@ -0,0 +1,16 @@
OBJECTS = StarNetServerAppD.o StarNetServerConfig.o StarNetServerThread.o StarNetServerThreadHelper.o
all: starnetserverd
starnetserverd: $(OBJECTS)
$(CXX) $(OBJECTS) ../Common/Common.a ../ircDDB/IRCDDB.a $(LDFLAGS) $(LIBS) -o starnetserverd
%.o: %.cpp
$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -I../ircDDB -c -o $@ $<
install:
install -g bin -o root -m 0775 starnetserverd $(BINDIR)
clean:
$(RM) starnetserverd *.o *.d *.bak *~

View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2010,2011,2012,2015 by Jonathan Naylor G4KLX * Copyright (C) 2010,2011,2012,2015,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -28,7 +28,7 @@
#include <wx/cmdline.h> #include <wx/cmdline.h>
#include <wx/filename.h> #include <wx/filename.h>
IMPLEMENT_APP(CStarNetServerApp) wxIMPLEMENT_APP(CStarNetServerApp);
const wxChar* NOLOGGING_SWITCH = wxT("nolog"); const wxChar* NOLOGGING_SWITCH = wxT("nolog");
const wxChar* GUI_SWITCH = wxT("gui"); const wxChar* GUI_SWITCH = wxT("gui");

View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2010,2011,2012 by Jonathan Naylor G4KLX * Copyright (C) 2010,2011,2012,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -167,6 +167,6 @@ private:
void createThread(); void createThread();
}; };
DECLARE_APP(CStarNetServerApp) wxDECLARE_APP(CStarNetServerApp);
#endif #endif

View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2010-2015 by Jonathan Naylor G4KLX * Copyright (C) 2010-2015,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -633,7 +633,7 @@ void CStarNetServerFrame::onAbout(wxCommandEvent&)
wxAboutDialogInfo info; wxAboutDialogInfo info;
info.AddDeveloper(wxT("Jonathan Naylor, G4KLX")); info.AddDeveloper(wxT("Jonathan Naylor, G4KLX"));
info.AddDeveloper(wxT("Michael Dirska, DL1BFF")); info.AddDeveloper(wxT("Michael Dirska, DL1BFF"));
info.SetCopyright(wxT("(C) 2011-2015 using GPL v2 or later")); info.SetCopyright(wxT("(C) 2011-2018 using GPL v2 or later"));
info.SetName(APPLICATION_NAME); info.SetName(APPLICATION_NAME);
info.SetVersion(VERSION); info.SetVersion(VERSION);
info.SetDescription(_("This program allows an Internet connected computer \nto become a StarNet Digital Server.")); info.SetDescription(_("This program allows an Internet connected computer \nto become a StarNet Digital Server."));

16
TextTransmit/Makefile Normal file
View file

@ -0,0 +1,16 @@
OBJECTS = TextTransmit.o
all: texttransmitd
texttransmitd: $(OBJECTS)
$(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o texttransmitd
%.o: %.cpp
$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $<
install:
install -g bin -o root -m 0775 texttransmitd $(BINDIR)
clean:
$(RM) texttransmitd *.o *.d *.bak *~

16
TimeServer/Makefile Normal file
View file

@ -0,0 +1,16 @@
OBJECTS = TimeServerD.o TimeServerConfig.o TimeServerThread.o TimeServerThreadHelper.o
all: timeserverd
timeserverd: $(OBJECTS)
$(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o timeserverd
%.o: %.cpp
$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $<
install:
install -g bin -o root -m 0775 timeserverd $(BINDIR)
clean:
$(RM) timeserverd *.o *.d *.bak *~

View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2012,2014,2015 by Jonathan Naylor G4KLX * Copyright (C) 2012,2014,2015,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -26,7 +26,7 @@
#include <wx/cmdline.h> #include <wx/cmdline.h>
#include <wx/filename.h> #include <wx/filename.h>
IMPLEMENT_APP(CTimeServerApp) wxIMPLEMENT_APP(CTimeServerApp);
const wxChar* NAME_PARAM = wxT("Name"); const wxChar* NAME_PARAM = wxT("Name");
const wxChar* NOLOGGING_SWITCH = wxT("nolog"); const wxChar* NOLOGGING_SWITCH = wxT("nolog");

View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2012 by Jonathan Naylor G4KLX * Copyright (C) 2012,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -70,6 +70,6 @@ private:
void createThread(); void createThread();
}; };
DECLARE_APP(CTimeServerApp) wxDECLARE_APP(CTimeServerApp);
#endif #endif

View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2012-2015 by Jonathan Naylor G4KLX * Copyright (C) 2012-2015,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -176,7 +176,7 @@ void CTimeServerFrame::onAbout(wxCommandEvent&)
{ {
wxAboutDialogInfo info; wxAboutDialogInfo info;
info.AddDeveloper(wxT("Jonathan Naylor, G4KLX")); info.AddDeveloper(wxT("Jonathan Naylor, G4KLX"));
info.SetCopyright(wxT("(C) 2012-2015 using GPL v2 or later")); info.SetCopyright(wxT("(C) 2012-2018 using GPL v2 or later"));
info.SetName(APPLICATION_NAME); info.SetName(APPLICATION_NAME);
info.SetVersion(VERSION); info.SetVersion(VERSION);
info.SetDescription(_("This program allows a computer running a gateway\nto have the time announced.")); info.SetDescription(_("This program allows a computer running a gateway\nto have the time announced."));

17
TimerControl/Makefile Normal file
View file

@ -0,0 +1,17 @@
OBJECTS = TimerControlAppD.o TimerControlConfig.o TimerControlItemFile.o TimerControlRemoteControlHandler.o TimerControlThread.o \
TimerControlThreadHelper.o
all: timercontrold
timercontrold: $(OBJECTS)
$(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o timercontrold
%.o: %.cpp
$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $<
install:
install -g bin -o root -m 0775 timercontrold $(BINDIR)
clean:
$(RM) timercontrold *.o *.d *.bak *~

View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2011-2015 by Jonathan Naylor G4KLX * Copyright (C) 2011-2015,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -26,7 +26,7 @@
#include <wx/cmdline.h> #include <wx/cmdline.h>
#include <wx/filename.h> #include <wx/filename.h>
IMPLEMENT_APP(CTimerControlApp) wxIMPLEMENT_APP(CTimerControlApp);
const wxChar* NAME_PARAM = wxT("Name"); const wxChar* NAME_PARAM = wxT("Name");
const wxChar* NOLOGGING_SWITCH = wxT("nolog"); const wxChar* NOLOGGING_SWITCH = wxT("nolog");

View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2011,2012,2013 by Jonathan Naylor G4KLX * Copyright (C) 2011,2012,2013,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -69,6 +69,6 @@ private:
void createThread(); void createThread();
}; };
DECLARE_APP(CTimerControlApp) wxDECLARE_APP(CTimerControlApp);
#endif #endif

View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2011-2015 by Jonathan Naylor G4KLX * Copyright (C) 2011-2015,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -168,7 +168,7 @@ void CTimerControlFrame::onAbout(wxCommandEvent&)
{ {
wxAboutDialogInfo info; wxAboutDialogInfo info;
info.AddDeveloper(wxT("Jonathan Naylor, G4KLX")); info.AddDeveloper(wxT("Jonathan Naylor, G4KLX"));
info.SetCopyright(wxT("(C) 2011-2015 using GPL v2 or later")); info.SetCopyright(wxT("(C) 2011-2018 using GPL v2 or later"));
info.SetName(APPLICATION_NAME); info.SetName(APPLICATION_NAME);
info.SetVersion(VERSION); info.SetVersion(VERSION);
info.SetDescription(_("This program allows for the controlling of\nthe ircDDB Gateway.")); info.SetDescription(_("This program allows for the controlling of\nthe ircDDB Gateway."));

16
VoiceTransmit/Makefile Normal file
View file

@ -0,0 +1,16 @@
OBJECTS = VoiceStore.o VoiceTransmit.o
all: voicetransmitd
voicetransmitd: $(OBJECTS)
$(CXX) $(OBJECTS) ../Common/Common.a $(LDFLAGS) $(LIBS) -o voicetransmitd
%.o: %.cpp
$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -c -o $@ $<
install:
install -g bin -o root -m 0775 voicetransmitd $(BINDIR)
clean:
$(RM) voicetransmitd *.o *.d *.bak *~

14
ircDDB/Makefile Normal file
View file

@ -0,0 +1,14 @@
OBJECTS = IRCClient.o IRCDDBApp.o IRCDDBClient.o IRCDDB.o IRCDDBMultiClient.o IRCMessage.o IRCMessageQueue.o IRCProtocol.o IRCReceiver.o \
IRCutils.o
all: IRCDDB.a
IRCDDB.a: $(OBJECTS)
$(AR) rcs IRCDDB.a $(OBJECTS)
%.o: %.cpp
$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -c -o $@ $<
clean:
$(RM) IRCDDB.a *.o *.d *.bak *~

View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2010-2015 by Jonathan Naylor G4KLX * Copyright (C) 2010-2015,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -36,7 +36,7 @@
#include <wx/cmdline.h> #include <wx/cmdline.h>
#include <wx/filename.h> #include <wx/filename.h>
IMPLEMENT_APP(CIRCDDBGatewayApp) wxIMPLEMENT_APP(CIRCDDBGatewayApp);
const wxChar* NAME_PARAM = wxT("Gateway Name"); const wxChar* NAME_PARAM = wxT("Gateway Name");
const wxChar* NOLOGGING_SWITCH = wxT("nolog"); const wxChar* NOLOGGING_SWITCH = wxT("nolog");

View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2010-2013 by Jonathan Naylor G4KLX * Copyright (C) 2010-2013,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -66,6 +66,6 @@ private:
void createThread(); void createThread();
}; };
DECLARE_APP(CIRCDDBGatewayApp) wxDECLARE_APP(CIRCDDBGatewayApp);
#endif #endif

View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2010-2013,2015 by Jonathan Naylor G4KLX * Copyright (C) 2010-2013,2015,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -119,9 +119,9 @@ int main(int argc, char** argv)
wxString pidFileName; wxString pidFileName;
if (!name.IsEmpty()) if (!name.IsEmpty())
pidFileName.Printf(wxT("/var/run/ircddbgateway_%s.pid"), name.c_str()); pidFileName.Printf(wxT("/var/run/opendv/ircddbgateway_%s.pid"), name.c_str());
else else
pidFileName = wxT("/var/run/ircddbgateway.pid"); pidFileName = wxT("/var/run/opendv/ircddbgateway.pid");
pidFileName.Replace(wxT(" "), wxT("_")); pidFileName.Replace(wxT(" "), wxT("_"));
char fileName[128U]; char fileName[128U];

View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2010-2015 by Jonathan Naylor G4KLX * Copyright (C) 2010-2015,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -199,7 +199,7 @@ void CIRCDDBGatewayFrame::onAbout(wxCommandEvent&)
wxAboutDialogInfo info; wxAboutDialogInfo info;
info.AddDeveloper(wxT("Jonathan Naylor, G4KLX")); info.AddDeveloper(wxT("Jonathan Naylor, G4KLX"));
info.AddDeveloper(wxT("Michael Dirska, DL1BFF")); info.AddDeveloper(wxT("Michael Dirska, DL1BFF"));
info.SetCopyright(wxT("(C) 2010-2015 using GPL v2 or later")); info.SetCopyright(wxT("(C) 2010-2018 using GPL v2 or later"));
info.SetName(APPLICATION_NAME); info.SetName(APPLICATION_NAME);
info.SetVersion(VERSION); info.SetVersion(VERSION);
info.SetDescription(_("This program allows a computer running homebrew repeaters\nto access the ircDDB network for G2 callsign and repeater routing,\nas well as D-Plus and DExtra reflectors. It includes a StarNet\nDigital server.")); info.SetDescription(_("This program allows a computer running homebrew repeaters\nto access the ircDDB network for G2 callsign and repeater routing,\nas well as D-Plus and DExtra reflectors. It includes a StarNet\nDigital server."));

16
ircDDBGateway/Makefile Normal file
View file

@ -0,0 +1,16 @@
OBJECTS = IRCDDBGatewayAppD.o IRCDDBGatewayStatusData.o IRCDDBGatewayThread.o IRCDDBGatewayThreadHelper.o
all: ircddbgatewayd
ircddbgatewayd: $(OBJECTS)
$(CXX) $(OBJECTS) ../Common/Common.a ../ircDDB/IRCDDB.a $(LDFLAGS) $(LIBS) -o ircddbgatewayd
%.o: %.cpp
$(CXX) -DwxUSE_GUI=0 $(CFLAGS) -I../Common -I../ircDDB -c -o $@ $<
install:
install -g bin -o root -m 0775 ircddbgatewayd $(BINDIR)
clean:
$(RM) ircddbgatewayd *.o *.d *.bak *~

View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2010-2014 by Jonathan Naylor G4KLX * Copyright (C) 2010-2014,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -25,7 +25,7 @@
#include <wx/cmdline.h> #include <wx/cmdline.h>
#include <wx/filename.h> #include <wx/filename.h>
IMPLEMENT_APP(CIRCDDBGatewayConfigApp) wxIMPLEMENT_APP(CIRCDDBGatewayConfigApp);
const wxChar* NAME_PARAM = wxT("Gateway Name"); const wxChar* NAME_PARAM = wxT("Gateway Name");
const wxChar* CONFDIR_OPTION = wxT("confdir"); const wxChar* CONFDIR_OPTION = wxT("confdir");

View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2010-2013 by Jonathan Naylor G4KLX * Copyright (C) 2010-2013,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -42,6 +42,6 @@ private:
CIRCDDBGatewayConfigFrame* m_frame; CIRCDDBGatewayConfigFrame* m_frame;
}; };
DECLARE_APP(CIRCDDBGatewayConfigApp) wxDECLARE_APP(CIRCDDBGatewayConfigApp);
#endif #endif

View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2010-2015 by Jonathan Naylor G4KLX * Copyright (C) 2010-2015,2018 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -627,7 +627,7 @@ void CIRCDDBGatewayConfigFrame::onAbout(wxCommandEvent&)
{ {
wxAboutDialogInfo info; wxAboutDialogInfo info;
info.AddDeveloper(wxT("Jonathan Naylor, G4KLX")); info.AddDeveloper(wxT("Jonathan Naylor, G4KLX"));
info.SetCopyright(wxT("(C) 2010-2015 using GPL v2 or later")); info.SetCopyright(wxT("(C) 2010-2018 using GPL v2 or later"));
info.SetName(APPLICATION_NAME); info.SetName(APPLICATION_NAME);
info.SetVersion(VERSION); info.SetVersion(VERSION);
info.SetDescription(_("This program configures the ircDDB Gateway.")); info.SetDescription(_("This program configures the ircDDB Gateway."));

View file

@ -0,0 +1,17 @@
OBJECTS = IRCDDBGatewayConfigApp.o IRCDDBGatewayConfigFrame.o IRCDDBGatewayConfigGatewaySet.o IRCDDBGatewayConfigIrcDDBSet.o \
IRCDDBGatewayConfigMiscellaneousSet.o
all: ircddbgatewayconfig
ircddbgatewayconfig: $(OBJECTS)
$(CXX) $(OBJECTS) ../GUICommon/GUICommon.a ../Common/Common.a $(LDFLAGS) $(GUILIBS) -o ircddbgatewayconfig
%.o: %.cpp
$(CXX) $(CFLAGS) -I../Common -I../GUICommon -c -o $@ $<
install:
install -g bin -o root -m 0775 ircddbgatewayconfig $(BINDIR)
clean:
$(RM) ircddbgatewayconfig *.o *.d *.bak *~