bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: context: Refactor sendto()

Browse Source 
Refactor sendto() code so that destination address and its validity
is checked first, followed by offloading verification. Move context
and shutdown checks into TCP queueing function.

Signed-off-by: Patrik Flykt <patrik.flykt@intel.com>
This commit is contained in:
Patrik Flykt 2018-03-20 15:06:42 +02:00 committed by Jukka Rissanen
parent 09b67a4825
commit 3b579ffb90
2 changed files with 45 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
subsys/net/ip/net_context.c
View File

@ -2068,42 +2068,10 @@ static int sendto(struct net_pkt *pkt,
return -EBADF;
}
#if defined(CONFIG_NET_TCP)
if (net_context_get_ip_proto(context) == IPPROTO_TCP) {
if (net_context_get_state(context) != NET_CONTEXT_CONNECTED) {
return -ENOTCONN;
}
NET_ASSERT(context->tcp);
if (context->tcp->flags & NET_TCP_IS_SHUTDOWN) {
return -ESHUTDOWN;
}
}
#endif /* CONFIG_NET_TCP */
#if defined(CONFIG_NET_UDP)
/* Bind default address and port only if UDP */
if (net_context_get_ip_proto(context) == IPPROTO_UDP) {
ret = bind_default(context);
if (ret) {
return ret;
}
}
#endif /* CONFIG_NET_UDP */
if (!dst_addr) {
return -EDESTADDRREQ;
}
#if defined(CONFIG_NET_OFFLOAD)
if (net_if_is_ip_offloaded(net_pkt_iface(pkt))) {
return net_offload_sendto(
net_pkt_iface(pkt),
pkt, dst_addr, addrlen,
cb, timeout, token, user_data);
}
#endif /* CONFIG_NET_OFFLOAD */
#if defined(CONFIG_NET_IPV6)
if (net_pkt_family(pkt) == AF_INET6) {
struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)dst_addr;
@ -2136,26 +2104,45 @@ static int sendto(struct net_pkt *pkt,
return -EINVAL;
}
#if defined(CONFIG_NET_UDP)
if (net_context_get_ip_proto(context) == IPPROTO_UDP) {
ret = create_udp_packet(context, pkt, dst_addr, &pkt);
} else
#endif /* CONFIG_NET_UDP */
#if defined(CONFIG_NET_OFFLOAD)
if (net_if_is_ip_offloaded(net_pkt_iface(pkt))) {
return net_offload_sendto(
net_pkt_iface(pkt),
pkt, dst_addr, addrlen,
cb, timeout, token, user_data);
}
#endif /* CONFIG_NET_OFFLOAD */
#if defined(CONFIG_NET_TCP)
if (net_context_get_ip_proto(context) == IPPROTO_TCP) {
net_pkt_set_appdatalen(pkt, net_pkt_get_len(pkt));
switch (net_context_get_ip_proto(context)) {
case IPPROTO_UDP:
#if defined(CONFIG_NET_UDP)
/* Bind default address and port only if UDP */
ret = bind_default(context);
if (ret) {
return ret;
}
ret = create_udp_packet(context, pkt, dst_addr, &pkt);
#endif /* CONFIG_NET_UDP */
break;
case IPPROTO_TCP:
ret = net_tcp_queue_data(context, pkt);
} else
#endif /* CONFIG_NET_TCP */
{
NET_DBG("Unknown protocol while sending packet: %d",
net_context_get_ip_proto(context));
return -EPROTONOSUPPORT;
break;
default:
ret = -EPROTONOSUPPORT;
}
if (ret < 0) {
NET_DBG("Could not create network packet to send (%d)", ret);
if (ret == -EPROTONOSUPPORT) {
NET_DBG("Unknown protocol while sending packet: %d",
net_context_get_ip_proto(context));
} else {
NET_DBG("Could not create network packet to send (%d)",
ret);
}
return ret;
}

11
subsys/net/ip/tcp.c
View File

@ -762,6 +762,17 @@ int net_tcp_queue_data(struct net_context *context, struct net_pkt *pkt)
NET_DBG("[%p] Queue %p len %zd", context->tcp, pkt, data_len);
if (net_context_get_state(context) != NET_CONTEXT_CONNECTED) {
return -ENOTCONN;
}
NET_ASSERT(context->tcp);
if (context->tcp->flags & NET_TCP_IS_SHUTDOWN) {
return -ESHUTDOWN;
}
net_pkt_set_appdatalen(pkt, net_pkt_get_len(pkt));
/* Set PSH on all packets, our window is so small that there's
* no point in the remote side trying to finesse things and
* coalesce packets.