Commit Graph

4454 Commits

Author SHA1 Message Date
Shawn e199e29b67
Merge pull request #1802 from Gilbert-Wong/emqx30
Add pattern match for topic alias
2018-09-08 12:58:43 +08:00
Gilbert Wong 78020de302 fix pattern match bu
Prior to this change, when packet have topic alias, the check_pub_caps
function could not be matched correctly

This change fix this bug.
2018-09-08 12:50:14 +08:00
Gilbert Wong 2d10d6971d add pattern match for topic alias
Prior to this change, it assume that topic_alias exists defaultly
which may cause the unexpected bug

This change fix this bug above
2018-09-08 12:01:22 +08:00
周子博 08bab7efa4 Fix bugs in test cases 2018-09-08 11:49:20 +08:00
turtleDeng c8341c85ba
Merge pull request #1800 from terry-xiaoyu/ignor_zero_will_delay
Ignore Will-Delay-Interval = 0
2018-09-08 10:40:12 +08:00
terry-xiaoyu 2121da3755 Ignore Will-Delay-Interval = 0 2018-09-08 10:10:22 +08:00
tigercl c8361124ae
Merge pull request #6 from emqx/emqx30
Emqx30
2018-09-08 10:04:35 +08:00
turtleDeng c0ddbba5db
Merge pull request #1794 from spring2maz/generate-temp-config-for-test
Generate a config file for testing
2018-09-07 21:50:35 +08:00
turtleDeng 0ec461484e
Merge pull request #1790 from emqx/emqx30-feng
Improve the Hooks' design
2018-09-07 21:46:30 +08:00
turtleDeng 66e9f9b02a
Merge pull request #1789 from Gilbert-Wong/emqx30
Check topic alias
2018-09-07 21:44:20 +08:00
turtleDeng 5ca61dd45c
Merge pull request #1788 from tigercl/emqx30
Support retain as published in subscription options
2018-09-07 21:43:56 +08:00
Gilbert 84e43c587d
Merge branch 'emqx30' into emqx30 2018-09-07 18:49:11 +08:00
周子博 6f6e24592b Fix the reverse match 2018-09-07 18:32:03 +08:00
turtleDeng cb058143a5
Merge pull request #1792 from huangdan/master
Add test cases for mqtt5 connect packet
2018-09-07 18:03:37 +08:00
turtleDeng ba176f2073
Merge pull request #1797 from terry-xiaoyu/banned_api_v2
Update for banned API
2018-09-07 17:50:30 +08:00
周子博 1c5615c957 Stop emqx_zone when emqx_mqtt_caps test over 2018-09-07 17:22:24 +08:00
周子博 1326e89593 Fix a bug in emqx_protocol.erl 2018-09-07 15:16:32 +08:00
terry-xiaoyu dd8513ad35 Update for banned API
Use `mnesia:foldl` to traverse mnesia rather than `mnesia:first` and
`mnesia:next`, as a badarg exception would occur if the record was
deleted while travering the whole table.
2018-09-07 14:10:16 +08:00
周子博 f8471afb97 Add handling of retain handling subscription option 2018-09-07 13:50:12 +08:00
spring2maz 3a94d7ddae Generate a config file for testing
Prior to this change, the template file etc/emqx.conf is used
directly in testing, as a result, mustache style directories
are created e.g. `{{ platform_log_dir }}` which should have been
replaced with a config varialbe e.g. `log`

In this change, Makefile targets are added as `ct` dependency
to download bbmustach, load the template input, replace with
variableds defined in 'vars' file, finally to etc/gen.emqx.conf.
The direct usage of etc/emqx.conf in test code are replaced with
gen.emqx.conf
2018-09-07 07:04:04 +02:00
Feng Lee 306151bdb8
Merge pull request #1795 from emqplus/emqx30-code-review
Code Review: update the emqx_zone module
2018-09-07 12:23:19 +08:00
Feng Lee 304a24ca6a Code Review: Update the zone module
1. Add force_reload/0 management API
2. Change the reload interval to 5 minutes
2018-09-07 10:26:14 +08:00
Feng Lee d9ad29476a Code Review: Update the zone module
1. Add force_reload/1 API
2. Change the default reload interval to 5 minutes
2018-09-07 10:23:43 +08:00
周子博 d819ec0b58 Comment unused function in emqx_frame.erl 2018-09-07 10:18:21 +08:00
Gilbert Wong 765ab5ad7b Add condition to handle when mqx_topic_alias do not exist 2018-09-06 19:09:29 +08:00
Feng Lee 328d035dab Replace 'state' record with map 2018-09-06 18:43:47 +08:00
Feng Lee 60fb2a1007
Merge pull request #1791 from emqplus/emqx30-code-review
Rename emqx_mqtt_properties module to emqx_mqtt_props
2018-09-06 18:21:56 +08:00
周子博 f95c82e37a Add metric for DISCONNECT packet 2018-09-06 18:14:14 +08:00
Feng Lee 5774ba542c Rename the emqx_mqtt_properties SUITE to emqx_mqtt_props 2018-09-06 18:10:01 +08:00
HuangDan 7c688a4839 Add test case for mqtt5 connect packet 2018-09-06 18:09:58 +08:00
Feng Lee edf654727c Rename emqx_mqtt_properties module to emqx_mqtt_props 2018-09-06 18:09:22 +08:00
Feng Lee d99d0a22d0 Rename 'ignore' to 'ignored' 2018-09-06 17:54:32 +08:00
Feng Lee 324cc15dd4 Update README 2018-09-06 17:38:01 +08:00
周子博 917eb8e29f Make DISCONNECT packet with reason code 0x00 when this packet doesn't have payload 2018-09-06 17:17:09 +08:00
Feng Lee 2a75105580 Improve the Hooks's design 2018-09-06 16:27:16 +08:00
Gilbert Wong c145cb89f4 add validate_properties for PUBLISH and fix error for SUB 2018-09-06 15:45:18 +08:00
周子博 42b3c9b4d6 Send DISCONNECT packet with reason code PROTOCOL_ERROR when topic is empty, add checks for topics 2018-09-06 14:47:34 +08:00
Gilbert Wong 9189d4ff41 catch topic_alias_invalid reasoncode 2018-09-06 14:24:07 +08:00
Gilbert Wong 876a983e93 Pub Packet delivered from client to server cannot contain sub id 2018-09-06 13:37:26 +08:00
Feng Lee 5e3aed0b73 Add ok_or_error/1 type 2018-09-06 09:10:47 +08:00
Feng Lee 4635921458 Rewrite the hooks module 2018-09-05 23:21:06 +08:00
Gilbert Wong c8b92a59b1 check topic alias 2018-09-05 19:06:34 +08:00
周子博 9029ee29d3 Drop will msg when receive the DISCONNECT packet whose reason code is equal to 0x00 2018-09-05 18:03:28 +08:00
周子博 47955f4309 fix bug in retain as published flag 2018-09-05 15:18:26 +08:00
周子博 aa34258f1e Support Retain As Published in Subscription Options 2018-09-05 14:25:33 +08:00
tigercl b34a4efd8b
Merge pull request #5 from emqtt/emqx30
Emqx30
2018-09-05 14:21:38 +08:00
周子博 f0f818ab1a Fix bug in emqx_frame 2018-09-05 10:28:49 +08:00
Feng Lee 96122cf966 Rename 'already_existed' to 'already_exists' 2018-09-04 19:14:25 +08:00
Feng Lee 9f8461c67b
Merge pull request #1783 from tigercl/emqx30
Change in CONNECT packet
2018-09-04 14:14:50 +08:00
周子博 842f4fbf13 Crash when reserved flag in CONNECT packet doesn't equal to 0, and remove repeated check for protocol version 2018-09-04 11:16:15 +08:00