[Openvas-commits] r3103 - in trunk/openvas-libraries: . libopenvas
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Apr 15 10:17:30 CEST 2009
Author: mwiegand
Date: 2009-04-15 10:17:28 +0200 (Wed, 15 Apr 2009)
New Revision: 3103
Modified:
trunk/openvas-libraries/ChangeLog
trunk/openvas-libraries/libopenvas/openvas_server.c
trunk/openvas-libraries/libopenvas/openvas_server.h
Log:
* libopenvas/openvas_server.c: Made function names more intuitive,
removed superfluous newlines from log messages, added a little
documentation.
* libopenvas/openvas_server.h: Made function names more intuitive,
removed superfluous include.
Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog 2009-04-14 16:11:04 UTC (rev 3102)
+++ trunk/openvas-libraries/ChangeLog 2009-04-15 08:17:28 UTC (rev 3103)
@@ -1,3 +1,12 @@
+2009-04-15 Michael Wiegand <michael.wiegand at intevation.de>
+
+ * libopenvas/openvas_server.c: Made function names more intuitive,
+ removed superfluous newlines from log messages, added a little
+ documentation.
+
+ * libopenvas/openvas_server.h: Made function names more intuitive,
+ removed superfluous include.
+
2009-04-14 Michael Wiegand <michael.wiegand at intevation.de>
Added a new library for GnuTLS based communication, based on work done
Modified: trunk/openvas-libraries/libopenvas/openvas_server.c
===================================================================
--- trunk/openvas-libraries/libopenvas/openvas_server.c 2009-04-14 16:11:04 UTC (rev 3102)
+++ trunk/openvas-libraries/libopenvas/openvas_server.c 2009-04-15 08:17:28 UTC (rev 3103)
@@ -26,7 +26,8 @@
* @file openvas_server.c
* @brief GnuTLS based functions for communication with an OpenVAS server.
*
- * \todo TODO: More documentation
+ * This library supplies low-level communication functions for communication
+ * with an OpenVAS server over GnuTLS.
*/
#include <glib.h>
@@ -52,8 +53,8 @@
* @return 0 on success, -1 on error.
*/
int
-openvas_connect_to_server (gnutls_session_t * session,
- char *host, int port)
+openvas_server_connect_to_server (gnutls_session_t * session,
+ char *host, int port)
{
// TODO: Ensure that host and port have sane values.
// TODO: Improve logging.
@@ -63,7 +64,7 @@
int ret = gnutls_global_init();
if (ret < 0)
{
- g_message ("Failed to initialize GNUTLS.\n");
+ g_message ("Failed to initialize GNUTLS.");
return -1;
}
@@ -75,12 +76,12 @@
if (!inet_aton(host, &address.sin_addr))
{
- g_message ("Failed to create server address %s.\n",
+ g_message ("Failed to create server address %s.",
host);
return -1;
}
- g_message ("Set to connect to address %s port %i\n",
+ g_message ("Set to connect to address %s port %i",
host,
ntohs (address.sin_port));
@@ -98,19 +99,19 @@
gnutls_certificate_credentials_t credentials;
if (gnutls_certificate_allocate_credentials (&credentials))
{
- g_message ("Failed to allocate server credentials.\n");
+ g_message ("Failed to allocate server credentials.");
goto close_fail;
}
if (gnutls_init (session, GNUTLS_CLIENT))
{
- g_message ("Failed to initialise server session.\n");
+ g_message ("Failed to initialise server session.");
goto server_free_fail;
}
if (gnutls_set_default_priority (*session))
{
- g_message ("Failed to set server session priority.\n");
+ g_message ("Failed to set server session priority.");
goto server_fail;
}
@@ -120,7 +121,7 @@
0 };
if (gnutls_kx_set_priority (*session, kx_priority))
{
- g_message ("Failed to set server key exchange priority.\n");
+ g_message ("Failed to set server key exchange priority.");
goto server_fail;
}
@@ -128,7 +129,7 @@
GNUTLS_CRD_CERTIFICATE,
credentials))
{
- g_message ("Failed to set server credentials.\n");
+ g_message ("Failed to set server credentials.");
goto server_fail;
}
@@ -143,7 +144,7 @@
return -1;
}
- g_message ("connected to server\n");
+ g_message ("connected to server");
/* Complete setup of server session. */
@@ -157,13 +158,13 @@
break;
if (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED)
continue;
- g_message ("Failed to shake hands with server.\n");
+ g_message ("Failed to shake hands with server.");
gnutls_perror (ret);
if (shutdown (server_socket, SHUT_RDWR) == -1)
g_message ("Failed to shutdown server socket");
goto server_fail;
}
- g_message ("Shook hands with server.\n");
+ g_message ("Shook hands with server.");
return server_socket;
@@ -188,7 +189,7 @@
* @return 0 on success, -1 on error.
*/
int
-openvas_close_server_connection (int socket, gnutls_session_t session)
+openvas_server_close_server_connection (int socket, gnutls_session_t session)
{
/* Turn off blocking. */
if (fcntl (socket, F_SETFL, O_NONBLOCK) == -1) return -1;
@@ -207,13 +208,13 @@
* @return 0 on success, -1 on error.
*/
int
-openvas_send_to_server (gnutls_session_t* session, const char* string)
+openvas_server_send_to_server (gnutls_session_t* session, const char* string)
{
size_t left = strlen (string);
while (left)
{
ssize_t count;
- g_message ("send %i from %.*s[...]\n", left, left < 30 ? left : 30, string);
+ g_message ("send %i from %.*s[...]", left, left < 30 ? left : 30, string);
count = gnutls_record_send (*session, string, left);
if (count < 0)
{
@@ -223,18 +224,18 @@
if (count == GNUTLS_E_REHANDSHAKE)
{
/* \todo Rehandshake. */
- g_message ("send_to_server rehandshake\n");
+ g_message ("send_to_server rehandshake");
continue;
}
- g_message ("Failed to write to server.\n");
+ g_message ("Failed to write to server.");
gnutls_perror (count);
return -1;
}
- g_message ("=> %.*s\n", count, string);
+ g_message ("=> %.*s", count, string);
string += count;
left -= count;
}
- g_message ("=> done\n");
+ g_message ("=> done");
return 0;
}
@@ -248,12 +249,12 @@
* @return 0 on success, -1 on error.
*/
int
-openvas_sendf_to_server (gnutls_session_t* session, const char* format, ...)
+openvas_server_sendf_to_server (gnutls_session_t* session, const char* format, ...)
{
va_list args;
va_start (args, format);
gchar* msg = g_strdup_vprintf (format, args);
- int ret = openvas_send_to_server (session, msg);
+ int ret = openvas_server_send_to_server (session, msg);
g_free (msg);
va_end (args);
return ret;
Modified: trunk/openvas-libraries/libopenvas/openvas_server.h
===================================================================
--- trunk/openvas-libraries/libopenvas/openvas_server.h 2009-04-14 16:11:04 UTC (rev 3102)
+++ trunk/openvas-libraries/libopenvas/openvas_server.h 2009-04-15 08:17:28 UTC (rev 3103)
@@ -27,20 +27,20 @@
* @brief GnuTLS based functions for communication with an OpenVAS server -
* header file.
*
- * \todo TODO: More documentation
+ * This library supplies low-level communication functions for communication
+ * with an OpenVAS server over GnuTLS.
*/
-#include <glib.h>
#include <gnutls/gnutls.h>
int
-openvas_connect_to_server (gnutls_session_t *, char*, int);
+openvas_server_connect_to_server (gnutls_session_t *, char*, int);
int
-openvas_close_server_connection (int, gnutls_session_t);
+openvas_server_close_server_connection (int, gnutls_session_t);
int
-openvas_send_to_server (gnutls_session_t*, const char*);
+openvas_server_send_to_server (gnutls_session_t*, const char*);
int
-openvas_sendf_to_server (gnutls_session_t*, const char*, ...);
+openvas_server_sendf_to_server (gnutls_session_t*, const char*, ...);
More information about the Openvas-commits
mailing list