oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

net/{Allocated,Static}SocketAddress: use IPv[46]Address::SetPort()

Browse Source
This commit is contained in:
Max Kellermann
2019-07-03 21:59:23 +02:00
parent 77b5b4158c
commit 2089c99348
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/net/AllocatedSocketAddress.cxx
View File

@@ -29,6 +29,8 @@
#include "config.h" #include "config.h"
#include "AllocatedSocketAddress.hxx" #include "AllocatedSocketAddress.hxx"
#include "IPv4Address.hxx"
#include "IPv6Address.hxx"
#include "util/StringView.hxx" #include "util/StringView.hxx"
#include <string.h> #include <string.h>
@@ -109,15 +111,15 @@ AllocatedSocketAddress::SetPort(unsigned port) noexcept
switch (GetFamily()) { switch (GetFamily()) {
case AF_INET: case AF_INET:
{ {
auto *a = (struct sockaddr_in *)(void *)address; auto &a = *(IPv4Address *)(void *)address;
a->sin_port = htons(port); a.SetPort(port);
return true; return true;
} }
case AF_INET6: case AF_INET6:
{ {
auto *a = (struct sockaddr_in6 *)(void *)address; auto &a = *(IPv6Address *)(void *)address;
a->sin6_port = htons(port); a.SetPort(port);
return true; return true;
} }
} }

10
src/net/StaticSocketAddress.cxx
View File

@@ -29,6 +29,8 @@
#include "config.h" #include "config.h"
#include "StaticSocketAddress.hxx" #include "StaticSocketAddress.hxx"
#include "IPv4Address.hxx"
#include "IPv6Address.hxx"
#include "util/StringView.hxx" #include "util/StringView.hxx"
#include <algorithm> #include <algorithm>
@@ -69,15 +71,15 @@ StaticSocketAddress::SetPort(unsigned port) noexcept
switch (GetFamily()) { switch (GetFamily()) {
case AF_INET: case AF_INET:
{ {
auto &a = (struct sockaddr_in &)address; auto &a = *(IPv4Address *)(void *)&address;
a.sin_port = htons(port); a.SetPort(port);
return true; return true;
} }
case AF_INET6: case AF_INET6:
{ {
auto &a = (struct sockaddr_in6 &)address; auto &a = *(IPv6Address *)(void *)&address;
a.sin6_port = htons(port); a.SetPort(port);
return true; return true;
} }
} }