diff --git a/daemon/redis.c b/daemon/redis.c index ef041af0c..d8288603e 100644 --- a/daemon/redis.c +++ b/daemon/redis.c @@ -1508,6 +1508,8 @@ static int redis_tags(struct call *c, struct redis_list *tags, JsonReader *root_ ml->block_dtmf = ii; if (!redis_hash_get_int(&ii, rh, "block_media")) ml->block_media = ii ? true : false; + if (!redis_hash_get_int(&ii, rh, "ml_flags")) + ml->ml_flags = ii; if (redis_hash_get_str(&s, rh, "logical_intf") || !(ml->logical_intf = get_logical_interface(&s, NULL, 0))) @@ -2469,6 +2471,7 @@ char* redis_encode_json(struct call *c) { JSON_SET_SIMPLE("deleted", "%llu", (long long unsigned) ml->deleted); JSON_SET_SIMPLE("block_dtmf", "%i", ml->block_dtmf); JSON_SET_SIMPLE("block_media", "%i", ml->block_media); + JSON_SET_SIMPLE("ml_flags","%u", ml->ml_flags); if (ml->logical_intf) JSON_SET_SIMPLE_STR("logical_intf", &ml->logical_intf->name); diff --git a/t/auto-daemon-tests-redis.pl b/t/auto-daemon-tests-redis.pl index 9f90b04a4..3c052059f 100755 --- a/t/auto-daemon-tests-redis.pl +++ b/t/auto-daemon-tests-redis.pl @@ -312,6 +312,7 @@ $json_exp = { 'created' => qr/^\d+$/, 'deleted' => '0', 'logical_intf' => 'foo', + 'ml_flags' => 0, 'tag' => ft() }, 'tag-1' => { @@ -319,7 +320,8 @@ $json_exp = { 'block_media' => '0', 'created' => qr/^\d+$/, 'deleted' => '0', - 'logical_intf' => 'foo' + 'logical_intf' => 'foo', + 'ml_flags' => 0, } }; @@ -568,6 +570,7 @@ $json_exp = { 'created' => qr/^\d+$/, 'deleted' => '0', 'logical_intf' => 'foo', + 'ml_flags' => 0, 'tag' => ft() }, 'tag-1' => { @@ -576,6 +579,7 @@ $json_exp = { 'created' => qr/^\d+$/, 'deleted' => '0', 'logical_intf' => 'foo', + 'ml_flags' => 0, 'tag' => tt() } }; @@ -833,6 +837,7 @@ $json_exp = { 'created' => qr/^\d+$/, 'deleted' => '0', 'logical_intf' => 'foo', + 'ml_flags' => 0, 'tag' => ft() }, 'tag-1' => { @@ -840,7 +845,8 @@ $json_exp = { 'block_media' => '0', 'created' => qr/^\d+$/, 'deleted' => '0', - 'logical_intf' => 'foo' + 'logical_intf' => 'foo', + 'ml_flags' => 0, } }; @@ -1092,6 +1098,7 @@ $json_exp = { 'created' => qr/^\d+$/, 'deleted' => '0', 'logical_intf' => 'foo', + 'ml_flags' => 0, 'tag' => ft() }, 'tag-1' => { @@ -1100,6 +1107,7 @@ $json_exp = { 'created' => qr/^\d+$/, 'deleted' => '0', 'logical_intf' => 'foo', + 'ml_flags' => 0, 'tag' => tt() } }; @@ -1537,6 +1545,7 @@ $json_exp = { 'created' => qr/^\d+$/, 'deleted' => '0', 'logical_intf' => 'foo', + 'ml_flags' => 0, 'tag' => ft() }, 'tag-1' => { @@ -1545,6 +1554,7 @@ $json_exp = { 'created' => qr/^\d+$/, 'deleted' => '0', 'logical_intf' => 'foo', + 'ml_flags' => 0, 'tag' => tt() }, 'tag-2' => { @@ -1553,6 +1563,7 @@ $json_exp = { 'created' => qr/^\d+$/, 'deleted' => '0', 'logical_intf' => 'foo', + 'ml_flags' => 0, 'tag' => qr// } }; @@ -1741,6 +1752,7 @@ $json_exp = { 'created' => qr//, 'deleted' => '0', 'logical_intf' => 'foo', + 'ml_flags' => 0, 'tag' => ft() } }; @@ -1980,6 +1992,7 @@ $json_exp = { 'created' => qr//, 'deleted' => '0', 'logical_intf' => 'foo', + 'ml_flags' => 0, 'tag' => ft() }, 'tag-1' => { @@ -1988,6 +2001,7 @@ $json_exp = { 'created' => qr//, 'deleted' => '0', 'logical_intf' => 'foo', + 'ml_flags' => 0, 'tag' => qr//, } }; @@ -2219,6 +2233,7 @@ $json_exp = { 'created' => qr//, 'deleted' => '0', 'logical_intf' => 'foo', + 'ml_flags' => 0, 'tag' => ft() }, 'tag-1' => { @@ -2227,6 +2242,7 @@ $json_exp = { 'created' => qr//, 'deleted' => '0', 'logical_intf' => 'foo', + 'ml_flags' => 0, 'tag' => qr//, } }; @@ -2551,6 +2567,7 @@ $json_exp = { 'created' => qr//, 'deleted' => '0', 'logical_intf' => 'foo', + 'ml_flags' => 0, 'tag' => ft() }, 'tag-1' => { @@ -2559,6 +2576,7 @@ $json_exp = { 'created' => qr//, 'deleted' => '0', 'logical_intf' => 'foo', + 'ml_flags' => 0, 'tag' => qr//, }, 'tag-2' => { @@ -2567,6 +2585,7 @@ $json_exp = { 'created' => qr//, 'deleted' => '0', 'logical_intf' => 'foo', + 'ml_flags' => 0, 'tag' => qr//, } };