Skip to content

SourceVITA49 Component Bugfixes #2

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
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

SourceVITA49 Component Bugfixes #2

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
92a62fb
Fixed a bug where the INS geolocation was set to the contents of the …
clink-HTL Sep 19, 2018
033b112
Added section to 'process_context' function to update output SRI mode…
clink-HTL Sep 19, 2018
c2ce3dd
Modified 'attach' method to actually ignore new attachments, rather t…
clink-HTL Sep 19, 2018
01702d0
Modified 'launch_rx_thread' function to close existing sockets before…
clink-HTL Sep 19, 2018
4303604
Modified VITA49 source to lock the 'sriLock' mutex in a couple places…
clink-HTL Sep 19, 2018
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
28 changes: 27 additions & 1 deletion cpp/SourceVITA49.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,9 @@ void SourceVITA49_i::attachmentOverrideChanged(const attachment_override_struct*
attach_override_settings.use_udp_protocol = attachment_override.use_udp_protocol;

streamID = attach_override_settings.attach_id; //"manual_override";
boost::mutex::scoped_lock sri_lock(sriLock);
currSRI.streamID = streamID.c_str();
sri_lock.unlock();

destroy_rx_thread();

Expand Down Expand Up @@ -1009,6 +1011,8 @@ double SourceVITA49_i::timeDiff() {
*
******************************************************************************************/
void SourceVITA49_i::setDefaultSRI() {
boost::mutex::scoped_lock lock(sriLock);

currSRI.hversion = 0;
/* time between samples (inverse of sample rate) */
currSRI.xdelta = (double) 0;
Expand Down Expand Up @@ -1110,6 +1114,11 @@ bool SourceVITA49_i::launch_rx_thread() {

if (attachedIP > lowMulti && attachedIP < highMulti && !curr_attach.ip_address.empty()) {
LOG_DEBUG(SourceVITA49_i, "Enabling multicast_client on " << attachedInterface << " " << attachedIPstr << " " << curr_attach.port);

if(multicast_udp_open) {
multicast_close(multi_client);
}

multi_client = multicast_client(attachedInterface, attachedIPstr, curr_attach.port);

if (multi_client.sock < 0) {
Expand All @@ -1120,6 +1129,11 @@ bool SourceVITA49_i::launch_rx_thread() {
multicast_udp_open = true;
} else if (!curr_attach.use_udp_protocol) {
LOG_DEBUG(SourceVITA49_i, "Enabling unicast TCP client on " << attachedInterface << " " << attachedIPstr << " " << curr_attach.port);

if(unicast_tcp_open) {
unicast_tcp_close(tcp_client);
}

tcp_client = unicast_tcp_client(attachedInterface, attachedIPstr, curr_attach.port);

if (tcp_client.sock < 0) {
Expand All @@ -1130,6 +1144,11 @@ bool SourceVITA49_i::launch_rx_thread() {
unicast_tcp_open = true;
} else {
LOG_DEBUG(SourceVITA49_i, "Enabling unicast UDP client on " << attachedInterface << " " << attachedIPstr << " " << curr_attach.port);

if(unicast_udp_open) {
unicast_close(uni_client);
}

uni_client = unicast_client(attachedInterface, attachedIPstr, curr_attach.port);

if (uni_client.sock < 0) {
Expand Down Expand Up @@ -1208,6 +1227,7 @@ throw (BULKIO::dataVITA49::AttachError, BULKIO::dataVITA49::StreamInputError) {

if (!attach_port_settings.attach_id.empty()) {
LOG_ERROR(SourceVITA49_i, "Already has an attached connection! Latest attachment ignored!")
return CORBA::string_dup(curr_attach.attach_id.c_str());
}

initialize_values();
Expand Down Expand Up @@ -1417,6 +1437,12 @@ void SourceVITA49_i::process_context(std::vector<char> *packet) {

rebase_pointer_context(packet);

PayloadFormat format = contextPacket_g->getDataPayloadFormat();

if(!isNull(format)){
outputSRI.mode = format.getRealComplexType();
}

if (!isNull(contextPacket_g->getStreamID()) && streamID.empty()) {
streamID = contextPacket_g->getStreamID();
}
Expand Down Expand Up @@ -1658,7 +1684,7 @@ void SourceVITA49_i::process_context(std::vector<char> *packet) {
Geolocation Temp = contextPacket_g->getGeolocationINS();

if (processingGEOINS != Temp) {
processingGEOINS = contextPacket_g->getGeolocationGPS();
processingGEOINS = contextPacket_g->getGeolocationINS();

TimeStamp geo_ins_time;
geo_ins_time = processingGEOINS.getTimeStamp();
Expand Down