NAN: Limit pauseState to be within service lifetime

If a publish service is configured with an explicit lifetime (ttl), do
not allow pauseState duration to exceed that.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>

diff --git a/src/common/nan_de.c b/src/common/nan_de.c
index 844fc443472c8e258d3d5dcdcbffe9c783e8b5c9..8855912a2c1e18578064834262a65558f2f3f785 100644 (file)
--- a/src/common/nan_de.c
+++ b/src/common/nan_de.c
@@ -160,6 +160,9 @@ static void nan_de_pause_state(struct nan_de_service *srv, const u8 *peer_addr,
        wpa_printf(MSG_DEBUG, "NAN: Start pauseState");
        os_get_reltime(&srv->pause_state_end);
        srv->pause_state_end.sec += 60;
+       if (os_reltime_initialized(&srv->end_time) &&
+           os_reltime_before(&srv->end_time, &srv->pause_state_end))
+               srv->pause_state_end = srv->end_time;
        os_memcpy(srv->sel_peer_addr, peer_addr, ETH_ALEN);
        srv->sel_peer_id = peer_id;
 }