diff -u --new-file --recursive aprsd-2.2.5-15.orig/src/aprsString.cpp aprsd-2.2.5-15/src/aprsString.cpp --- aprsd-2.2.5-15.orig/src/aprsString.cpp 2003-05-29 20:26:33.000000000 +0200 +++ aprsd-2.2.5-15/src/aprsString.cpp 2004-07-20 23:32:53.000000000 +0200 @@ -299,7 +299,7 @@ << endl << ends ; - WriteLog(errormsg,ERRORLOG); + WriteLog(errormsg,LOGPATH + ERRORLOG); cerr << errormsg; delete errormsg; aprsType = APRSREJECT; @@ -802,8 +802,8 @@ rv = true; }catch(exception& error) { rv = false; - WriteLog("AEA to TAPR conversion error",ERRORLOG); - WriteLog(s.c_str(),ERRORLOG); + WriteLog("AEA to TAPR conversion error",LOGPATH + ERRORLOG); + WriteLog(s.c_str(),LOGPATH + ERRORLOG); } return rv; } @@ -1417,8 +1417,8 @@ } } catch(exception& error) { rc = false; - WriteLog("aprsString changePath error",ERRORLOG); - WriteLog(oldPath,ERRORLOG); + WriteLog("aprsString changePath error",LOGPATH + ERRORLOG); + WriteLog(oldPath,LOGPATH + ERRORLOG); } return rc; } diff -u --new-file --recursive aprsd-2.2.5-15.orig/src/aprsd.cpp aprsd-2.2.5-15/src/aprsd.cpp --- aprsd-2.2.5-15.orig/src/aprsd.cpp 2003-05-29 05:09:39.000000000 +0200 +++ aprsd-2.2.5-15/src/aprsd.cpp 2004-07-20 23:32:53.000000000 +0200 @@ -97,9 +97,10 @@ string szAprsPath; int msgsn; -const string HOMEDIR("/home/aprsd2"); -const string CONFPATH(""); +const string HOMEDIR("/var/log/aprsd"); +const string CONFPATH("/etc/ax25/aprsd/"); const string CONFFILE("aprsd.conf"); +const string LOGPATH("/var/log/aprsd/"); const string MAINLOG("aprsd.log"); const string STSMLOG("thirdparty.log"); const string RFLOG("rf.log"); @@ -123,17 +124,15 @@ timespec ts; cout << "\nBeginning shutdown..." << endl; - WriteLog(string("Server Shutdown"), MAINLOG); + WriteLog(string("Server Shutdown"), LOGPATH + MAINLOG); tcsetattr(fileno(stdin),TCSANOW,&initial_settings); //restore terminal mode - string outFile = CONFPATH; - outFile += SAVE_HISTORY; - int n = SaveHistory(outFile); + int n = SaveHistory(LOGPATH + SAVE_HISTORY); cout << "Saved " << n << " history items in " - << outFile + << LOGPATH + SAVE_HISTORY << endl; string ShutDown = szServerCall; @@ -977,9 +976,7 @@ //fdump = fopen("dump.txt","w+"); //debug - string histFile = CONFPATH; - histFile += SAVE_HISTORY; - ReadHistory(histFile); + ReadHistory(LOGPATH + SAVE_HISTORY); string sConfFile = CONFPATH; sConfFile += CONFFILE; //default server configuration file @@ -1049,7 +1046,7 @@ serverInit(); //Initialize Server - start threads - WriteLog(string("Server Start"), MAINLOG); + WriteLog(string("Server Start"), LOGPATH + MAINLOG); cout << "Server Started" << endl; Time = time(NULL); diff -u --new-file --recursive aprsd-2.2.5-15.orig/src/aprsd.h aprsd-2.2.5-15/src/aprsd.h --- aprsd-2.2.5-15.orig/src/aprsd.h 2003-03-22 22:53:19.000000000 +0100 +++ aprsd-2.2.5-15/src/aprsd.h 2004-07-20 23:32:53.000000000 +0200 @@ -21,6 +21,7 @@ extern const std::string CONFPATH; extern const std::string CONFFILE; +extern const std::string LOGPATH; extern const std::string MAINLOG; extern const std::string STSMLOG; extern const std::string RFLOG; diff -u --new-file --recursive aprsd-2.2.5-15.orig/src/rf.cpp aprsd-2.2.5-15/src/rf.cpp --- aprsd-2.2.5-15.orig/src/rf.cpp 2003-05-29 05:09:39.000000000 +0200 +++ aprsd-2.2.5-15/src/rf.cpp 2004-07-20 23:35:34.000000000 +0200 @@ -220,7 +220,7 @@ } if (logAllRF || abuff->ax25Source.compare(MyCall) == 0) - WriteLog(abuff->c_str(), RFLOG); //Log our own packets that were digipeated + WriteLog(abuff->c_str(), LOGPATH +RFLOG); //Log our own packets that were digipeated if ((abuff->reformatted) || ((abuff->ax25Source.compare(MyCall) == 0) diff -u --new-file --recursive aprsd-2.2.5-15.orig/src/servers.cpp aprsd-2.2.5-15/src/servers.cpp --- aprsd-2.2.5-15.orig/src/servers.cpp 2003-10-01 18:58:27.000000000 +0200 +++ aprsd-2.2.5-15/src/servers.cpp 2004-07-20 23:32:53.000000000 +0200 @@ -449,7 +449,7 @@ if (cpIGATE[i].RemoteSocket == 0) { string warn = string(cpIGATE[i].RemoteName) + ": Error: No socket number specified for Server/Hub\n"; cerr << warn ; - WriteLog(warn, string(MAINLOG)); + WriteLog(warn, string(LOGPATH + MAINLOG)); } else { if (!firstHub) { if ((rc = pthread_create(&cpIGATE[i].tid, NULL,TCPConnectThread,&cpIGATE[i])) == 0) @@ -660,7 +660,7 @@ } if ((p->aprsType == APRSREJECT) && (!dup)) - WriteLog(p->raw, string(REJECTLOG)); // Log rejected packets + WriteLog(p->raw, string(LOGPATH + REJECTLOG)); // Log rejected packets sendLock.get(); addDelLock.get(); @@ -870,7 +870,7 @@ #ifdef DEBUGTHIRDPARTY if (abuff->aprsType == APRS3RDPARTY){ string logEntry = abuff->call + ": " + *abuff; - WriteLog(logEntry, DEBUGLOG); // DEBUG CODE + WriteLog(logEntry, LOGPATH + DEBUGLOG); // DEBUG CODE } #endif if ((abuff->hasBeenIgated()) && (abuff->aprsType == APRS3RDPARTY)) @@ -968,7 +968,7 @@ abuff->aprsType = APRSREJECT; //Looped packet, REJECT string log_str = abuff->srcHeader + *abuff; - WriteLog(log_str, LOOPLOG); //Write offending packet to loop.log + WriteLog(log_str, LOGPATH + LOOPLOG); //Write offending packet to loop.log countLOOP++; } // End loop detect #1 @@ -980,7 +980,7 @@ if (rc != static_cast(abuff->pathSize - 1)){ abuff->aprsType = APRSREJECT; //Looped packet, REJECT string log_str = abuff->srcHeader + *abuff; - WriteLog(log_str, LOOPLOG); //Write offending packet to loop.log + WriteLog(log_str, LOGPATH + LOOPLOG); //Write offending packet to loop.log countLOOP++; } } // End loop detect #2 @@ -1181,7 +1181,7 @@ // << ": " // << abuff->getChar(); // Save the station-to-station message in the log - WriteLog(szUserMsg, STSMLOG); + WriteLog(szUserMsg, LOGPATH + STSMLOG); } //WriteCom(rfbuf); // <- Send string out on RF via TNC rfWrite(rfbuf); @@ -1269,7 +1269,7 @@ sprintf(timeStr, "%3d:%02d:%02d", iHour, iMinute, iSecond); sLog << timeStr; // time already adds CFLF - WriteLog(sLog.str(), MAINLOG); + WriteLog(sLog.str(), LOGPATH + MAINLOG); /*{ memset(infomsg, 0, MAX); @@ -1476,7 +1476,7 @@ << serverport; /* << " " << aprsString::getObjCount() << "/" << ItemCount */ //Debug //<< ends; - WriteLog(msg.str(), MAINLOG); + WriteLog(msg.str(), LOGPATH +MAINLOG); } data = 1; //Set socket for non-blocking @@ -1505,7 +1505,7 @@ << " aborted during history dump on " << serverport; - WriteLog(msg.str(), MAINLOG); + WriteLog(msg.str(), LOGPATH + MAINLOG); endSession(session, szPeer, userCall, starttime); } @@ -1530,7 +1530,7 @@ << " aborted welcome msg on " << serverport; - WriteLog(msg.str(), MAINLOG); + WriteLog(msg.str(), LOGPATH + MAINLOG); delete pWelcome; endSession(session, szPeer, userCall, starttime); } @@ -1541,10 +1541,10 @@ if (sp == NULL) { if (serverLoad_s < MaxLoad){ rc = SendSessionStr(session,szErrorUsers); - WriteLog(string("Error, too many users "), MAINLOG); + WriteLog(string("Error, too many users "), LOGPATH + MAINLOG); } else { rc = SendSessionStr(session,szErrorLoad); - WriteLog(string("Error, max server load exceeded"), MAINLOG); + WriteLog(string("Error, max server load exceeded"), LOGPATH + MAINLOG); } if (rc == -1) @@ -1705,7 +1705,7 @@ << " Exited TNC remote sysop mode." << endl; - WriteLog(log.str(), MAINLOG); + WriteLog(log.str(), LOGPATH + MAINLOG); } tncMute = false; TncSysopMode = false; @@ -1868,7 +1868,7 @@ << ends ; conQueue.write(cp,0); //cp deleted by queue reader - WriteLog(cp,MAINLOG); + WriteLog(cp,LOGPATH + MAINLOG); } } @@ -1932,7 +1932,7 @@ << " " << atemp.pgmVers << " " << szUserStatus; - WriteLog(msg.str(), MAINLOG); + WriteLog(msg.str(), LOGPATH + MAINLOG); } @@ -2152,7 +2152,7 @@ << ends ; conQueue.write(cp,0); //cp deleted by queue reader - WriteLog(cp,MAINLOG); + WriteLog(cp,LOGPATH + MAINLOG); } } @@ -2173,7 +2173,7 @@ << " Entered TNC remote sysop mode." << endl; - WriteLog(log.str(), MAINLOG); + WriteLog(log.str(), LOGPATH + MAINLOG); } else { if ((rc = SendSessionStr(session,"\r\n550 Login failed, TNC is busy\r\n")) < 0) endSession(session,szPeer,userCall,starttime); @@ -2184,7 +2184,7 @@ << " Login failed: TNC busy." << endl; - WriteLog(log.str(), MAINLOG); + WriteLog(log.str(), LOGPATH + MAINLOG); State = BASE; @@ -2206,7 +2206,7 @@ << " Login failed: Invalid user or password." << endl; - WriteLog(log.str(), MAINLOG); + WriteLog(log.str(), LOGPATH + MAINLOG); State = BASE; if (sp) { @@ -2416,7 +2416,7 @@ log << inet_ntoa(client.sin_addr) << ": " << buf; - WriteLog(log.str(), UDPLOG); + WriteLog(log.str(), LOGPATH + UDPLOG); aprsString* abuff = new aprsString(buf, SRC_UDP, srcUDP, inet_ntoa(client.sin_addr), "UDP"); @@ -2633,7 +2633,7 @@ memset(cp, 0, 256); ostrstream msg(cp, 255); msg << "Can't resolve igate host name: " << pcp->RemoteName << endl << ends; - WriteLog(cp, MAINLOG); + WriteLog(cp, LOGPATH + MAINLOG); conQueue.write(cp, 0); } else state = 1; @@ -2665,7 +2665,7 @@ os << "Connection attempt failed " << pcp->RemoteName << " " << pcp->RemoteSocket; - WriteLog(os.str(), MAINLOG); + WriteLog(os.str(), LOGPATH + MAINLOG); { char* cp = new char[256]; @@ -2687,7 +2687,7 @@ os << "Connected to " << pcp->RemoteName << " " << pcp->RemoteSocket; - WriteLog(os.str(), MAINLOG); + WriteLog(os.str(), LOGPATH + MAINLOG); char* cp = new char[256]; memset(cp, 0, 256); @@ -2754,7 +2754,7 @@ if (sp == NULL){ cerr << "Can't add Server or Hub to session list ."; - WriteLog("Failed to add Server or Hub to session list", MAINLOG); + WriteLog("Failed to add Server or Hub to session list", LOGPATH + MAINLOG); } else { AddSessionInfo(clientSocket, "*", "To SERVER", -1, "*"); } @@ -2922,7 +2922,7 @@ << " " << pcp->RemoteSocket << ends; - WriteLog(szLog, MAINLOG); + WriteLog(szLog, LOGPATH + MAINLOG); { char* cp = new char[256]; diff -u --new-file --recursive aprsd-2.2.5-15.orig/src/utils.cpp aprsd-2.2.5-15/src/utils.cpp --- aprsd-2.2.5-15.orig/src/utils.cpp 2003-10-01 18:58:27.000000000 +0200 +++ aprsd-2.2.5-15/src/utils.cpp 2004-07-20 23:32:53.000000000 +0200 @@ -316,8 +316,8 @@ } catch(exception& error) { - WriteLog(string("split function error"), ERRORLOG); - WriteLog(s, ERRORLOG); + WriteLog(string("split function error"), LOGPATH + ERRORLOG); + WriteLog(s, LOGPATH + ERRORLOG); return 0; } //if(sa[wordcount-1].length() == 0) wordcount--;