niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #31 from eboasson/builtintopics

Browse source 
Refactor sample representation (along with a few small other details)
This commit is contained in:
eboasson 2018-11-09 12:23:47 +01:00 • committed by GitHub
commit 2e2224daea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 1963 additions and 1623 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/os/include/os/os_socket.h
View file

@ -271,24 +271,6 @@ extern "C" {
OSAPI_EXPORT uint16_t
os_sockaddr_get_port(const os_sockaddr *const sa) __nonnull_all__;
/**
* Compare two IP addresses for equality - does not consider port number.
* This is a 'straight' compare i.e. family must match and address bytes
* must correspond. It does not consider the possibility of IPv6 mapped
* IPv4 addresses or anything arcane like that.
* @param sa1 First socket address
* @param sa2 Second socket address.
* @return true if equal, false otherwise.
* @return Integer less than, equal to, or greater than zero if sa1 is
* found, respectively, to be less than, to match, or be greater
* than sa2.
* @pre both sa1 and sa2 are valid os_sockaddr pointers.
*/
OSAPI_EXPORT int
os_sockaddr_compare(
const os_sockaddr *const sa1,
const os_sockaddr *const sa2) __nonnull_all__ __attribute_pure__;
/**
* Check if IP address of given socket address is unspecified.
* @param sa Socket address

4
src/os/src/os_socket.c
View file

@ -104,7 +104,7 @@ uint16_t os_sockaddr_get_port(const os_sockaddr *const sa)
return port;
}
int os_sockaddr_compare(
static int os_sockaddr_compare(
const os_sockaddr *const sa1,
const os_sockaddr *const sa2)
{
@ -142,7 +142,7 @@ int os_sockaddr_compare(
sin1 = (os_sockaddr_in *)sa1;
sin2 = (os_sockaddr_in *)sa2;
sz = sizeof(sin1->sin_addr);
eq = memcmp(sin1, sin2, sizeof(*sin1));
eq = memcmp(&sin1->sin_addr, &sin2->sin_addr, sizeof(sz));
}
break;
}