"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "faxd/Class1Recv.c++" between
hylafax-7.0.1.tar.gz and hylafax-7.0.2.tar.gz

About: HylaFAX+ is a system for sending and receiving facsimiles as well as for sending alpha-numeric pages (fax server).

Class1Recv.c++  (hylafax-7.0.1):Class1Recv.c++  (hylafax-7.0.2)
skipping to change at line 807 skipping to change at line 807
if (useSSLFax) { if (useSSLFax) {
SSLFax sslfax; SSLFax sslfax;
if (!getSSLFaxConnection()) { if (!getSSLFaxConnection()) {
protoTrace("Traditional fax detected. Shutting d own SSL Fax listener."); protoTrace("Traditional fax detected. Shutting d own SSL Fax listener.");
sslfax.cleanup(sslFaxProcess); sslfax.cleanup(sslFaxProcess);
useSSLFax = false; useSSLFax = false;
sslWatchModem = false; sslWatchModem = false;
setSSLFaxFd(0); setSSLFaxFd(0);
} else { } else {
protoTrace("SSL Fax connection detected."); protoTrace("SSL Fax connection detected.");
sslfax.acceptClient(sslFaxProcess, sslFaxPasscode , conf.class1SSLFaxClientTimeout); sslfax.acceptClient(sslFaxProcess, sslFaxPasscode , getModemFd(), conf.class1SSLFaxClientTimeout);
if (sslFaxProcess.emsg != "") protoTrace("SSL Fax accept client: %s", (const char*) sslFaxProcess.emsg); if (sslFaxProcess.emsg != "") protoTrace("SSL Fax accept client: %s", (const char*) sslFaxProcess.emsg);
if (!sslFaxProcess.server) { if (!sslFaxProcess.server) {
protoTrace("SSL Fax client accept failure. E xpecting a traditional fax now."); protoTrace("SSL Fax client accept failure. E xpecting a traditional fax now.");
sslfax.cleanup(sslFaxProcess); sslfax.cleanup(sslFaxProcess);
useSSLFax = false; useSSLFax = false;
sslWatchModem = false; sslWatchModem = false;
setSSLFaxFd(0); setSSLFaxFd(0);
do { do {
rmResponse = atResponse(rbuf, conf.class1 RMPersistence ? conf.t2Timer + 2900 : conf.t2Timer - 2900); rmResponse = atResponse(rbuf, conf.class1 RMPersistence ? conf.t2Timer + 2900 : conf.t2Timer - 2900);
} while ((rmResponse == AT_NOTHING || rmRespo nse == AT_FCERROR) && ++attempts < conf.class1RMPersistence && atCmd(rmCmd, AT_N OTHING)); } while ((rmResponse == AT_NOTHING || rmRespo nse == AT_FCERROR) && ++attempts < conf.class1RMPersistence && atCmd(rmCmd, AT_N OTHING));
skipping to change at line 1348 skipping to change at line 1348
if (useSSLFax) { if (useSSLFax) {
SSLFax sslfax; SSLFax sslfax;
if (!getSSLFaxConnection()) { if (!getSSLFaxConnection()) {
protoTrace("Traditional fax detected. Shutting down SSL Fax listener ."); protoTrace("Traditional fax detected. Shutting down SSL Fax listener .");
sslfax.cleanup(sslFaxProcess); sslfax.cleanup(sslFaxProcess);
useSSLFax = false; useSSLFax = false;
sslWatchModem = false; sslWatchModem = false;
setSSLFaxFd(0); setSSLFaxFd(0);
} else { } else {
protoTrace("SSL Fax connection detected."); protoTrace("SSL Fax connection detected.");
sslfax.acceptClient(sslFaxProcess, sslFaxPasscode, conf.class1SSLFaxC lientTimeout); sslfax.acceptClient(sslFaxProcess, sslFaxPasscode, getModemFd(), conf .class1SSLFaxClientTimeout);
if (sslFaxProcess.emsg != "") protoTrace("SSL Fax accept client: %s", (const char*) sslFaxProcess.emsg); if (sslFaxProcess.emsg != "") protoTrace("SSL Fax accept client: %s", (const char*) sslFaxProcess.emsg);
if (!sslFaxProcess.server) { if (!sslFaxProcess.server) {
protoTrace("SSL Fax client accept failure. Expecting a tradition al fax now."); protoTrace("SSL Fax client accept failure. Expecting a tradition al fax now.");
sslfax.cleanup(sslFaxProcess); sslfax.cleanup(sslFaxProcess);
useSSLFax = false; useSSLFax = false;
sslWatchModem = false; sslWatchModem = false;
setSSLFaxFd(0); setSSLFaxFd(0);
do { do {
lastResponse = atResponse(rbuf, conf.class1RMPersistence ? co nf.t2Timer + 2900 : conf.t2Timer - 2900); lastResponse = atResponse(rbuf, conf.class1RMPersistence ? co nf.t2Timer + 2900 : conf.t2Timer - 2900);
} while ((lastResponse == AT_NOTHING || lastResponse == AT_FCERRO R) && ++attempts < conf.class1RMPersistence && atCmd(rmCmd, AT_NOTHING)); } while ((lastResponse == AT_NOTHING || lastResponse == AT_FCERRO R) && ++attempts < conf.class1RMPersistence && atCmd(rmCmd, AT_NOTHING));
skipping to change at line 1498 skipping to change at line 1498
if (useSSLFax) { if (useSSLFax) {
SSLFax sslfax; SSLFax sslfax;
if (!getSSLFaxConnection()) { if (!getSSLFaxConnection()) {
protoTrace("Traditional fax detected. Shutti ng down SSL Fax listener."); protoTrace("Traditional fax detected. Shutti ng down SSL Fax listener.");
sslfax.cleanup(sslFaxProcess); sslfax.cleanup(sslFaxProcess);
useSSLFax = false; useSSLFax = false;
sslWatchModem = false; sslWatchModem = false;
setSSLFaxFd(0); setSSLFaxFd(0);
} else { } else {
protoTrace("SSL Fax connection detected."); protoTrace("SSL Fax connection detected.");
sslfax.acceptClient(sslFaxProcess, sslFaxPass code, conf.class1SSLFaxClientTimeout); sslfax.acceptClient(sslFaxProcess, sslFaxPass code, getModemFd(), conf.class1SSLFaxClientTimeout);
if (sslFaxProcess.emsg != "") protoTrace("SSL Fax accept client: %s", (const char*) sslFaxProcess.emsg); if (sslFaxProcess.emsg != "") protoTrace("SSL Fax accept client: %s", (const char*) sslFaxProcess.emsg);
if (!sslFaxProcess.server) { if (!sslFaxProcess.server) {
protoTrace("SSL Fax client accept failure . Expecting a traditional fax now."); protoTrace("SSL Fax client accept failure . Expecting a traditional fax now.");
sslfax.cleanup(sslFaxProcess); sslfax.cleanup(sslFaxProcess);
useSSLFax = false; useSSLFax = false;
sslWatchModem = false; sslWatchModem = false;
setSSLFaxFd(0); setSSLFaxFd(0);
gotprimary = waitForDCEChannel(false); / / resume V.34-Fax session gotprimary = waitForDCEChannel(false); / / resume V.34-Fax session
} else { } else {
isSSLFax = true; isSSLFax = true;
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)