diff --git a/ACTK1_0/Makefile b/ACTK1_0/Makefile index 5b282cf..3dcbdbf 100644 --- a/ACTK1_0/Makefile +++ b/ACTK1_0/Makefile @@ -1,7 +1,7 @@ ################################################## # Makefile for building lib and main test routine# ################################################## -LOCATION=authoring +#LOCATION=debian7 SYSTEM = $(shell uname -s) @@ -15,17 +15,23 @@ CXXFLAGS = $(PRODORDEV) -Wall -Wpointer-arith -Wcast-qual -D_REENTRANT -fPIC CPPFLAGS = -fPIC -D_GNU_SOURCE CXXFLAGS += -D_GNU_SOURCE -O0 -ifeq ($(LOCATION),authoring) -XALAN_LIB_DIR = /usr/lib/x86_64-linux-gnu/ +ifeq ($(LOCATION),debian7) +#XALAN_LIB_DIR = /usr/lib/x86_64-linux-gnu/ +XALAN_LIB_DIR = /usr/local/lib/ +XALAN_LIB = xalan-c +XALAN_INC_DIR = /usr/local/include/xalanc +XERCES_LIB_DIR = /usr/local/lib/ +XERCES_LIB = xerces-c +XERCES_INC_DIR = /usr/local/include/xercesc else XALAN_LIB_DIR = /usr/lib/ -endif - XALAN_LIB = xalan-c XALAN_INC_DIR = /usr/include/xalanc XERCES_LIB_DIR = /usr/lib/ XERCES_LIB = xerces-c -XERCES_INC_DIR = /usr/include/xercesc/ +XERCES_INC_DIR = /usr/include/xercesc +endif + include xml-deps.mk diff --git a/APIG/build/drde-cd b/APIG/build/drde-cd index 1f8d110..e391821 100755 Binary files a/APIG/build/drde-cd and b/APIG/build/drde-cd differ diff --git a/APIG/client/ausreg-cd.cpp b/APIG/client/ausreg-cd.cpp index c37680d..a08893e 100644 --- a/APIG/client/ausreg-cd.cpp +++ b/APIG/client/ausreg-cd.cpp @@ -117,8 +117,8 @@ int main(int const argc, const char ** const argv) thisCliever = NULL; - cdHasTk = strstr(argv[0],"clips") ? true : false; - cdOrTkValue = cdHasTk ? 'd' : 'D'; // d == kb enabled, D = !d + cdHasTk = strstr(argv[0],"loadtk") ? true : false; + cdOrTkValue = cdHasTk ? 'd' : 'D'; // d == EPP Toolkit enabled, D = !d //RAII constructor/destructor struct shm_remove @@ -133,8 +133,8 @@ int main(int const argc, const char ** const argv) memset(acCDglobal.get_address(), 0, acCDglobal.get_size()); gm = (ac_cd_global *)acCDglobal.get_address(); strcpy(gm->id,"ausreg-cd"); - strcmp(gm->id,"ausreg-cd"); // Will segfault if there is a problem so catches are are futile. - // But the signal trap will catch the fault. + strcmp(gm->id,"ausreg-cd"); // Will segfault if there is a problem so catches are futile. + // But the signal trap will catch the fault. thisConfig = new clientDaemonConfig(); thisConfig->shellProcess = getpid(); @@ -236,6 +236,6 @@ void usage() { std::cerr << "Usage: " << cdOrTk<< " ['*'] [device=TEST] [mdIP=" MD_DEFAULT_IP "] [logs=\\tmp]\n\n where \n\n" "\t is required, must be the first parameter, and must be 1000 or greater. \n" "\t The other parameters are optional and non-positional and take the shown defaults. \n" - "\t '*', if present, indicates skip the command loop (string quotes may be required). \n"; + "\t '*', if present, indicates skip the command loop (string quotes may be required). \n\n"; exit(1); } diff --git a/APIG/client/commander.cpp b/APIG/client/commander.cpp index 17d649a..cd967ac 100644 --- a/APIG/client/commander.cpp +++ b/APIG/client/commander.cpp @@ -6,7 +6,7 @@ if (!(expr)) { \ std::cerr << __FILE__ << ":" << __LINE__ << ":" << #expr << std::endl;} -const char *banner = CD_NAME " " CD_VERSION " compiled on " __DATE__ " @ " __TIME__ " (%d)"; +const char *banner = CD_NAME " " CD_VERSION " compiled on " __DATE__ " @ " __TIME__ " (%d/%d)"; char theBanner[256]; int targetHost = 0; @@ -232,8 +232,10 @@ void mdCommander::driver() { if (!strcmp(rawString,"done")) { goto done; } - if (!strcmp(rawString,"quit")) { + if (!strcmp(rawString,"quit")) { work[128]; thisConfig->terminateRequest = true; + sprintf(work,"kill -9 %d",thisConfig->daemonProcess); + system(work); goto done; } continue; @@ -254,7 +256,7 @@ void mdCommander::greet() { const char *title="AusReg Cliever Commander", *prompt="Enter ? or command"; - sprintf(theBanner,banner,thisConfig->shellProcess); + sprintf(theBanner,banner,thisConfig->shellProcess,thisConfig->daemonProcess); getmaxyx(stdscr,row,col); mvprintw(0,(col-strlen(banner))/2,"%s",theBanner); mvprintw(row/2,(col-strlen(title))/2,"%s",title); @@ -492,6 +494,9 @@ const char *befehlJetzt = cmdNames[commandsNow[cmdNow]]; return true; }; +// +// Wrappers for specific EPP commands. +// void mdCommander::check(bool run) { if (!commandsNow[cmdNow]) commandsNow[cmdNow] = 0; diff --git a/AusRegCliever/Makefile b/AusRegCliever/Makefile index 71fe1b0..60afbeb 100644 --- a/AusRegCliever/Makefile +++ b/AusRegCliever/Makefile @@ -1,4 +1,4 @@ -LOCATION=authoring +LOCATION=debian7 # # Add other locations and move target differences into the macros as needed, # setup for my primary development and testing hosts. @@ -11,7 +11,7 @@ Cc=gcc LOG4LIB=-L/usr/lib CLIENT=drde -ifeq ($(LOCATION),authoring) +ifeq ($(LOCATION),debian7) ARTKLIB=-L/home/jdaugherty/clients/reg.de/git/ACTK1_0/lib ARTKINCL=-I/home/jdaugherty/clients/reg.de/git/ACTK1_0 else @@ -24,17 +24,22 @@ SLIBS= -L/usr/lib $(BOSTLIB) $(LOG4LIB) $(ARTKLIB) -l boost_system -l boost_thre SINCL= -I include -I /usr/include/log4cpp $(BOSINCL) CFLAGS= -DCURRENT_DEBUG=1000 -ggdb3 -ifeq ($(LOCATION),authoring) -XALAN_LIB_DIR = /usr/lib/x86_64-linux-gnu/ +ifeq ($(LOCATION),debian7) +#XALAN_LIB_DIR = /usr/lib/x86_64-linux-gnu/ +XALAN_LIB_DIR = /usr/local/lib +XALAN_LIB = xalan-c +XALAN_INC_DIR = /usr/local/include/xalanc +XERCES_LIB_DIR = /usr/local/lib/ +XERCES_LIB = xerces-c +XERCES_INC_DIR = /usr/local/include/xercesc/ else XALAN_LIB_DIR = /usr/lib/ -endif - XALAN_LIB = xalan-c -XALAN_INC_DIR = /usr/include/xalanc +XALAN_INC_DIR = /usr/include/xalanc/ XERCES_LIB_DIR = /usr/lib/ XERCES_LIB = xerces-c XERCES_INC_DIR = /usr/include/xercesc/ +endif # # ---------- Should not need to change below @@ -50,6 +55,7 @@ ACOBJS= build/cliever.o build/mdLogger.o build/masterDaemonConfig.o build/maste build/mdHost.o build/mdState.o build/mdAusReg.o + ARTKDEPS = -L$(ARTK_LIB_DIR) -lACTK1_0 \ -L$(XALAN_LIB_DIR) -lxalan-c -lxalanMsg\ -L$(XERCES_LIB_DIR) -lxerces-c \ diff --git a/AusRegCliever/server/masterDaemon.cpp b/AusRegCliever/server/masterDaemon.cpp index 6b059a6..a318ab0 100644 --- a/AusRegCliever/server/masterDaemon.cpp +++ b/AusRegCliever/server/masterDaemon.cpp @@ -123,6 +123,7 @@ void masterDaemon::dispatch(const mdIncoming &what) { } } + int masterDaemon::initAusRegTK(void) { int rc=OK; @@ -153,6 +154,7 @@ int masterDaemon::initAusRegTK(void) { return rc; } + void masterDaemon::listen() { EventSender::add(*this); @@ -250,6 +252,7 @@ void masterDaemon::run() { fg = new mdDGChannel( thisService->io_, 0 ); if (initAusRegTK()) return; + if (artk->tkScenario == ACTK_OTEA) { boost::thread oteArun(oteA); assert(oteArun.joinable()); @@ -262,6 +265,7 @@ void masterDaemon::run() { oteBrun.join(); theseLogs->logNdebug(MAX_DEBUG,0,"Pre-production Ops / OTEB EOJ."); } + listen(); boost::thread work(mdWQ); assert(work.joinable());