[Openvas-commits] r1267 - in trunk/openvas-server: . doc openvasd

[scm-commit@wald.intevation.org]

Author: jan
Date: 2008-09-01 16:43:53 +0200 (Mon, 01 Sep 2008)
New Revision: 1267

Modified:
   trunk/openvas-server/ChangeLog
   trunk/openvas-server/doc/otp_specification_10.txt
   trunk/openvas-server/openvasd/comm.c
   trunk/openvas-server/openvasd/openvasd.c
Log:
Making protocol extension "dependencies" standard.

* openvasd/comm.c (extract_extensions): Removed handling
of "dependencies" extension.

* openvasd/openvasd.c (server_thread): Always send dependencies.

* doc/otp_specification_10.txt: Updated to described
that protocol extension dependencies has been made standard.



Modified: trunk/openvas-server/ChangeLog
===================================================================
--- trunk/openvas-server/ChangeLog	2008-09-01 09:14:28 UTC (rev 1266)
+++ trunk/openvas-server/ChangeLog	2008-09-01 14:43:53 UTC (rev 1267)
@@ -1,3 +1,15 @@
+2008-09-01  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
+
+	Making protocol extension "dependencies" standard.
+
+	* openvasd/comm.c (extract_extensions): Removed handling
+	of "dependencies" extension.
+
+	* openvasd/openvasd.c (server_thread): Always send dependencies.
+
+	* doc/otp_specification_10.txt: Updated to described
+	that protocol extension dependencies has been made standard.
+
 2008-08-31  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
 
 	Remove NEW_ATTACK command.

Modified: trunk/openvas-server/doc/otp_specification_10.txt
===================================================================
--- trunk/openvas-server/doc/otp_specification_10.txt	2008-09-01 09:14:28 UTC (rev 1266)
+++ trunk/openvas-server/doc/otp_specification_10.txt	2008-09-01 14:43:53 UTC (rev 1267)
@@ -70,6 +70,10 @@
   was limited to 4000 bytes. The OpenVAS-Client (and so did NessusClient)
   used only LONG_ATTACK anyway.
 
+  Protocol extensions:
+  These protocol extensions have been made standard of the OTP
+  protocol: "dependencies".
+
 GENERAL ASPECTS OF PROTOCOL
 
   The OTP protocol is text-based, human readable and line-oriented.
@@ -85,7 +89,6 @@
       the protocol version followed by parameters switching
       on various features. Available protocol features are:
 
-        dependencies       (server will use command PLUGINS_DEPENDENCIES)
         timestamps         (server will use command TIME)
         plugins_version    (server will add revision to plugin information)
         plugins_cve_id     (server will add cve id to plugin information)
@@ -292,9 +295,7 @@
 
     Description:
 
-      The PLUGINS_DEPENDENCIES messages are send after the RULES messages
-      in case the protocol feature "dependencies" was set during protocol
-      initialization.
+      The PLUGINS_DEPENDENCIES messages are send after the RULES messages.
 
     Syntax:
 

Modified: trunk/openvas-server/openvasd/comm.c
===================================================================
--- trunk/openvas-server/openvasd/comm.c	2008-09-01 09:14:28 UTC (rev 1266)
+++ trunk/openvas-server/openvasd/comm.c	2008-09-01 14:43:53 UTC (rev 1267)
@@ -113,13 +113,6 @@
    */
   else if(!strcmp(t, "dns"))
     caps->dns = 1;
-    
-  /*
-   * We show the plugins dependencies through the use
-   * of the DEPENDENCIES message
-   */
-  else if(!strcmp(t, "dependencies"))
-    caps->dependencies = 1;
 
   /* 
    * Immediately jump to the wait order

Modified: trunk/openvas-server/openvasd/openvasd.c
===================================================================
--- trunk/openvas-server/openvasd/openvasd.c	2008-09-01 09:14:28 UTC (rev 1266)
+++ trunk/openvas-server/openvasd/openvasd.c	2008-09-01 14:43:53 UTC (rev 1267)
@@ -442,8 +442,7 @@
    if(caps->ntp_11){
        comm_send_preferences(globals);
        comm_send_rules(globals);
-       if(caps->dependencies)
-       		ntp_1x_send_dependencies(globals);
+       ntp_1x_send_dependencies(globals);
        }
    }
    else if(caps->md5_caching)