Mailing List Archive

Update of /usr/local/cvs/nessus-libraries/include
In directory raccoon.nessus.org:/tmp/cvs-serv3875/nessus-libraries/include

Modified Files:
config.h.in includes.h libnessus.h
Log Message:
Synchronize back DEVEL with 2.2

Index: config.h.in
===================================================================
RCS file: /usr/local/cvs/nessus-libraries/include/config.h.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- config.h.in 19 Apr 2005 11:06:48 -0000 1.36
+++ config.h.in 12 Sep 2006 09:46:01 -0000 1.37
@@ -300,12 +300,12 @@
#undef HAVE_SYSCTL
#undef HAVE_SYS_SYSCTL_H
#undef HAVE_SYS_PARAM_H
-#undef HAVE_SYS_RESOURCE_H

#undef HAVE_LINUX_MSG_H
#undef HAVE_SYS_MSG_H
#undef HAVE_SYS_IPC_H
#undef HAVE_SYS_UIO_H
+#undef HAVE_SYS_RESOURCE_H

#undef EGD_PATH


Index: includes.h
===================================================================
RCS file: /usr/local/cvs/nessus-libraries/include/includes.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- includes.h 27 Dec 2004 17:31:18 -0000 1.14
+++ includes.h 12 Sep 2006 09:46:01 -0000 1.15
@@ -199,12 +199,13 @@
#endif


-#ifdef HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif
-
#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
+#endif
+
+
+#ifdef HAVE_SYS_UIO_H
+#include <sys/uio.h>
#endif

#ifndef MSGMAX

Index: libnessus.h
===================================================================
RCS file: /usr/local/cvs/nessus-libraries/include/libnessus.h,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- libnessus.h 8 May 2005 11:14:04 -0000 1.98
+++ libnessus.h 12 Sep 2006 09:46:01 -0000 1.99
@@ -47,9 +47,6 @@
#define ARG_STRUCT 5


-
-
-
/*
* Plugin standard function templates
*/
@@ -361,11 +358,10 @@
#define ACT_INIT 0


-#define LAUNCH_DISABLED 0
-#define LAUNCH_RUN 1
-#define LAUNCH_SILENT 2
-

+#define LAUNCH_DISABLED 0
+#define LAUNCH_RUN 1
+#define LAUNCH_SILENT 2


/*
@@ -379,10 +375,8 @@
#define NESSUS_ENCAPS_SSLv2 3
#define NESSUS_ENCAPS_SSLv3 4
#define NESSUS_ENCAPS_TLSv1 5
-#define NESSUS_ENCAPS_TLSv10 NESSUS_ENCAPS_TLSv1
-#define NESSUS_ENCAPS_TLSv11 6

-#define IS_ENCAPS_SSL(x) ((x) >= NESSUS_ENCAPS_SSLv23 && (x) <= NESSUS_ENCAPS_TLSv11)
+#define IS_ENCAPS_SSL(x) ((x) >= NESSUS_ENCAPS_SSLv23 && (x) <= NESSUS_ENCAPS_TLSv1)

/*
* Transport layer options
@@ -412,6 +406,7 @@

ExtFunc int stream_set_buffer(int, int);
ExtFunc int stream_get_buffer_sz (int);
+ExtFunc int stream_get_err(int);

#ifdef HAVE_SSL
ExtFunc X509* stream_get_server_certificate(int);
@@ -525,9 +520,6 @@
pid_t http_share_init(struct arglist *);
int http_share_close(struct arglist *, pid_t);

-ExtFunc int http_recv_headers(int , char ** , int * );
-
-

int os_send(int, void*, int, int);
int os_recv(int, void*, int, int);
@@ -566,6 +558,7 @@
int internal_finished(int);

int fd_is_stream(int);
+int stream_pending(int);

int send_fd(int, int);
int recv_fd(int);

_______________________________________________
Nessus-cvs mailing list
Nessus-cvs@list.nessus.org
http://mail.nessus.org/mailman/listinfo/nessus-cvs