applications: serial_lte_modem: Combine sends

Combine duplicated code related to send and sendto.

Signed-off-by: Markus Lassila <[email protected]>

Author: MarkusLassila

applications/serial_lte_modem/src/slm_at_socket.c

@@ -679,7 +679,7 @@ static int do_accept(int timeout)
 	return 0;
 }
 
-static int do_send(const uint8_t *data, int datalen)
+static int do_send(const uint8_t *data, int len)
 {
 	int ret = 0;
 	int sockfd = sock->fd;
@@ -694,54 +694,23 @@ static int do_send(const uint8_t *data, int datalen)
 		}
 	}
 
-	uint32_t offset = 0;
+	uint32_t sent = 0;
 
-	while (offset < datalen) {
-		ret = zsock_send(sockfd, data + offset, datalen - offset, 0);
+	while (sent < len) {
+		ret = zsock_send(sockfd, data + sent, len - sent, 0);
 		if (ret < 0) {
-			LOG_ERR("zsock_send() failed: %d, sent: %d", -errno, offset);
+			LOG_ERR("Sent %u out of %u bytes. (%d)", sent, len, -errno);
 			ret = -errno;
 			break;
 		}
-		offset += ret;
+		sent += ret;
 	}
 
-	rsp_send("\r\n#XSEND: %d\r\n", offset);
-
-	if (ret >= 0) {
-		return 0;
+	if (!in_datamode()) {
+		rsp_send("\r\n#XSEND: %d\r\n", sent);
 	}
 
-	return ret;
-}
-
-static int do_send_datamode(const uint8_t *data, int datalen)
-{
-	int ret = 0;
-	int sockfd = sock->fd;
-
-	/* For TCP/TLS Server, send to incoming socket */
-	if (sock->type == SOCK_STREAM && sock->role == AT_SOCKET_ROLE_SERVER) {
-		if (sock->fd_peer != INVALID_SOCKET) {
-			sockfd = sock->fd_peer;
-		} else {
-			LOG_ERR("No connection");
-			return -EINVAL;
-		}
-	}
-
-	uint32_t offset = 0;
-
-	while (offset < datalen) {
-		ret = zsock_send(sockfd, data + offset, datalen - offset, 0);
-		if (ret < 0) {
-			LOG_ERR("zsock_send() failed: %d, sent: %d", -errno, offset);
-			break;
-		}
-		offset += ret;
-	}
-
-	return (offset > 0) ? offset : -1;
+	return sent > 0 ? sent : ret;
 }
 
 static int do_recv(int timeout, int flags)
@@ -788,76 +757,45 @@ static int do_recv(int timeout, int flags)
 	return ret;
 }
 
-static int do_sendto(const char *url, uint16_t port, const uint8_t *data, int datalen)
+static int do_sendto(const char *url, uint16_t port, const uint8_t *data, int len)
 {
 	int ret = 0;
-	uint32_t offset = 0;
-	struct sockaddr sa = {
-		.sa_family = AF_UNSPEC
-	};
+	uint32_t sent = 0;
+	struct sockaddr sa = {.sa_family = AF_UNSPEC};
 
 	LOG_DBG("sendto %s:%d", url, port);
 	ret = util_resolve_host(sock->cid, url, port, sock->family, &sa);
 	if (ret) {
 		return -EAGAIN;
 	}
 
-	while (offset < datalen) {
-		if (sa.sa_family == AF_INET) {
-			ret = zsock_sendto(sock->fd, data + offset, datalen - offset, 0,
-				&sa, sizeof(struct sockaddr_in));
-		} else {
-			ret = zsock_sendto(sock->fd, data + offset, datalen - offset, 0,
-				&sa, sizeof(struct sockaddr_in6));
-		}
+	do {
+		ret = zsock_sendto(sock->fd, data + sent, len - sent, 0, &sa,
+				   sa.sa_family == AF_INET ? sizeof(struct sockaddr_in)
+							   : sizeof(struct sockaddr_in6));
 		if (ret <= 0) {
-			LOG_ERR("zsock_sendto() failed: %d, sent: %d", -errno, offset);
 			ret = -errno;
 			break;
 		}
-		offset += ret;
-	}
+		sent += ret;
 
-	rsp_send("\r\n#XSENDTO: %d\r\n", offset);
+	} while (sock->type != SOCK_DGRAM && sent < len);
 
-	if (ret >= 0) {
-		return 0;
+	if (ret >= 0 && sock->type == SOCK_DGRAM && sent != len) {
+		/* Partial send of datagram. */
+		ret = -EAGAIN;
+		sent = 0;
 	}
 
-	return ret;
-}
-
-static int do_sendto_datamode(const uint8_t *data, int datalen)
-{
-	int ret = 0;
-	struct sockaddr sa = {
-		.sa_family = AF_UNSPEC
-	};
-
-	LOG_DBG("sendto %s:%d", udp_url, udp_port);
-	ret = util_resolve_host(sock->cid, udp_url, udp_port, sock->family, &sa);
-	if (ret) {
-		return -EAGAIN;
+	if (ret < 0) {
+		LOG_ERR("Sent %u out of %u bytes. (%d)", sent, len, ret);
 	}
 
-	uint32_t offset = 0;
-
-	while (offset < datalen) {
-		if (sa.sa_family == AF_INET) {
-			ret = zsock_sendto(sock->fd, data + offset, datalen - offset, 0,
-				&sa, sizeof(struct sockaddr_in));
-		} else {
-			ret = zsock_sendto(sock->fd, data + offset, datalen - offset, 0,
-				&sa, sizeof(struct sockaddr_in6));
-		}
-		if (ret <= 0) {
-			LOG_ERR("zsock_sendto() failed: %d, sent: %d", -errno, offset);
-			break;
-		}
-		offset += ret;
+	if (!in_datamode()) {
+		rsp_send("\r\n#XSENDTO: %d\r\n", sent);
 	}
 
-	return (offset > 0) ? offset : -1;
+	return sent > 0 ? sent : ret;
 }
 
 static int do_recvfrom(int timeout, int flags)
@@ -959,9 +897,9 @@ static int socket_datamode_callback(uint8_t op, const uint8_t *data, int len, ui
 			return -EOVERFLOW;
 		} else {
 			if (strlen(udp_url) > 0) {
-				ret = do_sendto_datamode(data, len);
+				ret = do_sendto(udp_url, udp_port, data, len);
 			} else {
-				ret = do_send_datamode(data, len);
+				ret = do_send(data, len);
 			}
 			LOG_INF("datamode send: %d", ret);
 		}
@@ -1445,6 +1383,11 @@ static int handle_at_send(enum at_parser_cmd_type cmd_type, struct at_parser *pa
 				return err;
 			}
 			err = do_send(data, size);
+			if (err == size) {
+				err = 0;
+			} else {
+				err = err < 0 ? err : -EAGAIN;
+			}
 		} else {
 			err = enter_datamode(socket_datamode_callback);
 		}
@@ -1515,6 +1458,11 @@ static int handle_at_sendto(enum at_parser_cmd_type cmd_type, struct at_parser *
 				return err;
 			}
 			err = do_sendto(udp_url, udp_port, data, size);
+			if (err == size) {
+				err = 0;
+			} else {
+				err = err < 0 ? err : -EAGAIN;
+			}
 			memset(udp_url, 0, sizeof(udp_url));
 		} else {
 			err = enter_datamode(socket_datamode_callback);