Doug Hoyte version detection additions, etc.

This commit is contained in:
fyodor 2005-10-10 22:50:45 +00:00
parent 56bb813f12
commit ba5fe2eb20
7 changed files with 112 additions and 45 deletions

View file

@ -474,16 +474,6 @@ GtkAdjustment *adjust;
gtk_table_attach_defaults(GTK_TABLE(table), opt.RPCInfo, 0, 1, 0, 1);
gtk_widget_show(opt.RPCInfo);
opt.IdentdInfo = gtk_check_button_new_with_label("Identd Info");
gtk_signal_connect(GTK_OBJECT(opt.IdentdInfo), "released",
GTK_SIGNAL_FUNC(validate_option_change), NULL);
if (opt.scanValue != CONNECT_SCAN)
gtk_widget_set_sensitive(GTK_WIDGET(opt.IdentdInfo), FALSE);
gtk_table_attach_defaults(GTK_TABLE(table), opt.IdentdInfo, 1, 2, 0, 1);
gtk_widget_show(opt.IdentdInfo);
opt.OSInfo = gtk_check_button_new_with_label("OS Detection");
gtk_signal_connect(GTK_OBJECT(opt.OSInfo), "released",
GTK_SIGNAL_FUNC(display_nmap_command_cb), NULL);

View file

@ -253,7 +253,6 @@ struct NmapFEoptions {
guint protportValue;
/* optional scan extensions */
GtkWidget *RPCInfo;
GtkWidget *IdentdInfo;
GtkWidget *OSInfo;
GtkWidget *VersionInfo;
/* ping types */

View file

@ -470,10 +470,6 @@ static int command_size = 0;
GTK_TOGGLE_BUTTON(opt.VersionInfo)->active)
strcat(command, "-sV ");
if (GTK_WIDGET_SENSITIVE(opt.IdentdInfo) &&
GTK_TOGGLE_BUTTON(opt.IdentdInfo)->active)
strcat(command, "-I ");
if (GTK_WIDGET_SENSITIVE(opt.OSInfo) &&
GTK_TOGGLE_BUTTON(opt.OSInfo)->active)
strcat(command, "-O ");
@ -800,10 +796,6 @@ void scanType_changed_fcb(int *variable, guint action, GtkWidget *w)
gtk_widget_set_sensitive(GTK_WIDGET(opt.useDecoy), TRUE);
gtk_widget_set_sensitive(GTK_WIDGET(opt.Decoy), TRUE);
}
if (action != CONNECT_SCAN)
gtk_widget_set_sensitive(GTK_WIDGET(opt.IdentdInfo), FALSE);
else
gtk_widget_set_sensitive(GTK_WIDGET(opt.IdentdInfo), TRUE);
if ((action != ACK_SCAN) && (action != MAIMON_SCAN) && (action != FIN_SCAN) &&
(action != SYN_SCAN) && (action != NULL_SCAN) && (action != XMAS_SCAN) &&