extcap: add new option type (timestamp).

Bug: 12787
Change-Id: I941833c55fb607c8af2ef832082af58d7b94e965
Reviewed-on: https://code.wireshark.org/review/18721
Petri-Dish: Roland Knall <rknall@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

5 files changed, 127 insertions, 1 deletions

diff --git a/ui/gtk/extcap_gtk.c b/ui/gtk/extcap_gtk.c
index 55d93892c9..c2c679c353 100644
--- a/ui/gtk/extcap_gtk.c
+++ b/ui/gtk/extcap_gtk.c
@@ -24,6 +24,7 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
+#include <glib.h>
 
 #include <ui/gtk/gui_utils.h>
 #include <wsutil/filesystem.h>
@@ -134,6 +135,11 @@ GHashTable *extcap_gtk_get_state(GtkWidget *widget) {
 
     int multi_num = 0;
 
+    guint year;
+    guint month;
+    guint day;
+    guint64 unix_ts;
+
     widget_list = (GSList *) g_object_get_data(G_OBJECT(widget),
     EXTCAP_GTK_DATA_KEY_WIDGETLIST);
 
@@ -183,6 +189,16 @@ GHashTable *extcap_gtk_get_state(GtkWidget *widget) {
                 continue;
             }
             break;
+        case EXTCAP_ARG_TIMESTAMP: {
+                GTimeZone* tz = g_time_zone_new("UTC");
+                gtk_calendar_get_date((GtkCalendar*)list_widget, &year, &month, &day);
+                GDateTime* datetime = g_date_time_new(tz, year, month, day, 0, 0, 0);
+                unix_ts = g_date_time_to_unix(datetime);
+                call_string = g_strdup_printf("%" G_GINT64_MODIFIER "u", unix_ts);
+                g_date_time_unref(datetime);
+                g_time_zone_unref(tz);
+            }
+            break;
         case EXTCAP_ARG_RADIO:
             if ((radio_widget = (GtkWidget *) g_object_get_data(
                     G_OBJECT(list_widget),
@@ -765,7 +781,7 @@ GSList *extcap_populate_gtk_vbox(GList *arguments, GtkWidget *vbox,
     extcap_arg *arg_iter = NULL;
 
     extcap_complex *prev_complex = NULL;
-    gchar *prev_call, *default_str;
+    gchar *prev_call = NULL, *default_str;
 
     GList * arg_list = g_list_first(arguments);
     if ( arg_list == NULL )
@@ -850,6 +866,22 @@ GSList *extcap_populate_gtk_vbox(GList *arguments, GtkWidget *vbox,
             if (default_str != NULL)
                 g_free(default_str);
             break;
+        case EXTCAP_ARG_TIMESTAMP:
+            default_str = NULL;
+            if (prev_complex != NULL)
+                default_str = extcap_get_complex_as_string(prev_complex);
+            else if (arg_iter->default_complex != NULL)
+                default_str = extcap_get_complex_as_string(
+                        arg_iter->default_complex);
+            label = gtk_label_new(arg_iter->display);
+            gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.1f);
+            if (default_str != NULL) {
+                gtk_entry_set_text(GTK_ENTRY(item), default_str);
+                g_free(default_str);
+            }
+
+            item = gtk_calendar_new();
+            break;
         case EXTCAP_ARG_BOOLEAN:
         case EXTCAP_ARG_BOOLFLAG:
             item = gtk_check_button_new_with_label(arg_iter->display);
diff --git a/ui/gtk/extcap_gtk.h b/ui/gtk/extcap_gtk.h
index 614a76c787..cdc26167ab 100644
--- a/ui/gtk/extcap_gtk.h
+++ b/ui/gtk/extcap_gtk.h
@@ -40,6 +40,7 @@
 #define EXTCAP_GTK_DATA_KEY_WIDGETLIST  "EXTCAP_WIDGETLIST"
 #define EXTCAP_GTK_DATA_KEY_TREEVIEW    "EXTCAP_TREEVIEW"
 #define EXTCAP_GTK_DATA_KEY_FILENAME    "EXTCAP_FILENAME"
+#define EXTCAP_GTK_DATA_KEY_TIMESTAMP   "EXTCAP_TIMESTAMP"
 #define EXTCAP_GTK_DATA_KEY_ARGUMENT    "EXTCAP_ARGUMENT"
 
 /*
diff --git a/ui/qt/extcap_argument.cpp b/ui/qt/extcap_argument.cpp
index 400bc3edae..72734b7bc6 100644
--- a/ui/qt/extcap_argument.cpp
+++ b/ui/qt/extcap_argument.cpp
@@ -25,6 +25,7 @@
 #include <QWidget>
 #include <QLabel>
 #include <QLineEdit>
+#include <QDateTimeEdit>
 #include <QIntValidator>
 #include <QDoubleValidator>
 #include <QCheckBox>
@@ -54,6 +55,66 @@
 #include <extcap_argument_file.h>
 #include <extcap_argument_multiselect.h>
 
+ExtArgTimestamp::ExtArgTimestamp(extcap_arg * argument) :
+    ExtcapArgument(argument) {}
+
+QWidget * ExtArgTimestamp::createEditor(QWidget * parent)
+{
+    QDateTimeEdit * tsBox;
+    QString storeValue;
+    QString text = defaultValue();
+
+    if ( _argument->pref_valptr && *_argument->pref_valptr)
+    {
+        QString storeValue(*_argument->pref_valptr);
+
+        if ( storeValue.length() > 0 && storeValue.compare(text) != 0 )
+            text = storeValue.trimmed();
+    }
+
+    ts = QDateTime::fromTime_t(text.toInt());
+    tsBox = new QDateTimeEdit(ts, parent);
+    tsBox->setCalendarPopup(true);
+
+    if ( _argument->tooltip != NULL )
+        tsBox->setToolTip(QString().fromUtf8(_argument->tooltip));
+
+    connect(tsBox, SIGNAL(dateTimeChanged(QDateTime)), SLOT(onDateTimeChanged(QDateTime)));
+
+    return tsBox;
+}
+
+void ExtArgTimestamp::onDateTimeChanged(QDateTime t)
+{
+    ts = t;
+    emit valueChanged();
+}
+
+QString ExtArgTimestamp::defaultValue()
+{
+    return QString::number(QDateTime::currentDateTime().toTime_t());
+}
+
+bool ExtArgTimestamp::isValid()
+{
+    bool valid = true;
+
+    if ( value().length() == 0 && isRequired() )
+        valid = false;
+
+    return valid;
+}
+
+QString ExtArgTimestamp::value()
+{
+    return QString::number(ts.toTime_t());
+}
+
+QString ExtArgTimestamp::prefValue()
+{
+    return value();
+}
+
 ExtArgSelector::ExtArgSelector(extcap_arg * argument) :
         ExtcapArgument(argument), boxSelection(0) {}
 
@@ -687,6 +748,8 @@ ExtcapArgument * ExtcapArgument::create(extcap_arg * argument)
         result = new ExtcapArgumentFileSelection(argument);
     else if ( argument->arg_type == EXTCAP_ARG_MULTICHECK )
         result = new ExtArgMultiSelect(argument);
+    else if ( argument->arg_type == EXTCAP_ARG_TIMESTAMP )
+        result = new ExtArgTimestamp(argument);
     else
     {
         /* For everything else, we just print the label */
diff --git a/ui/qt/extcap_argument.h b/ui/qt/extcap_argument.h
index 5ff390c7d0..851fcfb009 100644
--- a/ui/qt/extcap_argument.h
+++ b/ui/qt/extcap_argument.h
@@ -31,6 +31,7 @@
 #include <QComboBox>
 #include <QButtonGroup>
 #include <QCheckBox>
+#include <QDateTime>
 
 #include <extcap_parser.h>
 
@@ -207,6 +208,26 @@ private:
     bool defaultBool();
 };
 
+class ExtArgTimestamp : public ExtcapArgument
+{
+    Q_OBJECT
+
+public:
+    ExtArgTimestamp(extcap_arg * argument);
+    virtual QWidget * createEditor(QWidget * parent);
+
+    virtual bool isValid();
+    virtual QString defaultValue();
+    virtual QString value();
+    virtual QString prefValue();
+
+private Q_SLOTS:
+    void onDateTimeChanged(QDateTime);
+
+private:
+    QDateTime ts;
+};
+
 #endif /* UI_QT_EXTCAP_ARGUMENT_H_ */
 
 /*
diff --git a/ui/qt/extcap_options_dialog.cpp b/ui/qt/extcap_options_dialog.cpp
index ae798e29d9..2aea0dc490 100644
--- a/ui/qt/extcap_options_dialog.cpp
+++ b/ui/qt/extcap_options_dialog.cpp
@@ -184,6 +184,11 @@ void ExtcapOptionsDialog::anyValueChanged()
             if ( ! ((ExtArgText *)*iter)->isValid() )
                 allowStart = false;
         }
+        else if ( dynamic_cast<ExtArgTimestamp *>((*iter)) != NULL)
+        {
+            if ( ! ((ExtArgTimestamp *)*iter)->isValid() )
+                allowStart = false;
+        }
         else
             if ( ! (*iter)->isValid() )
                 allowStart = false;
@@ -465,6 +470,10 @@ void ExtcapOptionsDialog::storeValues()
         {
             value = ((ExtArgText *)*iter)->prefValue();
         }
+        else if ( dynamic_cast<ExtArgTimestamp *>((*iter)) != NULL)
+        {
+            value = ((ExtArgTimestamp *)*iter)->prefValue();
+        }
         else
             value = (*iter)->prefValue();