osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

lpp: fix error found by conflit check 

Field 'smoothingInterval-r15' (lpp.smoothingInterval_r15) has a conflicting entry in its value_string: 3 is at indices 3 (1-2 min) and 4 (2-4 min)
Field 'smoothingInterval-r15' (lpp.smoothingInterval_r15) has a conflicting entry in its value_string: 3 is at indices 3 (1-2 min) and 5 (4-8 min)
Field 'smoothingInterval-r15' (lpp.smoothingInterval_r15) has a conflicting entry in its value_string: 3 is at indices 4 (2-4 min) and 5 (4-8 min)
Field 'smoothingInterval-r15' (lpp.smoothingInterval_r15) has a conflicting entry in its value_string: 3 is at indices 3 (1-2 min) and 6 (> 8 min)
Field 'smoothingInterval-r15' (lpp.smoothingInterval_r15) has a conflicting entry in its value_string: 3 is at indices 4 (2-4 min) and 6 (> 8 min)

Change-Id: Ib4ec9c7efd894d40487ee123fb0c07b5be88bf1f
Reviewed-on: https://code.wireshark.org/review/29176
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Alexis La Goutte 2018-08-17 11:08:46 +00:00 committed by Pascal Quantin
parent 62874e3778
commit 041c79b1d1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/asn1/lpp/packet-lpp-template.c
View File

@ -437,9 +437,9 @@ static const value_string lpp_smoothingInterval_r15_vals[] = {
{ 1, "< 30 s"},
{ 2, "30-60 s"},
{ 3, "1-2 min"},
{ 3, "2-4 min"},
{ 3, "4-8 min"},
{ 3, "> 8 min"},
{ 4, "2-4 min"},
{ 5, "4-8 min"},
{ 6, "> 8 min"},
{ 7, "Unlimited smoothing interval"},
{ 0, NULL}
};

6
epan/dissectors/packet-lpp.c
View File

@ -2555,9 +2555,9 @@ static const value_string lpp_smoothingInterval_r15_vals[] = {
{ 1, "< 30 s"},
{ 2, "30-60 s"},
{ 3, "1-2 min"},
{ 3, "2-4 min"},
{ 3, "4-8 min"},
{ 3, "> 8 min"},
{ 4, "2-4 min"},
{ 5, "4-8 min"},
{ 6, "> 8 min"},
{ 7, "Unlimited smoothing interval"},
{ 0, NULL}
};