[prev in list] [next in list] [prev in thread] [next in thread]
List: openvas-cvs
Subject: [Openvas-commits] r22003 - in trunk/openvas-libraries: . misc nasl
From: scm-commit () wald ! intevation ! org
Date: 2015-03-31 15:06:43
Message-ID: 20150331150644.5013A9A123E5 () wald ! intevation ! org
[Download RAW message or body]
Author: kroosec
Date: 2015-03-31 17:06:43 +0200 (Tue, 31 Mar 2015)
New Revision: 22003
Modified:
trunk/openvas-libraries/ChangeLog
trunk/openvas-libraries/misc/arglists.c
trunk/openvas-libraries/misc/arglists.h
trunk/openvas-libraries/misc/plugutils.c
trunk/openvas-libraries/misc/prefs.c
trunk/openvas-libraries/nasl/exec.c
trunk/openvas-libraries/nasl/nasl.c
trunk/openvas-libraries/nasl/nasl_builtin_find_service.c
trunk/openvas-libraries/nasl/nasl_misc_funcs.c
trunk/openvas-libraries/nasl/nasl_socket.c
Log:
* misc/arglists.c (arg_add_value, arg_set_value): Remove length function
parameter.
* misc/arglists.h: Adjust function prototypes.
(struct arglist): Remove unused length element.
* misc/plugutils.c (plug_set_launch, plug_get_key), misc/prefs.c
(prefs_set), nasl/exec.c (exec_nasl_script), nasl/nasl.c
(init_hostinfos, init, parse_script_infos),
nasl/nasl_builtin_find_service.c (plugin_run_find_service),
nasl/nasl_misc_funcs.c (nasl_start_denial), nasl/nasl_socket.c
(add_udp_data): Adjust arg_add_value() and arg_set_value() calls.
Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog 2015-03-31 12:13:29 UTC (rev 22002)
+++ trunk/openvas-libraries/ChangeLog 2015-03-31 15:06:43 UTC (rev 22003)
@@ -1,5 +1,20 @@
2015-03-31 Hani Benhabiles <hani.benhabiles@greenbone.net>
+ * misc/arglists.c (arg_add_value, arg_set_value): Remove length function
+ parameter.
+
+ * misc/arglists.h: Adjust function prototypes.
+ (struct arglist): Remove unused length element.
+
+ * misc/plugutils.c (plug_set_launch, plug_get_key), misc/prefs.c
+ (prefs_set), nasl/exec.c (exec_nasl_script), nasl/nasl.c
+ (init_hostinfos, init, parse_script_infos),
+ nasl/nasl_builtin_find_service.c (plugin_run_find_service),
+ nasl/nasl_misc_funcs.c (nasl_start_denial), nasl/nasl_socket.c
+ (add_udp_data): Adjust arg_add_value() and arg_set_value() calls.
+
+2015-03-31 Hani Benhabiles <hani.benhabiles@greenbone.net>
+
* nasl/nasl_ssh.c (do_nasl_ssh_disconnect): Check channel is not null
before calling ssh_channel_close(). Fixes segfault on libssh 0.5.
Modified: trunk/openvas-libraries/misc/arglists.c
===================================================================
--- trunk/openvas-libraries/misc/arglists.c 2015-03-31 12:13:29 UTC (rev 22002)
+++ trunk/openvas-libraries/misc/arglists.c 2015-03-31 15:06:43 UTC (rev 22003)
@@ -167,11 +167,10 @@
}
void
-arg_add_value (arglst, name, type, length, value)
+arg_add_value (arglst, name, type, value)
struct arglist *arglst;
const char *name;
int type;
- long length;
void *value;
{
if (!arglst)
@@ -181,7 +180,6 @@
arglst->name = cache_inc (name);
arglst->value = value;
- arglst->length = length;
arglst->type = type;
arglst->next = g_malloc0 (sizeof (struct arglist));
arglst->hash = mkhash (arglst->name);
@@ -207,10 +205,9 @@
int
-arg_set_value (arglst, name, length, value)
+arg_set_value (arglst, name, value)
struct arglist *arglst;
const char *name;
- long length;
void *value;
{
@@ -222,7 +219,6 @@
if (arglst != NULL)
{
arglst->value = value;
- arglst->length = length;
return 0;
}
else
Modified: trunk/openvas-libraries/misc/arglists.h
===================================================================
--- trunk/openvas-libraries/misc/arglists.h 2015-03-31 12:13:29 UTC (rev 22002)
+++ trunk/openvas-libraries/misc/arglists.h 2015-03-31 15:06:43 UTC (rev 22003)
@@ -31,7 +31,6 @@
char *name;
void *value;
struct arglist *next;
- long length;
int type;
int hash;
};
@@ -41,8 +40,8 @@
#define ARG_INT 3
#define ARG_ARGLIST 4
-void arg_add_value (struct arglist *, const char *, int, long, void *);
-int arg_set_value (struct arglist *, const char *, long, void *);
+void arg_add_value (struct arglist *, const char *, int, void *);
+int arg_set_value (struct arglist *, const char *, void *);
void *arg_get_value (struct arglist *, const char *);
int arg_get_value_int (struct arglist *, const char *);
int arg_get_type (struct arglist *, const char *);
Modified: trunk/openvas-libraries/misc/plugutils.c
===================================================================
--- trunk/openvas-libraries/misc/plugutils.c 2015-03-31 12:13:29 UTC (rev 22002)
+++ trunk/openvas-libraries/misc/plugutils.c 2015-03-31 15:06:43 UTC (rev 22003)
@@ -105,12 +105,8 @@
void
plug_set_launch (struct arglist *desc, int launch)
{
- if (arg_set_value
- (desc, "ENABLED", sizeof (gpointer), GSIZE_TO_POINTER (launch)))
- {
- arg_add_value (desc, "ENABLED", ARG_INT, sizeof (gpointer),
- GSIZE_TO_POINTER (launch));
- }
+ if (arg_set_value (desc, "ENABLED", GSIZE_TO_POINTER (launch)))
+ arg_add_value (desc, "ENABLED", ARG_INT, GSIZE_TO_POINTER (launch));
}
@@ -889,10 +885,8 @@
close (old);
soc = dup2 (sockpair[1], 4);
close (sockpair[1]);
- arg_set_value (globals, "global_socket", sizeof (gpointer),
- GSIZE_TO_POINTER (soc));
- arg_set_value (args, "SOCKET", sizeof (gpointer),
- GSIZE_TO_POINTER (soc));
+ arg_set_value (globals, "global_socket", GSIZE_TO_POINTER (soc));
+ arg_set_value (args, "SOCKET", GSIZE_TO_POINTER (soc));
srand48 (getpid () + getppid () + time (NULL)); /* RATS: ignore */
Modified: trunk/openvas-libraries/misc/prefs.c
===================================================================
--- trunk/openvas-libraries/misc/prefs.c 2015-03-31 12:13:29 UTC (rev 22002)
+++ trunk/openvas-libraries/misc/prefs.c 2015-03-31 15:06:43 UTC (rev 22003)
@@ -113,11 +113,11 @@
{
gchar *old = arg_get_value (global_prefs, key);
g_free (old);
- arg_set_value (global_prefs, key, strlen (value), g_strdup (value));
+ arg_set_value (global_prefs, key, g_strdup (value));
return;
}
- arg_add_value (global_prefs, key, ARG_STRING, strlen (value), g_strdup (value));
+ arg_add_value (global_prefs, key, ARG_STRING, g_strdup (value));
}
/**
Modified: trunk/openvas-libraries/nasl/exec.c
===================================================================
--- trunk/openvas-libraries/nasl/exec.c 2015-03-31 12:13:29 UTC (rev 22002)
+++ trunk/openvas-libraries/nasl/exec.c 2015-03-31 15:06:43 UTC (rev 22003)
@@ -1697,13 +1697,11 @@
nasl_trace_fp = stderr;
#endif
if ((old = arg_get_value (script_infos, "script_name")) == NULL)
- arg_add_value (script_infos, "script_name", ARG_STRING, strlen (name),
- g_strdup (name));
+ arg_add_value (script_infos, "script_name", ARG_STRING, g_strdup (name));
else
{
g_free (old);
- arg_set_value (script_infos, "script_name", strlen (name),
- g_strdup (name));
+ arg_set_value (script_infos, "script_name", g_strdup (name));
}
newdir = g_path_get_dirname (name);
Modified: trunk/openvas-libraries/nasl/nasl.c
===================================================================
--- trunk/openvas-libraries/nasl/nasl.c 2015-03-31 12:13:29 UTC (rev 22002)
+++ trunk/openvas-libraries/nasl/nasl.c 2015-03-31 15:06:43 UTC (rev 22003)
@@ -58,9 +58,9 @@
struct arglist *hostinfos;
hostinfos = g_malloc0 (sizeof (struct arglist));
- arg_add_value (hostinfos, "FQDN", ARG_STRING, strlen (hostname), hostname);
- arg_add_value (hostinfos, "NAME", ARG_STRING, strlen (hostname), hostname);
- arg_add_value (hostinfos, "IP", ARG_PTR, sizeof (struct in6_addr), ip);
+ arg_add_value (hostinfos, "FQDN", ARG_STRING, hostname);
+ arg_add_value (hostinfos, "NAME", ARG_STRING, hostname);
+ arg_add_value (hostinfos, "IP", ARG_PTR, ip);
return (hostinfos);
}
@@ -86,14 +86,14 @@
memcpy (pip, &ip, sizeof (struct in6_addr));
- arg_add_value (script_infos, "standalone", ARG_INT, sizeof (int), (void *) 1);
+ arg_add_value (script_infos, "standalone", ARG_INT, (void *) 1);
prefs_set ("checks_read_timeout", "5");
- arg_add_value (script_infos, "key", ARG_PTR, -1, kb);
+ arg_add_value (script_infos, "key", ARG_PTR, kb);
if (safe_checks_only != 0)
prefs_set ("safe_checks", "yes");
- arg_add_value (script_infos, "HOSTNAME", ARG_ARGLIST, -1,
+ arg_add_value (script_infos, "HOSTNAME", ARG_ARGLIST,
init_hostinfos (hostname, pip));
return script_infos;
@@ -109,7 +109,7 @@
int mode = NASL_EXEC_DESCR | NASL_ALWAYS_SIGNED;
nvti = nvti_new ();
- arg_add_value (script_infos, "NVTI", ARG_PTR, -1, nvti);
+ arg_add_value (script_infos, "NVTI", ARG_PTR, nvti);
if (exec_nasl_script (script_infos, file, NULL, mode) < 0)
{
@@ -122,7 +122,7 @@
oid = g_strdup (nvti_oid (nvti));
nvti_free (nvti);
if (oid)
- arg_add_value (script_infos, "OID", ARG_STRING, strlen (oid), oid);
+ arg_add_value (script_infos, "OID", ARG_STRING, oid);
return 0;
}
Modified: trunk/openvas-libraries/nasl/nasl_builtin_find_service.c
===================================================================
--- trunk/openvas-libraries/nasl/nasl_builtin_find_service.c 2015-03-31 12:13:29 UTC (rev 22002)
+++ trunk/openvas-libraries/nasl/nasl_builtin_find_service.c 2015-03-31 15:06:43 UTC (rev 22003)
@@ -2625,7 +2625,7 @@
if (sons_args[i] == NULL)
sons_args[i] = g_malloc0 (sizeof (struct arglist));
arg_add_value (sons_args[i], kbitem_tmp->name, kbitem_tmp->type,
- -1, NULL);
+ NULL);
j++;
kbitem_tmp = kbitem_tmp->next;
}
@@ -2639,8 +2639,7 @@
{
if (sons_args[i] == NULL)
sons_args[i] = g_malloc0 (sizeof (struct arglist));
- arg_add_value (sons_args[i], kbitem_tmp->name, kbitem_tmp->type, -1,
- NULL);
+ arg_add_value (sons_args[i], kbitem_tmp->name, kbitem_tmp->type, NULL);
i++;
kbitem_tmp = kbitem_tmp->next;
}
@@ -2677,10 +2676,8 @@
close (soc);
soc = dup2 (sons_pipe[i][0], 4);
close (sons_pipe[i][0]);
- arg_set_value (globals, "global_socket", sizeof (gpointer),
- GSIZE_TO_POINTER (soc));
- arg_set_value (desc, "SOCKET", sizeof (gpointer),
- GSIZE_TO_POINTER (soc));
+ arg_set_value (globals, "global_socket", GSIZE_TO_POINTER (soc));
+ arg_set_value (desc, "SOCKET", GSIZE_TO_POINTER (soc));
signal (SIGTERM, _exit);
plugin_do_run (desc, sons_args[i], test_ssl);
exit (0);
Modified: trunk/openvas-libraries/nasl/nasl_misc_funcs.c
===================================================================
--- trunk/openvas-libraries/nasl/nasl_misc_funcs.c 2015-03-31 12:13:29 UTC (rev 22002)
+++ trunk/openvas-libraries/nasl/nasl_misc_funcs.c 2015-03-31 15:06:43 UTC (rev 22003)
@@ -223,11 +223,11 @@
if (soc >= 0)
{
if (arg_get_value (script_infos, "denial_port") != 0)
- arg_set_value (script_infos, "denial_port", sizeof (gpointer),
+ arg_set_value (script_infos, "denial_port",
GSIZE_TO_POINTER (port));
else
arg_add_value (script_infos, "denial_port", ARG_INT,
- sizeof (gpointer), GSIZE_TO_POINTER (port));
+ GSIZE_TO_POINTER (port));
close_stream_connection (soc);
@@ -240,10 +240,10 @@
alive = p->x.i_val;
if (arg_get_value (script_infos, "tcp_ping_result") != 0)
- arg_set_value (script_infos, "tcp_ping_result", sizeof (gpointer),
+ arg_set_value (script_infos, "tcp_ping_result",
GSIZE_TO_POINTER (alive));
else
- arg_add_value (script_infos, "tcp_ping_result", ARG_INT, sizeof (gpointer),
+ arg_add_value (script_infos, "tcp_ping_result", ARG_INT,
GSIZE_TO_POINTER (alive));
deref_cell (p);
Modified: trunk/openvas-libraries/nasl/nasl_socket.c
===================================================================
--- trunk/openvas-libraries/nasl/nasl_socket.c 2015-03-31 12:13:29 UTC (rev 22002)
+++ trunk/openvas-libraries/nasl/nasl_socket.c 2015-03-31 15:06:43 UTC (rev 22003)
@@ -132,7 +132,7 @@
if (udp_data == NULL)
{
udp_data = g_hash_table_new_full (g_int_hash, g_int_equal, g_free, g_free);
- arg_add_value (script_infos, "udp_data", ARG_PTR, -1, udp_data);
+ arg_add_value (script_infos, "udp_data", ARG_PTR, udp_data);
}
g_hash_table_replace (udp_data, (gpointer)key, (gpointer)data_record);
_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic