patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

net: lib: dns: mdns_responder: Simplify setup_dns_addr

Browse source 
The setup_dns_addr function packet argument can be reduced to
a socket address family.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
This commit is contained in:
Pieter De Gendt 2023-04-18 10:34:56 +02:00 committed by Christopher Friedt
parent 6e0dfe50bf
commit 292bb97f0d
2 changed files with 10 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
subsys/net/lib/dns/mdns_responder.c
View file

@ -56,7 +56,7 @@ static struct net_mgmt_event_callback mgmt_cb;
CONFIG_MDNS_RESOLVER_ADDITIONAL_BUF_CTR)
#ifndef CONFIG_NET_TEST
static int setup_dst_addr(struct net_context *ctx, struct net_pkt *pkt,
static int setup_dst_addr(struct net_context *ctx, sa_family_t family,
struct sockaddr *dst, socklen_t *dst_len);
#endif /* CONFIG_NET_TEST */
@ -98,16 +98,14 @@ static void mdns_iface_event_handler(struct net_mgmt_event_callback *cb,
}
}
int setup_dst_addr(struct net_context *ctx, struct net_pkt *pkt,
int setup_dst_addr(struct net_context *ctx, sa_family_t family,
struct sockaddr *dst, socklen_t *dst_len)
{
if (IS_ENABLED(CONFIG_NET_IPV4) &&
net_pkt_family(pkt) == AF_INET) {
if (IS_ENABLED(CONFIG_NET_IPV4) && family == AF_INET) {
create_ipv4_addr(net_sin(dst));
*dst_len = sizeof(struct sockaddr_in);
net_context_set_ipv4_ttl(ctx, 255);
} else if (IS_ENABLED(CONFIG_NET_IPV6) &&
net_pkt_family(pkt) == AF_INET6) {
} else if (IS_ENABLED(CONFIG_NET_IPV6) && family == AF_INET6) {
create_ipv6_addr(net_sin6(dst));
*dst_len = sizeof(struct sockaddr_in6);
net_context_set_ipv6_hop_limit(ctx, 255);
@ -262,7 +260,7 @@ static int send_response(struct net_context *ctx,
socklen_t dst_len;
int ret;
ret = setup_dst_addr(ctx, pkt, &dst, &dst_len);
ret = setup_dst_addr(ctx, net_pkt_family(pkt), &dst, &dst_len);
if (ret < 0) {
NET_DBG("unable to set up the response address");
return ret;
@ -357,7 +355,7 @@ static void send_sd_response(struct net_context *ctx,
/* This actually is used but the compiler doesn't see that */
ARG_UNUSED(record);
ret = setup_dst_addr(ctx, pkt, &dst, &dst_len);
ret = setup_dst_addr(ctx, net_pkt_family(pkt), &dst, &dst_len);
if (ret < 0) {
NET_DBG("unable to set up the response address");
return;

23
tests/net/lib/dns_sd/src/main.c
View file

@ -51,7 +51,7 @@ extern int add_srv_record(const struct dns_sd_rec *inst, uint32_t ttl,
uint16_t *host_offset);
extern size_t service_proto_size(const struct dns_sd_rec *ref);
extern bool rec_is_valid(const struct dns_sd_rec *ref);
extern int setup_dst_addr(struct net_context *ctx, struct net_pkt *pkt,
extern int setup_dst_addr(struct net_context *ctx, sa_family_t family,
struct sockaddr *dst, socklen_t *dst_len);
@ -676,7 +676,6 @@ ZTEST(dns_sd, test_setup_dst_addr)
/* IPv4 case */
struct net_context *ctx_v4;
struct net_pkt *pkt_v4;
struct in_addr addr_v4_expect = { { { 224, 0, 0, 251 } } };
memset(&dst, 0, sizeof(struct sockaddr));
@ -684,11 +683,7 @@ ZTEST(dns_sd, test_setup_dst_addr)
ret = net_context_get(AF_INET, SOCK_DGRAM, IPPROTO_UDP, &ctx_v4);
zassert_equal(ret, 0, "Create IPv4 UDP context failed");
pkt_v4 = net_pkt_alloc_with_buffer(iface, 0, AF_INET,
IPPROTO_UDP, K_SECONDS(1));
zassert_not_null(pkt_v4, "Packet alloc failed");
zassert_equal(0, setup_dst_addr(ctx_v4, pkt_v4, &dst, &dst_len), "");
zassert_equal(0, setup_dst_addr(ctx_v4, AF_INET, &dst, &dst_len), "");
zassert_equal(255, ctx_v4->ipv4_ttl, "");
zassert_true(net_ipv4_addr_cmp(&addr_v4_expect,
&net_sin(&dst)->sin_addr), "");
@ -697,7 +692,6 @@ ZTEST(dns_sd, test_setup_dst_addr)
#if defined(CONFIG_NET_IPV6)
/* IPv6 case */
struct net_context *ctx_v6;
struct net_pkt *pkt_v6;
struct in6_addr addr_v6_expect = { { { 0xff, 0x02, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0xfb } } };
@ -706,11 +700,7 @@ ZTEST(dns_sd, test_setup_dst_addr)
ret = net_context_get(AF_INET6, SOCK_DGRAM, IPPROTO_UDP, &ctx_v6);
zassert_equal(ret, 0, "Create IPv6 UDP context failed");
pkt_v6 = net_pkt_alloc_with_buffer(iface, 0, AF_INET6,
IPPROTO_UDP, K_SECONDS(1));
zassert_not_null(pkt_v6, "Packet alloc failed");
zassert_equal(0, setup_dst_addr(ctx_v6, pkt_v6, &dst, &dst_len), "");
zassert_equal(0, setup_dst_addr(ctx_v6, AF_INET6, &dst, &dst_len), "");
zassert_equal(255, ctx_v6->ipv6_hop_limit, "");
zassert_true(net_ipv6_addr_cmp(&addr_v6_expect,
&net_sin6(&dst)->sin6_addr), "");
@ -720,17 +710,12 @@ ZTEST(dns_sd, test_setup_dst_addr)
/* Unknown family case */
struct net_context *ctx_xx;
struct net_pkt *pkt_xx;
ret = net_context_get(AF_INET, SOCK_DGRAM, IPPROTO_UDP, &ctx_xx);
zassert_equal(ret, 0, "Create IPV4 udp context failed");
pkt_xx = net_pkt_alloc_with_buffer(iface, 0, AF_PACKET,
IPPROTO_UDP, K_SECONDS(1));
zassert_not_null(pkt_xx, "Packet alloc failed");
zassert_equal(-EPFNOSUPPORT,
setup_dst_addr(ctx_xx, pkt_xx, &dst, &dst_len), "");
setup_dst_addr(ctx_xx, AF_PACKET, &dst, &dst_len), "");
}
/** test for @ref dns_sd_is_service_type_enumeration */