aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mate/mate_grammar.lemon
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss@ulticom.com>2010-04-14 18:39:00 +0000
committerJeff Morriss <jeff.morriss@ulticom.com>2010-04-14 18:39:00 +0000
commitb09f79f4141b403353c4afb2680739b7670d3045 (patch)
treeb8291d46569ae009eebf926261644b833a0e1d47 /plugins/mate/mate_grammar.lemon
parentef2548d0932500f5170d30b56a15624dfe69f816 (diff)
Be sure we initialize the p_id in hf's. This fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3010 . Also finish the implementation of ShowTimes for GOGs so that the variable gets initialized (preventing another uninitialized variable warning from Valgrind). svn path=/trunk/; revision=32465
Diffstat (limited to 'plugins/mate/mate_grammar.lemon')
-rw-r--r--plugins/mate/mate_grammar.lemon39
1 files changed, 22 insertions, 17 deletions
diff --git a/plugins/mate/mate_grammar.lemon b/plugins/mate/mate_grammar.lemon
index 5db1939fb8..2afa8dec2d 100644
--- a/plugins/mate/mate_grammar.lemon
+++ b/plugins/mate/mate_grammar.lemon
@@ -319,7 +319,7 @@ gop_tree_mode_default ::= .
gop_show_times_default ::= SHOW_TIMES_KW true_false(B) SEMICOLON. { mc->defaults.gop.show_times = B; }
gop_show_times_default ::= .
-gog_defaults ::= GOG_KW OPEN_BRACE gog_expiration_default gop_tree_mode_default gog_goptree_default CLOSE_BRACE SEMICOLON.
+gog_defaults ::= GOG_KW OPEN_BRACE gog_expiration_default gop_tree_mode_default gog_goptree_default gog_show_times_default CLOSE_BRACE SEMICOLON.
gog_defaults ::= .
gog_expiration_default ::= EXPIRATION_KW time_value(B) SEMICOLON. { mc->defaults.gop.expiration = B; }
@@ -328,6 +328,9 @@ gog_expiration_default ::= .
gog_goptree_default ::= GOP_TREE_KW gop_tree_type(B) SEMICOLON. { mc->defaults.gog.gop_tree_mode = B; }
gog_goptree_default ::= .
+gog_show_times_default ::= SHOW_TIMES_KW true_false(B) SEMICOLON. { mc->defaults.gog.show_times = B; }
+gog_show_times_default ::= .
+
/******************************************* TRANSFORM
*/
@@ -541,19 +544,19 @@ gop_decl(A) ::= GOP_KW NAME(Name) ON_KW pdu_name(PduName) MATCH_KW avpl(Key) OPE
cfg->on_pdu = PduName;
cfg->key = Key;
- cfg->drop_unassigned = DropUnassigned;
- cfg->show_times = ShowTimes;
- cfg->pdu_tree_mode = TreeMode;
- cfg->expiration = Expiration;
- cfg->idle_timeout = IdleTimeout;
- cfg->lifetime = Lifetime;
- cfg->start = Start;
- cfg->stop = Stop;
- cfg->transforms = Transform;
-
- merge_avpl(cfg->extra,Extra,TRUE);
- delete_avpl(Extra,TRUE);
-}
+ cfg->drop_unassigned = DropUnassigned;
+ cfg->show_times = ShowTimes;
+ cfg->pdu_tree_mode = TreeMode;
+ cfg->expiration = Expiration;
+ cfg->idle_timeout = IdleTimeout;
+ cfg->lifetime = Lifetime;
+ cfg->start = Start;
+ cfg->stop = Stop;
+ cfg->transforms = Transform;
+
+ merge_avpl(cfg->extra,Extra,TRUE);
+ delete_avpl(Extra,TRUE);
+ }
gop_drop_unassigned_statement(A) ::= DROP_UNASSIGNED_KW true_false(B) SEMICOLON. { A = B; }
gop_drop_unassigned_statement(A) ::= . { A = mc->defaults.gop.drop_unassigned; }
@@ -614,7 +617,8 @@ gog_decl ::= GOG_KW NAME(Name) OPEN_BRACE
transform_list_statement(Transforms)
gog_expiration_statement(Expiration)
gog_goptree_statement(Tree)
- CLOSE_BRACE SEMICOLON. {
+ show_times_statement(ShowTimes)
+ CLOSE_BRACE SEMICOLON. {
mate_cfg_gog* cfg = NULL;
if ( g_hash_table_lookup(mc->gogcfgs,Name) ) {
@@ -627,9 +631,10 @@ gog_decl ::= GOG_KW NAME(Name) OPEN_BRACE
cfg->gop_tree_mode = Tree;
cfg->transforms = Transforms;
cfg->keys = Keys;
+ cfg->show_times = ShowTimes;
- merge_avpl(cfg->extra,Extra,TRUE);
- delete_avpl(Extra,TRUE);
+ merge_avpl(cfg->extra,Extra,TRUE);
+ delete_avpl(Extra,TRUE);
}
gog_goptree_statement(A) ::= GOP_TREE_KW gop_tree_type(B) SEMICOLON. { A = B; }