From: Gonzalo A. <ga...@us...> - 2006-09-08 14:53:14
|
Update of /cvsroot/mod-c/mod_c/src/dss_tool In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25001/src/dss_tool Modified Files: dss_tool.cpp Log Message: s/EHTML_SESSION_TIMEOUT/EHTML_TIMEOUT/g and default session protocol include was renamed. Index: dss_tool.cpp =================================================================== RCS file: /cvsroot/mod-c/mod_c/src/dss_tool/dss_tool.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dss_tool.cpp 22 Aug 2006 21:38:17 -0000 1.2 --- dss_tool.cpp 8 Sep 2006 14:53:11 -0000 1.3 *************** *** 7,11 **** #include <unistd.h> ! #include <def_session_protocol.h> #include <iostream> --- 7,11 ---- #include <unistd.h> ! #include <DefaultSessionProtocol.h> #include <iostream> *************** *** 66,70 **** get_data.MsgType = DSS_CMD_GET_DATA; get_data.IdSize = Parms->IdSize; - get_data.Duration = Parms->Duration; memcpy( get_data.Id, Parms->Id, get_data.IdSize ); // Send the request --- 66,69 ---- *************** *** 76,80 **** { if ( buf.MsgType == DSS_CMD_STATUS && ((DSSStatusRespond*)&buf)->Type == DSS_STATUS_SESSION_OVER ) ! return EHTML_SESSION_TIMEOUT; else return EHTML_ERR; --- 75,79 ---- { if ( buf.MsgType == DSS_CMD_STATUS && ((DSSStatusRespond*)&buf)->Type == DSS_STATUS_SESSION_OVER ) ! return EHTML_TIMEOUT; else return EHTML_ERR; *************** *** 141,145 **** { case DSS_STATUS_SESSION_OVER: ! retVal = EHTML_SESSION_TIMEOUT; break; case DSS_STATUS_ERROR: --- 140,144 ---- { case DSS_STATUS_SESSION_OVER: ! retVal = EHTML_TIMEOUT; break; case DSS_STATUS_ERROR: *************** *** 178,182 **** break; case DSS_STATUS_SESSION_OVER: ! retVal = EHTML_SESSION_TIMEOUT; break; } --- 177,181 ---- break; case DSS_STATUS_SESSION_OVER: ! retVal = EHTML_TIMEOUT; break; } *************** *** 476,480 **** cout << "The duration was set." << endl; break; ! case EHTML_SESSION_TIMEOUT: cout << "The session timed out." << endl; SessionOpened = false; --- 475,479 ---- cout << "The duration was set." << endl; break; ! case EHTML_TIMEOUT: cout << "The session timed out." << endl; SessionOpened = false; *************** *** 529,533 **** cout << "The data was stored." << endl; break; ! case EHTML_SESSION_TIMEOUT: cout << "The session timed out." << endl; SessionOpened = false; --- 528,532 ---- cout << "The data was stored." << endl; break; ! case EHTML_TIMEOUT: cout << "The session timed out." << endl; SessionOpened = false; *************** *** 563,567 **** cout << endl; break; ! case EHTML_SESSION_TIMEOUT: cout << "The session timed out." << endl; SessionOpened = false; --- 562,566 ---- cout << endl; break; ! case EHTML_TIMEOUT: cout << "The session timed out." << endl; SessionOpened = false; *************** *** 685,689 **** cout << "The data was stored." << endl; break; ! case EHTML_SESSION_TIMEOUT: cout << "The session timed out." << endl; SessionOpened = false; --- 684,688 ---- cout << "The data was stored." << endl; break; ! case EHTML_TIMEOUT: cout << "The session timed out." << endl; SessionOpened = false; *************** *** 736,740 **** SessionOpened = true; break; ! case EHTML_SESSION_TIMEOUT: cout << "The session timed out." << endl; if ( psd.Data ) --- 735,739 ---- SessionOpened = true; break; ! case EHTML_TIMEOUT: cout << "The session timed out." << endl; if ( psd.Data ) |