Skip to content
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

Maintainence for AIX and Solaris #117

Merged
merged 1 commit into from
Feb 3, 2024
Merged

Maintainence for AIX and Solaris #117

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
7 changes: 3 additions & 4 deletions groups/nts/ntsa/ntsa_localname.t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ NTSCFG_TEST_CASE(4)
ntsa::LocalName localName;
NTSCFG_TEST_OK(localName.setAbstract());
NTSCFG_TEST_ERROR(localName.setValue(ss.str()),
ntsa::Error(ntsa::Error::Code::e_LIMIT));
ntsa::Error::Code::e_LIMIT);
}
{
ntsa::LocalName localName;
Expand All @@ -262,7 +262,7 @@ NTSCFG_TEST_CASE(4)
ntsa::LocalName localName;
NTSCFG_TEST_OK(localName.setValue(ss.str()));
NTSCFG_TEST_ERROR(localName.setAbstract(),
ntsa::Error(ntsa::Error::Code::e_LIMIT));
ntsa::Error::Code::e_LIMIT);
}
#endif

Expand Down Expand Up @@ -358,8 +358,7 @@ NTSCFG_TEST_CASE(5)
NTSCFG_TEST_TRUE(false);
}
#endif
ntsa::Error::Code code = ntsa::Error::e_LIMIT;
NTSCFG_TEST_ERROR(error, ntsa::Error(code));
NTSCFG_TEST_ERROR(error, ntsa::Error::e_LIMIT);
}
}

Expand Down
2 changes: 1 addition & 1 deletion groups/nts/ntsf/ntsf_system.t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ NTSCFG_TEST_CASE(1)
// this test case is simply verifying that this combination of
// parameters is not portable.

NTSCFG_TEST_ERROR(error, ntsa::Error(ntsa::Error::e_ADDRESS_IN_USE));
NTSCFG_TEST_ERROR(error, ntsa::Error::e_ADDRESS_IN_USE);

#endif

Expand Down
12 changes: 6 additions & 6 deletions groups/nts/ntsu/ntsu_socketoptionutil.t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1663,34 +1663,34 @@ NTSCFG_TEST_CASE(5)
error = ntsu::SocketOptionUtil::getTimestampIncomingData(
&timestampIncomingData, socket);
NTSCFG_TEST_ERROR(
error, ntsa::Error(ntsa::Error::e_NOT_IMPLEMENTED));
error, ntsa::Error::e_NOT_IMPLEMENTED);
NTSCFG_TEST_FALSE(timestampIncomingData);

error = ntsu::SocketOptionUtil::getTimestampOutgoingData(
&timestampOutgoingData, socket);
NTSCFG_TEST_ERROR(
error, ntsa::Error(ntsa::Error::e_NOT_IMPLEMENTED));
error, ntsa::Error::e_NOT_IMPLEMENTED);
NTSCFG_TEST_FALSE(timestampOutgoingData);

error = ntsu::SocketOptionUtil::setTimestampIncomingData(
socket, false);
NTSCFG_TEST_ERROR(
error, ntsa::Error(ntsa::Error::e_NOT_IMPLEMENTED));
error, ntsa::Error::e_NOT_IMPLEMENTED);

error = ntsu::SocketOptionUtil::setTimestampIncomingData(
socket, true);
NTSCFG_TEST_ERROR(
error, ntsa::Error(ntsa::Error::e_NOT_IMPLEMENTED));
error, ntsa::Error::e_NOT_IMPLEMENTED);

error = ntsu::SocketOptionUtil::setTimestampOutgoingData(
socket, false);
NTSCFG_TEST_ERROR(
error, ntsa::Error(ntsa::Error::e_NOT_IMPLEMENTED));
error, ntsa::Error::e_NOT_IMPLEMENTED);

error = ntsu::SocketOptionUtil::setTimestampOutgoingData(
socket, true);
NTSCFG_TEST_ERROR(
error, ntsa::Error(ntsa::Error::e_NOT_IMPLEMENTED));
error, ntsa::Error::e_NOT_IMPLEMENTED);
}

if (socket != ntsa::k_INVALID_HANDLE) {
Expand Down
15 changes: 7 additions & 8 deletions groups/nts/ntsu/ntsu_socketutil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,14 +554,14 @@ class SendControl
enum {
// The payload size required to send any meta-data (viz. open file
// descriptors) to the peer of a socket.
k_SEND_CONTROL_PAYLOAD_SIZE = static_cast<int>(
k_SEND_CONTROL_PAYLOAD_SIZE =
NTSU_SOCKETUTIL_MAX_HANDLES_PER_OUTGOING_CONTROLMSG *
sizeof(ntsa::Handle)),
sizeof(ntsa::Handle),

// The control buffer capacity required to send any meta-data (viz.
// open file descriptors) to the peer of a socket.
k_SEND_CONTROL_BUFFER_SIZE =
static_cast<int>(CMSG_SPACE(k_SEND_CONTROL_PAYLOAD_SIZE))
CMSG_SPACE(k_SEND_CONTROL_PAYLOAD_SIZE)
};

// Define a type alias for a maximimally-aligned buffer of suitable size to
Expand Down Expand Up @@ -596,19 +596,18 @@ class ReceiveControl
// file descriptors, timestamps, etc.) buffered by the operating system
// for a socket.
k_RECEIVE_CONTROL_PAYLOAD_SIZE =
static_cast<int>(
NTSU_SOCKETUTIL_MAX_HANDLES_PER_INCOMING_CONTROLMSG *
sizeof(ntsa::Handle))
(NTSU_SOCKETUTIL_MAX_HANDLES_PER_INCOMING_CONTROLMSG *
sizeof(ntsa::Handle))
#if defined(BSLS_PLATFORM_OS_LINUX)
+ static_cast<int>(sizeof(TimestampUtil::ScmTimestamping))
+ sizeof(TimestampUtil::ScmTimestamping)
#endif

// The control buffer capacity required to receive any meta-data (e.g.
// open file descriptors, timestamps, etc.) buffered by the operating
// system for a socket.
,
k_RECEIVE_CONTROL_BUFFER_SIZE =
static_cast<int>(CMSG_SPACE(k_RECEIVE_CONTROL_PAYLOAD_SIZE))
CMSG_SPACE(k_RECEIVE_CONTROL_PAYLOAD_SIZE)
};

// Define a type alias for a maximimally-aligned buffer of suitable size to
Expand Down