diff --git a/plugins/netutils.h b/plugins/netutils.h
index 22542a77ac16cf15c2f032d3d3108d946c6d1786..1168f9f82eb688579da061cb891a434739f0fdac 100644 (file)
--- a/plugins/netutils.h
+++ b/plugins/netutils.h
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
+* $Id$
+*
******************************************************************************/
+#ifndef _NETUTILS_H_
+#define _NETUTILS_H_
+
#include "config.h"
#include "common.h"
+#include "utils.h"
#include <netinet/in.h>
#include <arpa/inet.h>
-RETSIGTYPE socket_timeout_alarm_handler (int);
+#ifdef HAVE_SYS_UN_H
+# include <sys/un.h>
+# ifndef UNIX_PATH_MAX
+ /* linux uses this, on sun it's hard-coded at 108 without a define */
+# define UNIX_PATH_MAX 108
+# endif /* UNIX_PATH_MAX */
+#endif /* HAVE_SYS_UN_H */
+
+RETSIGTYPE socket_timeout_alarm_handler (int) __attribute__((noreturn));
+
+/* process_request and wrapper macros */
+#define process_tcp_request(addr, port, sbuf, rbuf, rsize) \
+ process_request(addr, port, IPPROTO_TCP, sbuf, rbuf, rsize)
+#define process_udp_request(addr, port, sbuf, rbuf, rsize) \
+ process_request(addr, port, IPPROTO_UDP, sbuf, rbuf, rsize)
+int process_tcp_request2 (const char *address, int port,
+ const char *sbuffer, char *rbuffer, int rsize);
+int process_request (const char *address, int port, int proto,
+ const char *sbuffer, char *rbuffer, int rsize);
-int process_tcp_request2 (char *address, int port, char *sbuffer,
- char *rbuffer, int rsize);
-int process_tcp_request (char *address, int port, char *sbuffer,
- char *rbuffer, int rsize);
-int process_udp_request (char *address, int port, char *sbuffer,
- char *rbuffer, int rsize);
-int process_request (char *address, int port, int proto, char *sbuffer,
- char *rbuffer, int rsize);
+/* my_connect and wrapper macros */
+#define my_tcp_connect(addr, port, s) np_net_connect(addr, port, s, IPPROTO_TCP)
+#define my_udp_connect(addr, port, s) np_net_connect(addr, port, s, IPPROTO_UDP)
+int np_net_connect(const char *address, int port, int *sd, int proto);
-int my_tcp_connect (char *address, int port, int *sd);
-int my_udp_connect (char *address, int port, int *sd);
-int my_connect (char *address, int port, int *sd, int proto);
+/* send_request and wrapper macros */
+#define send_tcp_request(s, sbuf, rbuf, rsize) \
+ send_request(s, IPPROTO_TCP, sbuf, rbuf, rsize)
+#define send_udp_request(s, sbuf, rbuf, rsize) \
+ send_request(s, IPPROTO_UDP, sbuf, rbuf, rsize)
+int send_request (int sd, int proto, const char *send_buffer, char *recv_buffer, int recv_size);
-int is_host (char *);
-int is_addr (char *);
-int resolve_host_or_addr (char *, int);
-int is_inet_addr (char *);
+
+/* "is_*" wrapper macros and functions */
+int is_host (const char *);
+int is_addr (const char *);
+int resolve_host_or_addr (const char *, int);
+void host_or_die(const char *str);
+#define is_inet_addr(addr) resolve_host_or_addr(addr, AF_INET)
#ifdef USE_IPV6
-int is_inet6_addr (char *);
+# define is_inet6_addr(addr) resolve_host_or_addr(addr, AF_INET6)
+# define is_hostname(addr) resolve_host_or_addr(addr, address_family)
+#else
+# define is_hostname(addr) resolve_host_or_addr(addr, AF_INET)
#endif
-int is_hostname (char *);
-extern int socket_timeout;
+extern unsigned int socket_timeout;
extern int econn_refuse_state;
extern int was_refused;
+extern int address_family;
+
+/* SSL-Related functionality */
+#ifdef HAVE_SSL
+/* maybe this could be merged with the above np_net_connect, via some flags */
+int np_net_ssl_init(int sd);
+void np_net_ssl_cleanup();
+int np_net_ssl_write(const void *buf, int num);
+int np_net_ssl_read(void *buf, int num);
+int np_net_ssl_check_cert(int days_till_exp);
+#endif /* HAVE_SSL */
+
+#endif /* _NETUTILS_H_ */