[Openvas-commits] r3115 - in trunk/openvas-client: . src

[scm-commit@wald.intevation.org]

Author: jan
Date: 2009-04-16 19:42:11 +0200 (Thu, 16 Apr 2009)
New Revision: 3115

Modified:
   trunk/openvas-client/ChangeLog
   trunk/openvas-client/src/omp-cli.c
Log:
* src/omp-cli.c (main): Renamed openvas_server_ methods
according to changes in openvas-libraries.
Adjusted copyright.



Modified: trunk/openvas-client/ChangeLog
===================================================================
--- trunk/openvas-client/ChangeLog	2009-04-16 17:20:22 UTC (rev 3114)
+++ trunk/openvas-client/ChangeLog	2009-04-16 17:42:11 UTC (rev 3115)
@@ -1,5 +1,11 @@
 2009-04-16  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
 
+	* src/omp-cli.c (main): Renamed openvas_server_ methods
+	according to changes in openvas-libraries.
+	Adjusted copyright.
+
+2009-04-16  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
+
 	* libnessus/network.c: Removed any code path for NESSUS_CNX_LOCK.
 	This is not used and not relevant for client anyway.
 

Modified: trunk/openvas-client/src/omp-cli.c
===================================================================
--- trunk/openvas-client/src/omp-cli.c	2009-04-16 17:20:22 UTC (rev 3114)
+++ trunk/openvas-client/src/omp-cli.c	2009-04-16 17:42:11 UTC (rev 3115)
@@ -114,7 +114,7 @@
     {
       printf ("OMP Command Line Interface (%s) %s for %s\n",
               OMPCLI_PROGNAME, OMPCLI_VERSION, NESS_OS_NAME);
-      printf ("Copyright (C) 2009 Intevation GmbH\n\n");
+      printf ("Copyright (C) 2009 Greenbone Networks GmbH\n\n");
       exit (EXIT_SUCCESS);
     }
 
@@ -151,7 +151,7 @@
               manager_port);
     }
 
-  socket = openvas_server_connect_to_server (&session, manager_host_string, manager_port);
+  socket = openvas_server_open (&session, manager_host_string, manager_port);
   if (socket == -1)
     {
       fprintf (stderr, "Failed to acquire socket.\n");
@@ -160,16 +160,16 @@
 
   if (authenticate (&session, omp_username, omp_password))
     {
-      openvas_server_close_server_connection (socket, session);
+      openvas_server_close (socket, session);
       fprintf (stderr, "Failed to authenticate.\n");
       exit (EXIT_FAILURE);
     }
 
   fprintf (stderr, "Sending to manager: %s", omp_command);
 
-  if (openvas_server_send_to_server (&session, omp_command) == -1)
+  if (openvas_server_send (&session, omp_command) == -1)
     {
-      openvas_server_close_server_connection (socket, session);
+      openvas_server_close (socket, session);
       fprintf (stderr, "Failed to send_to_manager.\n");
       exit (EXIT_FAILURE);
     }
@@ -180,7 +180,7 @@
   if (read_entity (&session, &entity))
     {
       fprintf (stderr, "Failed to read response.\n");
-      openvas_server_close_server_connection (socket, session);
+      openvas_server_close (socket, session);
       exit (EXIT_FAILURE);
     }
 
@@ -190,7 +190,7 @@
 
   /* Cleanup. */
 
-  openvas_server_close_server_connection (socket, session);
+  openvas_server_close (socket, session);
   free_entity (entity);
 
   exit (EXIT_SUCCESS);