ndef: Support receiving empty Handover select frames

Empty handover select frames are received when the peer notifies us
about not supporting any of the carrier sent in the handover request
frame.
In that case there is nothing to do but disconnecting from the handover
service.

2 files changed, 12 insertions, 0 deletions

diff --git a/plugins/handover.c b/plugins/handover.c
index bd3b4cd..fa4126a 100644
--- a/plugins/handover.c
+++ b/plugins/handover.c
@@ -349,6 +349,11 @@ static near_bool_t handover_read_initialize(int client_fd,
 	ndef->cur_ptr += bytes_recv;
 	ndef->missing_bytes = ndef->cur_record_len - bytes_recv;
 
+	if (ndef->cur_record_len == NDEF_HR_MSG_MIN_LENGTH) {
+		handover_ndef_parse(client_fd, ndef);
+		return FALSE;
+	}
+
 	DBG("Handover frame size is %d", ndef->cur_ptr);
 
 	/* Next prepare read to complete the read */
diff --git a/src/ndef.c b/src/ndef.c
index f86df89..641f5df 100644
--- a/src/ndef.c
+++ b/src/ndef.c
@@ -2414,6 +2414,13 @@ static struct near_ndef_ho_payload *parse_ho_payload(enum record_type rec_type,
 			goto fail;
 		}
 	} else if (reply != NULL) {
+		/* This is a Hs with no cfg and no Ac: No reply and fail */
+		if (rec_type == RECORD_TYPE_WKT_HANDOVER_SELECT &&
+					g_slist_length(acs) == 0) {
+			*reply = NULL;
+			goto fail;
+		}
+
 		/* Prepare Hs, it depends upon Hr message carrier types */
 		*reply = near_ndef_prepare_hs_reply(mimes, c_datas);
 		if (*reply == NULL) {