From Luis Ontanon:

[obnox/wireshark/wip.git] / plugins / mate / mate_setup.c

diff --git a/plugins/mate/mate_setup.c b/plugins/mate/mate_setup.c
index 417285e0f231abd4986cad181dc8c3c9ca0fa94f..a9ff8ff4d29939ac24e4e986d14b878d71a70a3f 100644 (file)
--- a/plugins/mate/mate_setup.c
+++ b/plugins/mate/mate_setup.c
@@ -568,7 +568,7 @@ static gboolean config_settings(AVPL*avpl) {
 #endif
 
 
-       matecfg->gog_expiration = extract_named_bool(avpl, KEYWORD_GOGEXPIRE,matecfg->gog_expiration);
+       matecfg->gog_expiration = extract_named_float(avpl, KEYWORD_GOGEXPIRE,matecfg->gog_expiration);
        matecfg->discard_pdu_attributes = extract_named_bool(avpl, KEYWORD_DISCARDPDU,matecfg->discard_pdu_attributes);
        matecfg->drop_pdu = extract_named_bool(avpl, KEYWORD_DROPPDU,matecfg->drop_pdu);
        matecfg->drop_gop = extract_named_bool(avpl, KEYWORD_DROPGOP,matecfg->drop_gop);
@@ -1428,7 +1428,7 @@ static void analyze_gog_config(gpointer k _U_, gpointer v, gpointer p _U_) {
        
 }
 
-static size_t analyze_config() {
+static void analyze_config() {
        guint i;
 
        for (i=0; i<matecfg->pducfglist->len; i++) {
@@ -1569,7 +1569,6 @@ extern mate_config* mate_make_config(guint8* filename) {
        matecfg->discard_pdu_attributes = FALSE;
        matecfg->drop_pdu = FALSE;
        matecfg->drop_gop = FALSE;
-       matecfg->show_pdu_tree = TRUE;
        matecfg->show_times = TRUE;
        matecfg->last_to_be_created = FALSE;
        matecfg->match_mode = AVPL_STRICT;
@@ -1603,6 +1602,8 @@ extern mate_config* mate_make_config(guint8* filename) {
 
        init_actions();
 
+       matecfg->show_pdu_tree = matecfg->frame_tree;
+
        if ( mate_load_config(filename) ) {
                analyze_config();
                dbg_print (dbg_cfg,3,dbg_facility,"mate_make_config: OK");