Browse Source

libnetfilter_queue: Updated (0.0.15 -> 0.0.17) and removed obsolete patches

cross
Christian Wiese 16 years ago
parent
commit
fbca7979ea
3 changed files with 3 additions and 104 deletions
  1. +0
    -27
      network/libnetfilter_queue/disable_test_utils.patch
  2. +0
    -74
      network/libnetfilter_queue/libnetfilter_queue-0.0.13-ifacename.patch
  3. +3
    -3
      network/libnetfilter_queue/libnetfilter_queue.desc

+ 0
- 27
network/libnetfilter_queue/disable_test_utils.patch

@ -1,27 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../libnetfilter_queue/disable_test_utils.patch
# Copyright (C) 2007 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./Makefile.in.orig 2007-06-13 12:38:44.000000000 +0200
+++ ./Makefile.in 2007-06-13 12:39:01.000000000 +0200
@@ -149,7 +149,7 @@
EXTRA_DIST = $(man_MANS)
-SUBDIRS = include src utils
+SUBDIRS = include src
man_MANS = #nfnetlink_queue.3 nfnetlink_queue.7

+ 0
- 74
network/libnetfilter_queue/libnetfilter_queue-0.0.13-ifacename.patch

@ -1,74 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../libnetfilter_queue/libnetfilter_queue-0.0.13-ifacename.patch
# Copyright (C) 2007 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
diff -ruN libnetfilter_queue-0.0.13/include/libnetfilter_queue/libnetfilter_queue.h libnetfilter_queue-0.0.13-ifacename/include/libnetfilter_queue/libnetfilter_queue.h
--- libnetfilter_queue-0.0.13/include/libnetfilter_queue/libnetfilter_queue.h 2006-12-21 12:33:43.000000000 +0100
+++ libnetfilter_queue-0.0.13-ifacename/include/libnetfilter_queue/libnetfilter_queue.h 2007-08-07 02:26:24.000000000 +0200
@@ -80,6 +80,15 @@
extern u_int32_t nfq_get_outdev(struct nfq_data *nfad);
extern u_int32_t nfq_get_physoutdev(struct nfq_data *nfad);
+extern int nfq_get_indev_name(struct nlif_handle *nlif_handle,
+ struct nfq_data *nfad, char *name);
+extern int nfq_get_physindev_name(struct nlif_handle *nlif_handle,
+ struct nfq_data *nfad, char *name);
+extern int nfq_get_outdev_name(struct nlif_handle *nlif_handle,
+ struct nfq_data *nfad, char *name);
+extern int nfq_get_physoutdev_name(struct nlif_handle *nlif_handle,
+ struct nfq_data *nfad, char *name);
+
extern struct nfqnl_msg_packet_hw *nfq_get_packet_hw(struct nfq_data *nfad);
/* return -1 if problem, length otherwise */
diff -ruN libnetfilter_queue-0.0.13/src/libnetfilter_queue.c libnetfilter_queue-0.0.13-ifacename/src/libnetfilter_queue.c
--- libnetfilter_queue-0.0.13/src/libnetfilter_queue.c 2006-12-21 12:33:43.000000000 +0100
+++ libnetfilter_queue-0.0.13-ifacename/src/libnetfilter_queue.c 2007-08-07 02:26:24.000000000 +0200
@@ -419,6 +419,35 @@
return ntohl(nfnl_get_data(nfad->data, NFQA_IFINDEX_PHYSOUTDEV, u_int32_t));
}
+int nfq_get_indev_name(struct nlif_handle *nlif_handle,
+ struct nfq_data *nfad, char *name)
+{
+ u_int32_t ifindex = nfq_get_indev(nfad);
+ return nlif_index2name(nlif_handle, ifindex, name);
+}
+
+int nfq_get_physindev_name(struct nlif_handle *nlif_handle,
+ struct nfq_data *nfad, char *name)
+{
+ u_int32_t ifindex = nfq_get_physindev(nfad);
+ return nlif_index2name(nlif_handle, ifindex, name);
+}
+
+int nfq_get_outdev_name(struct nlif_handle *nlif_handle,
+ struct nfq_data *nfad, char *name)
+{
+ u_int32_t ifindex = nfq_get_outdev(nfad);
+ return nlif_index2name(nlif_handle, ifindex, name);
+}
+
+int nfq_get_physoutdev_name(struct nlif_handle *nlif_handle,
+ struct nfq_data *nfad, char *name)
+{
+ u_int32_t ifindex = nfq_get_physoutdev(nfad);
+ return nlif_index2name(nlif_handle, ifindex, name);
+}
+
+
struct nfqnl_msg_packet_hw *nfq_get_packet_hw(struct nfq_data *nfad)
{
return nfnl_get_pointer_to_data(nfad->data, NFQA_HWADDR,

+ 3
- 3
network/libnetfilter_queue/libnetfilter_queue.desc

@ -2,7 +2,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] Filename: package/.../libnetfilter_queue/libnetfilter_queue.desc
[COPY] Copyright (C) 2007 - 2008 The OpenSDE Project
[COPY] Copyright (C) 2007 - 2009 The OpenSDE Project
[COPY]
[COPY] More information can be found in the files COPYING and README.
[COPY]
@ -28,7 +28,7 @@
[L] GPL
[S] Stable
[V] 0.0.15
[V] 0.0.17
[P] X -----5---9 190.100
[D] 3758695461 libnetfilter_queue-0.0.15.tar.bz2 http://netfilter.org/projects/libnetfilter_queue/files/
[D] 3697272981 libnetfilter_queue-0.0.17.tar.bz2 http://netfilter.org/projects/libnetfilter_queue/files/

Loading…
Cancel
Save