epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

reset ostream flags when done

Browse Source
This commit is contained in:
zimoch
2021-11-19 16:16:48 +01:00
committed by mdavidsaver
parent 284de4fb6b
commit ec85ffc3d0
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/remote/abstractResponseHandler.cpp
View File

@@ -39,10 +39,12 @@ void ResponseHandler::handleResponse(osiSockAddr* responseFrom,
char ipAddrStr[24]; char ipAddrStr[24];
ipAddrToDottedIP(&responseFrom->ia, ipAddrStr, sizeof(ipAddrStr)); ipAddrToDottedIP(&responseFrom->ia, ipAddrStr, sizeof(ipAddrStr));
std::cerr<<"Message [0x"<<std::hex<<(int)command<<", v0x"<<std::hex std::ios::fmtflags initialflags = std::cerr.flags();
std::cerr<<"Message [0x"<<std::hex<<(int)command<<", v0x"
<<int(version)<<"] received from "<<ipAddrStr<<" on "<<transport->getRemoteName() <<int(version)<<"] received from "<<ipAddrStr<<" on "<<transport->getRemoteName()
<<" : "<<_description<<"\n" <<" : "<<_description<<"\n"
<<HexDump(*payloadBuffer, payloadSize).limit(0xffff); <<HexDump(*payloadBuffer, payloadSize).limit(0xffff);
std::cerr.flags(initialflags);
} }
} }
} }

2
src/remoteClient/clientContextImpl.cpp
View File

@@ -3000,8 +3000,10 @@ public:
if (command < 0 || command >= (int8)m_handlerTable.size()) if (command < 0 || command >= (int8)m_handlerTable.size())
{ {
if(IS_LOGGABLE(logLevelError)) { if(IS_LOGGABLE(logLevelError)) {
std::ios::fmtflags initialflags = std::cerr.flags();
std::cerr<<"Invalid (or unsupported) command: "<<std::hex<<(int)(0xFF&command)<<"\n" std::cerr<<"Invalid (or unsupported) command: "<<std::hex<<(int)(0xFF&command)<<"\n"
<<HexDump(*payloadBuffer, payloadSize).limit(256u); <<HexDump(*payloadBuffer, payloadSize).limit(256u);
std::cerr.flags(initialflags);
} }
return; return;
} }

2
src/server/responseHandlers.cpp
View File

@@ -160,8 +160,10 @@ void ServerResponseHandler::handleResponse(osiSockAddr* responseFrom,
"Invalid (or unsupported) command: %x.", (0xFF&command)); "Invalid (or unsupported) command: %x.", (0xFF&command));
if(IS_LOGGABLE(logLevelError)) { if(IS_LOGGABLE(logLevelError)) {
std::ios::fmtflags initialflags = std::cerr.flags();
std::cerr<<"Invalid (or unsupported) command: "<<std::hex<<(int)(0xFF&command)<<"\n" std::cerr<<"Invalid (or unsupported) command: "<<std::hex<<(int)(0xFF&command)<<"\n"
<<HexDump(*payloadBuffer, payloadSize).limit(256u); <<HexDump(*payloadBuffer, payloadSize).limit(256u);
std::cerr.flags(initialflags);
} }
return; return;
} }

7
src/utils/hexDump.cpp
View File

@@ -77,10 +77,12 @@ std::ostream& operator<<(std::ostream& strm, const HexDump& hex)
if(len%hex._perLine) if(len%hex._perLine)
nlines++; nlines++;
std::ios::fmtflags initialflags = strm.flags();
strm<<std::hex<<std::setfill('0');
for(size_t l=0; l<nlines; l++) for(size_t l=0; l<nlines; l++)
{ {
size_t start = l*hex._perLine; size_t start = l*hex._perLine;
strm<<"0x"<<std::hex<<std::setw(addrwidth)<<std::setfill('0')<<start; strm<<"0x"<<std::setw(addrwidth)<<start;
// print hex chars // print hex chars
for(size_t col=0; col<hex._perLine; col++) for(size_t col=0; col<hex._perLine; col++)
@@ -89,7 +91,7 @@ std::ostream& operator<<(std::ostream& strm, const HexDump& hex)
strm<<' '; strm<<' ';
} }
if(start+col < len) { if(start+col < len) {
strm<<std::hex<<std::setw(2)<<std::setfill('0')<<unsigned(hex.buf[start+col]&0xff); strm<<std::setw(2)<<unsigned(hex.buf[start+col]&0xff);
} else { } else {
strm<<" "; strm<<" ";
} }
@@ -113,6 +115,7 @@ std::ostream& operator<<(std::ostream& strm, const HexDump& hex)
strm<<'\n'; strm<<'\n';
} }
strm.flags(initialflags);
return strm; return strm;
} }