[netfilter-cvslog] r4186 - in trunk/libnfnetlink_log/include: . libipulog libnfnetlink_log

[laforge at netfilter.org]

Author: laforge at netfilter.org
Date: 2005-07-30 18:44:31 +0200 (Sat, 30 Jul 2005)
New Revision: 4186

Added:
   trunk/libnfnetlink_log/include/libipulog/
   trunk/libnfnetlink_log/include/libipulog/libipulog.h
   trunk/libnfnetlink_log/include/libnfnetlink_log/
   trunk/libnfnetlink_log/include/libnfnetlink_log/libnfnetlink_log.h
Removed:
   trunk/libnfnetlink_log/include/libipulog.h
   trunk/libnfnetlink_log/include/libnfnetlink_log.h
Modified:
   trunk/libnfnetlink_log/include/Makefile.am
Log:
move files to their own directories


Modified: trunk/libnfnetlink_log/include/Makefile.am
===================================================================
--- trunk/libnfnetlink_log/include/Makefile.am	2005-07-30 16:43:39 UTC (rev 4185)
+++ trunk/libnfnetlink_log/include/Makefile.am	2005-07-30 16:44:31 UTC (rev 4186)
@@ -1,3 +1,3 @@
 
-include_HEADERS = include/libnfnetlink_log.h include/libipulog.h
+include_HEADERS = libnfnetlink_log/libnfnetlink_log.h libipulog/libipulog.h
 

Copied: trunk/libnfnetlink_log/include/libipulog/libipulog.h (from rev 4185, trunk/libnfnetlink_log/include/libipulog.h)

Deleted: trunk/libnfnetlink_log/include/libipulog.h
===================================================================
--- trunk/libnfnetlink_log/include/libipulog.h	2005-07-30 16:43:39 UTC (rev 4185)
+++ trunk/libnfnetlink_log/include/libipulog.h	2005-07-30 16:44:31 UTC (rev 4186)
@@ -1,69 +0,0 @@
-#ifndef _LIBIPULOG_H
-#define _LIBIPULOG_H
-
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-/* FIXME: glibc sucks */
-#ifndef MSG_TRUNC 
-#define MSG_TRUNC	0x20
-#endif
-
-#define ULOG_MAC_LEN	80
-#define ULOG_PREFIX_LEN	32
-#define ULOG_IFNAMSIZ	16
-
-/* Format of the ULOG packets passed through netlink */
-typedef struct ulog_packet_msg {
-	unsigned long mark;
-	long timestamp_sec;
-	long timestamp_usec;
-	unsigned int hook;
-	char indev_name[ULOG_IFNAMSIZ];
-	char outdev_name[ULOG_IFNAMSIZ];
-	size_t data_len;
-	char prefix[ULOG_PREFIX_LEN];
-	unsigned char mac_len;
-	unsigned char mac[ULOG_MAC_LEN];
-	unsigned char payload[0];
-} ulog_packet_msg_t;
-
-struct ipulog_handle;
-extern int ipulog_errno;
-
-u_int32_t ipulog_group2gmask(u_int32_t group);
-
-struct ipulog_handle *ipulog_create_handle(u_int32_t gmask, u_int32_t rmem);
-
-void ipulog_destroy_handle(struct ipulog_handle *h);
-
-ssize_t ipulog_read(struct ipulog_handle *h,
-		    unsigned char *buf, size_t len, int timeout);
-
-ulog_packet_msg_t *ipulog_get_packet(struct ipulog_handle *h,
-				     const unsigned char *buf,
-				     size_t len);
-
-char *ipulog_strerror(int errcode);
-
-void ipulog_perror(const char *s);
-
-enum 
-{
-	IPULOG_ERR_NONE = 0,
-	IPULOG_ERR_IMPL,
-	IPULOG_ERR_HANDLE,
-	IPULOG_ERR_SOCKET,
-	IPULOG_ERR_BIND,
-	IPULOG_ERR_RECVBUF,
-	IPULOG_ERR_RECV,
-	IPULOG_ERR_NLEOF,
-	IPULOG_ERR_TRUNC,
-	IPULOG_ERR_INVGR,
-	IPULOG_ERR_INVNL,
-};
-#define IPULOG_MAXERR IPULOG_ERR_INVNL
-
-
-#endif /* _LIBIPULOG_H */

Copied: trunk/libnfnetlink_log/include/libnfnetlink_log/libnfnetlink_log.h (from rev 4183, trunk/libnfnetlink_log/include/libnfnetlink_log.h)

Deleted: trunk/libnfnetlink_log/include/libnfnetlink_log.h
===================================================================
--- trunk/libnfnetlink_log/include/libnfnetlink_log.h	2005-07-30 16:43:39 UTC (rev 4185)
+++ trunk/libnfnetlink_log/include/libnfnetlink_log.h	2005-07-30 16:44:31 UTC (rev 4186)
@@ -1,48 +0,0 @@
-/* libnfnetlink_log.h: Header file for the Netfilter Userspace Log library.
- *
- * (C) 2005 by Harald Welte <laforge at gnumonks.org>
- *
- * This software may be used and distributed according to the terms
- * of the GNU General Public License, incorporated herein by reference.
- */
-
-#ifndef __LIBNFNETLINK_LOG_H
-#define __LIBNFNETLINK_LOG_H
-
-#include <linux/netfilter/nfnetlink.h>
-#include <linux/netfilter/nfnetlink_log.h>
-#include <libnfnetlink.h>
-
-
-struct nfulnl_handle
-{
-	struct nfnl_handle nfnlh;
-};
-
-struct nfulnl_g_handle
-{
-	struct nfulnl_handle *h;
-	u_int16_t id;
-};
-
-struct ctnl_msg_handler {
-	int type;
-	int (*handler)(struct sockaddr_nl *, struct nlmsghdr *, void *arg);
-};
-
-extern int nfulnl_open(struct nfulnl_handle *h);
-extern int nfulnl_close(struct nfulnl_handle *h);
-
-extern int nfulnl_bind_pf(struct nfulnl_handle *h, u_int16_t pf);
-extern int nfulnl_unbind_pf(struct nfulnl_handle *h, u_int16_t pf);
-
-extern int nfulnl_bind_group(struct nfulnl_handle *h,
-			     struct nfulnl_g_handle *qh, u_int16_t num);
-extern int nfulnl_unbind_group(struct nfulnl_g_handle *qh);
-
-extern int nfulnl_set_mode(struct nfulnl_g_handle *qh,
-			  u_int8_t mode, unsigned int len);
-extern int nfulnl_set_timeout(struct nfulnl_g_handle *gh, u_int32_t timeout);
-extern int nfulnl_set_qthresh(struct nfulnl_g_handle *gh, u_int32_t qthresh);
-extern int nfulnl_set_nlbufsiz(struct nfulnl_g_handle *gh, u_int32_t nlbufsiz);
-#endif	/* __LIBNFNETLINK_LOG_H */