Browse Source

MT#57977 store ml_flags into Redis

Change-Id: Iddace667db2c61940c58b4332863e871d137ecf1
(cherry picked from commit 0e35f40233)
rfuchs/dataport-mr11.5
Richard Fuchs 2 years ago
parent
commit
c8184e3631
2 changed files with 24 additions and 2 deletions
  1. +3
    -0
      daemon/redis.c
  2. +21
    -2
      t/auto-daemon-tests-redis.pl

+ 3
- 0
daemon/redis.c View File

@ -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)))
@ -2480,6 +2482,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);


+ 21
- 2
t/auto-daemon-tests-redis.pl View File

@ -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()
}
};
@ -1538,6 +1546,7 @@ $json_exp = {
'created' => qr/^\d+$/,
'deleted' => '0',
'logical_intf' => 'foo',
'ml_flags' => 0,
'tag' => ft()
},
'tag-1' => {
@ -1546,6 +1555,7 @@ $json_exp = {
'created' => qr/^\d+$/,
'deleted' => '0',
'logical_intf' => 'foo',
'ml_flags' => 0,
'tag' => tt()
},
'tag-2' => {
@ -1554,6 +1564,7 @@ $json_exp = {
'created' => qr/^\d+$/,
'deleted' => '0',
'logical_intf' => 'foo',
'ml_flags' => 0,
'tag' => qr//
}
};
@ -1742,6 +1753,7 @@ $json_exp = {
'created' => qr//,
'deleted' => '0',
'logical_intf' => 'foo',
'ml_flags' => 0,
'tag' => ft()
}
};
@ -1981,6 +1993,7 @@ $json_exp = {
'created' => qr//,
'deleted' => '0',
'logical_intf' => 'foo',
'ml_flags' => 0,
'tag' => ft()
},
'tag-1' => {
@ -1989,6 +2002,7 @@ $json_exp = {
'created' => qr//,
'deleted' => '0',
'logical_intf' => 'foo',
'ml_flags' => 0,
'tag' => qr//,
}
};
@ -2220,6 +2234,7 @@ $json_exp = {
'created' => qr//,
'deleted' => '0',
'logical_intf' => 'foo',
'ml_flags' => 0,
'tag' => ft()
},
'tag-1' => {
@ -2228,6 +2243,7 @@ $json_exp = {
'created' => qr//,
'deleted' => '0',
'logical_intf' => 'foo',
'ml_flags' => 0,
'tag' => qr//,
}
};
@ -2552,6 +2568,7 @@ $json_exp = {
'created' => qr//,
'deleted' => '0',
'logical_intf' => 'foo',
'ml_flags' => 0,
'tag' => ft()
},
'tag-1' => {
@ -2560,6 +2577,7 @@ $json_exp = {
'created' => qr//,
'deleted' => '0',
'logical_intf' => 'foo',
'ml_flags' => 0,
'tag' => qr//,
},
'tag-2' => {
@ -2568,6 +2586,7 @@ $json_exp = {
'created' => qr//,
'deleted' => '0',
'logical_intf' => 'foo',
'ml_flags' => 0,
'tag' => qr//,
}
};


Loading…
Cancel
Save