send_and_log: treat drop events as success

Dropping on tx is normal behaviour under test. state-listening is still entering faulty (thus waiting 4 seconds before restarting) if tx fails. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

send_and_log: treat drop events as success
Dropping on tx is normal behaviour under test. state-listening is still entering faulty (thus waiting 4 seconds before restarting) if tx fails. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
1c2b0811 · Alessandro Rubini · 3a3ef679 · 1c2b0811
Commit 1c2b0811 authored Apr 06, 2017 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

common-fun.c proto-standard/common-fun.c +6 -2

No files found.
--- a/proto-standard/common-fun.c
+++ b/proto-standard/common-fun.c
@@ -297,9 +297,13 @@ int st_com_master_handle_sync(struct pp_instance *ppi, unsigned char *buf,
 int __send_and_log(struct pp_instance *ppi, int msglen, int chtype)
 {
 	int msgtype = ((char *)ppi->tx_ptp)[0] & 0xf;
+	int ret;

-	if (ppi->n_ops->send(ppi, ppi->tx_frame, msglen + ppi->tx_offset,
-			     msgtype) < msglen) {
+	ret = ppi->n_ops->send(ppi, ppi->tx_frame, msglen + ppi->tx_offset,
+			       msgtype);
+	if (ret == PP_SEND_DROP)
+		return 0; /* don't report as error, nor count nor log as sent */
+	if (ret < msglen) {
 		pp_diag(ppi, frames, 1, "%s(%d) Message can't be sent\n",
 			pp_msgtype_info[msgtype].name, msgtype);
 		return PP_SEND_ERROR;