From 0c6a268539718ef5764ce4e29a136736f31b7a1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E5=AD=90=E5=8D=9A?= <349832309@qq.com>
Date: Thu, 13 Sep 2018 10:31:36 +0800
Subject: [PATCH] Set default value of message expiry interval for not mqtt 5.0
 message

---
 src/emqx_protocol.erl | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/emqx_protocol.erl b/src/emqx_protocol.erl
index 8301cf014..054ec2a57 100644
--- a/src/emqx_protocol.erl
+++ b/src/emqx_protocol.erl
@@ -249,6 +249,13 @@ preprocess_properties(Packet = #mqtt_packet{
                       PState = #pstate{proto_ver = ?MQTT_PROTO_V5, topic_aliases = Aliases}) ->
     {Packet, PState#pstate{topic_aliases = maps:put(AliasId, Topic, Aliases)}};
 
+preprocess_properties(Packet = #mqtt_packet{variable = #mqtt_packet_publish{properties = #{'Message-Expiry-Interval' := _Interval}}},
+                      PState = #pstate{proto_ver = ?MQTT_PROTO_V5}) ->
+    {Packet, PState};
+preprocess_properties(Packet = #mqtt_packet{variable = Publish = #mqtt_packet_publish{properties = Properties}},
+                      PState = #pstate{proto_ver = ?MQTT_PROTO_V5}) ->
+    {Packet#mqtt_packet{variable = Publish#mqtt_packet_publish{properties = maps:put('Message-Expiry-Interval', 0, Properties)}}, PState};
+
 preprocess_properties(Packet, PState) ->
     {Packet, PState}.