Edit Resolved Name: Don't add duplicate IPs

1. Switch list of manually resolved names from a list to a map
   (IP Address --> Custom Hostname)
2. If an address was already in the list, just update the old entry.
Previously this added a new entry anytime somebody would edit a
hostname.
3. Display the previous hostname in the GUI
4. Remove unused manually_resolve_cleanup()

Bug: 11221
Change-Id: I42d5b6267eb6613bdf7783865bc2d30d6bda1147
Reviewed-on: https://code.wireshark.org/review/36059
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 17 insertions, 0 deletions

diff --git a/ui/qt/address_editor_frame.cpp b/ui/qt/address_editor_frame.cpp
index 5ebbccdce7..0d60b345f2 100644
--- a/ui/qt/address_editor_frame.cpp
+++ b/ui/qt/address_editor_frame.cpp
@@ -90,6 +90,8 @@ void AddressEditorFrame::editAddresses(CaptureFile &cf, int column)
 
     epan_dissect_cleanup(&edt);
 
+    displayPreviousUserDefinedHostname();
+
     ui->addressComboBox->addItems(addresses);
     ui->nameLineEdit->setFocus();
     updateWidgets();
@@ -118,6 +120,20 @@ void AddressEditorFrame::keyPressEvent(QKeyEvent *event)
     AccordionFrame::keyPressEvent(event);
 }
 
+void AddressEditorFrame::displayPreviousUserDefinedHostname()
+{
+    QString addr = ui->addressComboBox->currentText();
+    resolved_name_t* previous_entry = get_edited_resolved_name(addr.toUtf8().constData());
+    if (previous_entry)
+    {
+        ui->nameLineEdit->setText(previous_entry->name);
+    }
+    else
+    {
+        ui->nameLineEdit->setText("");
+    }
+}
+
 void AddressEditorFrame::updateWidgets()
 {
     bool ok_enable = false;
@@ -136,6 +152,7 @@ void AddressEditorFrame::on_nameResolutionPreferencesToolButton_clicked()
 
 void AddressEditorFrame::on_addressComboBox_currentIndexChanged(const QString &)
 {
+    displayPreviousUserDefinedHostname();
     updateWidgets();
 }