[Openvas-commits] r1359 - in trunk/openvas-client: . nessus nessus/prefs_dialog

[scm-commit@wald.intevation.org]

Author: mwiegand
Date: 2008-09-17 11:57:47 +0200 (Wed, 17 Sep 2008)
New Revision: 1359

Modified:
   trunk/openvas-client/ChangeLog
   trunk/openvas-client/nessus/nessus.c
   trunk/openvas-client/nessus/nessus.h
   trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_prefs.c
Log:
Changed communication protocol to use OTP exclusively now. Removed the
last instances of dynamic protocol extension selection.

* nessus/prefs_dialog/prefs_dialog_prefs.c (prefs_dialog_prefs): Removed
NTP entry in selection box.

* nessus/nessus.c (connect_to_nessusd): Removed dynamic creation of
protocol string; the protocol string is now static.

* nessus/nessus.h: Changed PROTO_NAME to OTP protocol string, removed
obsolete PROTO_NAME_OTP define.


Modified: trunk/openvas-client/ChangeLog
===================================================================
--- trunk/openvas-client/ChangeLog	2008-09-17 09:47:39 UTC (rev 1358)
+++ trunk/openvas-client/ChangeLog	2008-09-17 09:57:47 UTC (rev 1359)
@@ -1,5 +1,19 @@
 2008-09-17  Michael Wiegand <michael.wiegand at intevation.de>
 
+	Changed communication protocol to use OTP exclusively now. Removed the
+	last instances of dynamic protocol extension selection.
+
+	* nessus/prefs_dialog/prefs_dialog_prefs.c (prefs_dialog_prefs): Removed
+	NTP entry in selection box.
+
+	* nessus/nessus.c (connect_to_nessusd): Removed dynamic creation of
+	protocol string; the protocol string is now static.
+
+	* nessus/nessus.h: Changed PROTO_NAME to OTP protocol string, removed
+	obsolete PROTO_NAME_OTP define.
+
+2008-09-17  Michael Wiegand <michael.wiegand at intevation.de>
+
 	* nessus/attack.c (restore_attack, attack_host): Allocate a buffer
 	large enough to hold all OIDs. This fixes a segfault in the client.
 

Modified: trunk/openvas-client/nessus/nessus.c
===================================================================
--- trunk/openvas-client/nessus/nessus.c	2008-09-17 09:47:39 UTC (rev 1358)
+++ trunk/openvas-client/nessus/nessus.c	2008-09-17 09:57:47 UTC (rev 1359)
@@ -340,14 +340,7 @@
   int soc, soc2;
   int opt;
   const char *passwd;
-  /* Initialize the array with a string that will be big enough */
-  char proto[] = PROTO_NAME "md5_caching";
 
-  if (snprintf(proto, sizeof(proto),
-      prefs_get_int(context, "protocol_version") ? PROTO_NAME_OTP : PROTO_NAME,
-      prefs_get_int(Global, "cache_plugin_information") ? "md5_caching":"")
-      >= sizeof(proto))
-    return "programming error: proto_name buffer too small";
 
   if(prefs_get_int(Global, "nessusd_autoconnect"))
     passwd = estrdup(context->passwd);
@@ -592,7 +585,7 @@
   
   context->socket = soc;
 
-  if(comm_init(context->socket, proto) || (auth_login(context->socket, login, passwd)))
+  if(comm_init(context->socket, PROTO_NAME) || (auth_login(context->socket, login, passwd)))
     {
       close_stream_connection(context->socket);
       efree(&pem_pass);

Modified: trunk/openvas-client/nessus/nessus.h
===================================================================
--- trunk/openvas-client/nessus/nessus.h	2008-09-17 09:47:39 UTC (rev 1358)
+++ trunk/openvas-client/nessus/nessus.h	2008-09-17 09:57:47 UTC (rev 1359)
@@ -38,8 +38,7 @@
 #endif
 
 #define DEFAULT_SERVER "localhost"
-#define PROTO_NAME "< NTP/1.2 >< plugins_cve_id plugins_version plugins_bugtraq_id plugins_xrefs timestamps dependencies %s >\n"
-#define PROTO_NAME_OTP "< OTP/1.0 >< %s >\n"
+#define PROTO_NAME "< OTP/1.0 >\n"
 # define SSL_VER_DEF_NAME	"TLSv1"
 # define SSL_VER_DEF_METH	TLSv1_client_method
 

Modified: trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_prefs.c
===================================================================
--- trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_prefs.c	2008-09-17 09:47:39 UTC (rev 1358)
+++ trunk/openvas-client/nessus/prefs_dialog/prefs_dialog_prefs.c	2008-09-17 09:57:47 UTC (rev 1359)
@@ -141,8 +141,6 @@
   gtk_widget_show(protocol_combobox);
   gtk_table_attach_defaults(GTK_TABLE(table), protocol_combobox, 1, 2, 1, 2);
   gtk_combo_box_append_text(GTK_COMBO_BOX(protocol_combobox),
-			    _("NTP 1.2"));
-  gtk_combo_box_append_text(GTK_COMBO_BOX(protocol_combobox),
 			    _("OTP 1.0"));
   gtk_combo_box_set_active(GTK_COMBO_BOX(protocol_combobox), prefs_get_int(Global, "protocol_version"));