[Openvas-commits] r13265 - in trunk/gsd: . src

[scm-commit at wald.intevation.org]

Author: aheinecke
Date: 2012-04-17 18:15:38 +0200 (Tue, 17 Apr 2012)
New Revision: 13265

Modified:
   trunk/gsd/ChangeLog
   trunk/gsd/src/omp_string_builder.cpp
Log:
Add the possibility to generate a get_port_lists command and
add the handling of a port_list parameter for create_target


Modified: trunk/gsd/ChangeLog
===================================================================
--- trunk/gsd/ChangeLog	2012-04-17 16:08:06 UTC (rev 13264)
+++ trunk/gsd/ChangeLog	2012-04-17 16:15:38 UTC (rev 13265)
@@ -2,6 +2,11 @@
 
 	Start implementing support for port lists
 
+	* src/omp_string_builder.cpp (omp_string_builder::requestString):
+	Add support for get_port_lists command
+	(omp_string_builder::appendCreateParameter):
+	Add port_list parameter for target creation
+
 	* src/omp_command.cpp (omp_command::command):
 	Select the correct type for port_list
 

Modified: trunk/gsd/src/omp_string_builder.cpp
===================================================================
--- trunk/gsd/src/omp_string_builder.cpp	2012-04-17 16:08:06 UTC (rev 13264)
+++ trunk/gsd/src/omp_string_builder.cpp	2012-04-17 16:15:38 UTC (rev 13265)
@@ -99,6 +99,8 @@
                                    break;
       case omp_utilities::REPORT_FORMAT: command.append ("report_formats");
                                          break;
+      case omp_utilities::PORT_LIST: command.append ("port_lists ");
+                                         break;
       default: return QString ();
     }
 
@@ -161,6 +163,8 @@
                                 break;
       case omp_utilities::SLAVE: typeStr = "slave ";
                                  break;
+      case omp_utilities::PORT_LIST: typeStr = "port_list";
+                                 break;
       default: return QString ("");
     }
   command.append (typeStr + ">");
@@ -440,6 +444,7 @@
           QString comment ("");
           QString lsc_sshcredential ("");
           QString lsc_smbcredential ("");
+          QString portListparam("");
           if (parameter.contains ("comment"))
             comment = QString ("<comment>%1"
                                "</comment>").arg (parameter["comment"]);
@@ -454,15 +459,20 @@
             lsc_smbcredential = QString ("<smb_lsc_credential id=\"%1\">"
                                           "</smb_lsc_credential>")
                                           .arg (parameter ["smb_lsc_credential"]);
+          if (parameter.contains ("port_list"))
+            portListparam = QString ("<port_list id=\"%1\">"
+                                     "</port_list>")
+                                     .arg (parameter ["port_list"]);
 
           com =  QString ("<name>%1</name>"
                           "%2"
                           "<hosts>%3</hosts>"
-                          "%4%5").arg (parameter["name"])
-                               .arg (comment)
-                               .arg (parameter["hosts"])
-                               .arg (lsc_sshcredential)
-                               .arg (lsc_smbcredential);
+                          "%4%5%6").arg (parameter["name"])
+                                   .arg (comment)
+                                   .arg (parameter["hosts"])
+                                   .arg (lsc_sshcredential)
+                                   .arg (lsc_smbcredential)
+                                   .arg (portListparam);
           return com;
         }
     }