From 031e8907ebb0ad94a4755277affc0b42cab77a08 Mon Sep 17 00:00:00 2001
From: kris <kris@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Sun, 25 Feb 2007 02:52:39 +0000
Subject: [PATCH] Merging r4494 from my branch. A couple NmapFE changes. Add
 --packet-trace and change sensitivity setting for -r (it can be used when
 non-root)

---
 CHANGELOG           | 3 +++
 nmapfe/nmapfe.c     | 8 ++++++--
 nmapfe/nmapfe.h     | 1 +
 nmapfe/nmapfe_sig.c | 4 ++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8c7800709..af77f86d2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -47,6 +47,9 @@ o The IPProto Scan should be more accurate when scanning protocol 17 (UDP).
 o The --scanflags option now also accepts "ECE", "CWR", "ALL" and "NONE" as
   arguments.  [Kris]
 
+o The --packet-trace option was added to NmapFE.  The Ordered Ports (-r)
+  option in now available to non-root users on NmapFE as well.  [Kris]
+
 o Applied some internal bugfix patches from Eddie Bell.
 
 4.21ALPHA1
diff --git a/nmapfe/nmapfe.c b/nmapfe/nmapfe.c
index 5c9971caa..708ec9ca5 100644
--- a/nmapfe/nmapfe.c
+++ b/nmapfe/nmapfe.c
@@ -1370,8 +1370,6 @@ GtkAdjustment *adjust;
   opt.useOrderedPorts = gtk_check_button_new_with_label("Ordered Ports");
   g_signal_connect(GTK_OBJECT(opt.useOrderedPorts), "released",
 			GTK_SIGNAL_FUNC(validate_option_change), NULL);
-  if (!opt.isr00t)
-    gtk_widget_set_sensitive(GTK_WIDGET(opt.useOrderedPorts), FALSE);
   gtk_box_pack_start(GTK_BOX(vbox), opt.useOrderedPorts, FALSE, TRUE, 0);
   gtk_widget_show(opt.useOrderedPorts);
 
@@ -1381,6 +1379,12 @@ GtkAdjustment *adjust;
   gtk_box_pack_start(GTK_BOX(vbox), opt.randomizeHosts, FALSE, TRUE, 0);
   gtk_widget_show(opt.randomizeHosts);
 
+  opt.packetTrace = gtk_check_button_new_with_label("Packet Trace");
+  g_signal_connect(GTK_OBJECT(opt.packetTrace), "released",
+			GTK_SIGNAL_FUNC(validate_option_change), NULL);
+  gtk_box_pack_start(GTK_BOX(vbox), opt.packetTrace, FALSE, TRUE, 0);
+  gtk_widget_show(opt.packetTrace);
+
   gtk_widget_show(vbox);
   gtk_widget_show(frame);
 
diff --git a/nmapfe/nmapfe.h b/nmapfe/nmapfe.h
index 2baf1ece8..8cd46862f 100644
--- a/nmapfe/nmapfe.h
+++ b/nmapfe/nmapfe.h
@@ -300,6 +300,7 @@ struct NmapFEoptions {
   GtkWidget *useIPv6;
   GtkWidget *useOrderedPorts;
   GtkWidget *randomizeHosts;
+  GtkWidget *packetTrace;
 };
 
 GtkWidget* create_main_win (void);
diff --git a/nmapfe/nmapfe_sig.c b/nmapfe/nmapfe_sig.c
index 630e6894e..737b2732f 100644
--- a/nmapfe/nmapfe_sig.c
+++ b/nmapfe/nmapfe_sig.c
@@ -498,6 +498,10 @@ int command_size = 2560;
       GTK_TOGGLE_BUTTON(opt.randomizeHosts)->active)
     strcat(command, "--randomize-hosts ");
 
+  if (GTK_WIDGET_SENSITIVE(opt.packetTrace) &&
+      GTK_TOGGLE_BUTTON(opt.packetTrace)->active)
+    strcat(command, "--packet-trace ");
+
   if (GTK_WIDGET_SENSITIVE(opt.useInputFile) &&
       GTK_TOGGLE_BUTTON(opt.useInputFile)->active) {
   const char *val = gtk_entry_get_text(GTK_ENTRY(opt.inputFilename));