Skip to content

Members initialization in AssociationParameters #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cguebert wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Members initialization in AssociationParameters #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/odil/AssociationParameters.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,18 +104,12 @@ ::operator==(UserIdentity const & other) const

AssociationParameters
::AssociationParameters()
: _called_ae_title(""), _calling_ae_title(""), _presentation_contexts(),
_user_identity({UserIdentity::Type::None, "", ""}), _maximum_length(16384),
_maximum_number_operations_invoked(1), _maximum_number_operations_performed(1),
_sop_class_extended_negotiation(), _sop_class_common_extended_negotiation()
{
// Nothing else.
}

AssociationParameters
::AssociationParameters(pdu::AAssociateRQ const & pdu)
: _called_ae_title(""), _calling_ae_title(""), _presentation_contexts(),
_user_identity(), _maximum_length(16384)
{
this->set_called_ae_title(pdu.get_called_ae_title());
this->set_calling_ae_title(pdu.get_calling_ae_title());
Expand Down
6 changes: 3 additions & 3 deletions src/odil/AssociationParameters.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,9 @@ class AssociationParameters
std::string _calling_ae_title;
std::vector<PresentationContext> _presentation_contexts;
UserIdentity _user_identity;
uint32_t _maximum_length;
uint16_t _maximum_number_operations_invoked;
uint16_t _maximum_number_operations_performed;
uint32_t _maximum_length = 16384;
uint16_t _maximum_number_operations_invoked = 1;
uint16_t _maximum_number_operations_performed = 1;
std::vector<pdu::SOPClassExtendedNegotiation>
_sop_class_extended_negotiation;
std::vector<pdu::SOPClassCommonExtendedNegotiation>
Expand Down