Mercurial > hg > orthanc

comparison OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp @ 4283:6b58ceed959e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
starting debug logs for SCP
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 04 Nov 2020 14:48:52 +0100
parents fbc49a65340a
children 756126cd2219
comparison
equal deleted inserted replaced
4282:65086904ec45 4283:6b58ceed959e
280 { 280 {
281 LOG(ERROR) << "Receiving Association failed: " << cond.text(); 281 LOG(ERROR) << "Receiving Association failed: " << cond.text();
282 // no matter what kind of error occurred, we need to do a cleanup 282 // no matter what kind of error occurred, we need to do a cleanup
283 AssociationCleanup(assoc); 283 AssociationCleanup(assoc);
284 return NULL; 284 return NULL;
285 }
286
287 {
288 OFString str;
289 CLOG(TRACE, DICOM) << "Received Association Parameters:" << std::endl
290 << ASC_dumpParameters(str, assoc->params, ASC_ASSOC_RQ);
285 } 291 }
286 292
287 // Retrieve the AET and the IP address of the remote modality 293 // Retrieve the AET and the IP address of the remote modality
288 std::string remoteAet; 294 std::string remoteAet;
289 std::string remoteIp; 295 std::string remoteIp;
675 return NULL; 681 return NULL;
676 } 682 }
677 LOG(INFO) << "Association Acknowledged (Max Send PDV: " << assoc->sendPDVLength << ")"; 683 LOG(INFO) << "Association Acknowledged (Max Send PDV: " << assoc->sendPDVLength << ")";
678 if (ASC_countAcceptedPresentationContexts(assoc->params) == 0) 684 if (ASC_countAcceptedPresentationContexts(assoc->params) == 0)
679 LOG(INFO) << " (but no valid presentation contexts)"; 685 LOG(INFO) << " (but no valid presentation contexts)";
686
687 {
688 OFString str;
689 CLOG(TRACE, DICOM) << "Association Acknowledged Details:" << std::endl
690 << ASC_dumpParameters(str, assoc->params, ASC_ASSOC_AC);
691 }
680 } 692 }
681 693
682 IApplicationEntityFilter* filter = server.HasApplicationEntityFilter() ? &server.GetApplicationEntityFilter() : NULL; 694 IApplicationEntityFilter* filter = server.HasApplicationEntityFilter() ? &server.GetApplicationEntityFilter() : NULL;
683 return new CommandDispatcher(server, assoc, remoteIp, remoteAet, calledAet, filter); 695 return new CommandDispatcher(server, assoc, remoteIp, remoteAet, calledAet, filter);
684 } 696 }
754 finished = true; 766 finished = true;
755 } 767 }
756 } 768 }
757 else if (cond == EC_Normal) 769 else if (cond == EC_Normal)
758 { 770 {
771 {
772 OFString str;
773 CLOG(TRACE, DICOM) << "Received Command:" << std::endl
774 << DIMSE_dumpMessage(str, msg, DIMSE_INCOMING, NULL, presID);
775 }
776
759 // Reset the association timeout counter 777 // Reset the association timeout counter
760 elapsedTimeSinceLastCommand_ = 0; 778 elapsedTimeSinceLastCommand_ = 0;
761 779
762 // Convert the type of request to Orthanc's internal type 780 // Convert the type of request to Orthanc's internal type
763 bool supported = false; 781 bool supported = false;