Skip to content
This repository was archived by the owner on Jul 8, 2022. It is now read-only.

Fix#314 master #336

Merged
Ingvord merged 5 commits into from
Dec 15, 2016
Merged

Fix#314 master #336

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a8e8f91
Fix #314: Check ZmqEventSubscriptionChange command event parameter
bourtemb Dec 15, 2016
792a2ec
Fixed typo in error message
bourtemb Dec 15, 2016
b608603
renamed loop variable in i. Changed if as suggested by Igor
bourtemb Dec 15, 2016
96ec8fe
Simplify throw_exception call and add 2 TODOs
bourtemb Dec 15, 2016
9756387
Fixed typo in exception message
bourtemb Dec 15, 2016
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
31 changes: 31 additions & 0 deletions src/server/eventcmds.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,37 @@ DevVarLongStringArray *DServer::zmq_event_subscription_change(const Tango::DevVa
action = (*argin)[2];
event = (*argin)[3];

//
// Check event type validity
Copy link
Member

@Ingvord Ingvord Dec 15, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whenever there is a comment in the code describing what it is doing - extract a method.

//
// TODO Extract this as a method
string check_event = event;
transform(check_event.begin(),check_event.end(),check_event.begin(),::tolower);

string::size_type pos_check = check_event.find(EVENT_COMPAT);
Copy link
Member

@Ingvord Ingvord Dec 15, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

string::size_type can be replaced with auto

if (pos_check != string::npos)
check_event.erase(0,EVENT_COMPAT_IDL5_SIZE);

size_t nb_event_type = sizeof(EventName)/sizeof(char *);
bool found = false;

for (size_t i = 0;i < nb_event_type;i++)
{
if (strcmp(check_event.c_str(),EventName[i]) == 0)
{
found = true;
break;
}
}

if (!found)
{
Except::throw_exception(
API_WrongNumberOfArgs,
"The event type you sent (" + event + ") is not a valid event type", //TODO name valid types
"DServer::zmq_event_subscription_change");
}

bool intr_change = false;
if (event == EventName[INTERFACE_CHANGE_EVENT])
intr_change = true;
Expand Down