diff options
author | Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | 2019-05-07 23:50:42 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-05-08 00:28:05 -0700 |
commit | 7f887ee74b53742fc31b8874c9b0ac380dc67f4f (patch) | |
tree | 00ca68b9794e4114250c7aa51674054750e0646e /meta-networking/recipes-filter | |
parent | c1b55cfd23285ae9eb391035add5047018d0757d (diff) | |
download | meta-openembedded-7f887ee74b53742fc31b8874c9b0ac380dc67f4f.tar.gz |
libnetfilter-queue: fix update to 1.0.3
SRC_URI was mistakenly not updated in @57967659f4724a8b614f.
Removed patch was upstreamed. Another one was refreshed with devtool.
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-filter')
3 files changed, 44 insertions, 74 deletions
diff --git a/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch b/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch deleted file mode 100644 index 76d2d5d28..000000000 --- a/meta-networking/recipes-filter/libnetfilter/files/0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From 32af64e1811c74292891dc4dc8455736f7d33ccf Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 30 Mar 2017 13:26:56 -0700 | ||
4 | Subject: [PATCH] Correct typo in the location of internal.h in #include | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | src/libnetfilter_queue.c | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/src/libnetfilter_queue.c b/src/libnetfilter_queue.c | ||
12 | index 211a8ba..065d618 100644 | ||
13 | --- a/src/libnetfilter_queue.c | ||
14 | +++ b/src/libnetfilter_queue.c | ||
15 | @@ -32,7 +32,7 @@ | ||
16 | |||
17 | #include <libnfnetlink/libnfnetlink.h> | ||
18 | #include <libnetfilter_queue/libnetfilter_queue.h> | ||
19 | -#include "src/internal.h" | ||
20 | +#include "internal.h" | ||
21 | |||
22 | /** | ||
23 | * \mainpage | ||
24 | -- | ||
25 | 2.12.1 | ||
26 | |||
diff --git a/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch b/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch index 946f1b71d..aa9ff09a9 100644 --- a/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch +++ b/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 06562244ac4a1a61e1a2c6b219a517658f7349bf Mon Sep 17 00:00:00 2001 | 1 | From db7eb5f0a4e78c6bd3c4f9cbd8332d909eb82ad6 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 10 Apr 2017 12:09:41 -0700 | 3 | Date: Mon, 10 Apr 2017 12:09:41 -0700 |
4 | Subject: [PATCH] Declare the define visivility attribute together | 4 | Subject: [PATCH] Declare the define visivility attribute together |
@@ -9,16 +9,17 @@ symbols become hidden and consumers of this library | |||
9 | fail to link due to these missing symbols | 9 | fail to link due to these missing symbols |
10 | 10 | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
12 | |||
12 | --- | 13 | --- |
13 | doxygen.cfg.in | 2 +- | 14 | doxygen.cfg.in | 2 +- |
14 | src/extra/ipv4.c | 15 +++---- | 15 | src/extra/ipv4.c | 15 ++---- |
15 | src/extra/ipv6.c | 9 ++-- | 16 | src/extra/ipv6.c | 9 ++-- |
16 | src/extra/pktbuff.c | 42 ++++++------------ | 17 | src/extra/pktbuff.c | 42 +++++---------- |
17 | src/extra/tcp.c | 21 +++------ | 18 | src/extra/tcp.c | 21 +++----- |
18 | src/extra/udp.c | 21 +++------ | 19 | src/extra/udp.c | 21 +++----- |
19 | src/internal.h | 5 +-- | 20 | src/internal.h | 5 +- |
20 | src/libnetfilter_queue.c | 108 ++++++++++++++++------------------------------- | 21 | src/libnetfilter_queue.c | 108 +++++++++++++-------------------------- |
21 | src/nlmsg.c | 21 +++------ | 22 | src/nlmsg.c | 21 +++----- |
22 | 9 files changed, 82 insertions(+), 162 deletions(-) | 23 | 9 files changed, 82 insertions(+), 162 deletions(-) |
23 | 24 | ||
24 | diff --git a/doxygen.cfg.in b/doxygen.cfg.in | 25 | diff --git a/doxygen.cfg.in b/doxygen.cfg.in |
@@ -592,7 +593,7 @@ index 558d267..79b0752 100644 | |||
592 | 593 | ||
593 | struct iphdr; | 594 | struct iphdr; |
594 | diff --git a/src/libnetfilter_queue.c b/src/libnetfilter_queue.c | 595 | diff --git a/src/libnetfilter_queue.c b/src/libnetfilter_queue.c |
595 | index 065d618..ab0b66b 100644 | 596 | index 673e3b0..c12f068 100644 |
596 | --- a/src/libnetfilter_queue.c | 597 | --- a/src/libnetfilter_queue.c |
597 | +++ b/src/libnetfilter_queue.c | 598 | +++ b/src/libnetfilter_queue.c |
598 | @@ -133,8 +133,7 @@ struct nfq_data { | 599 | @@ -133,8 +133,7 @@ struct nfq_data { |
@@ -772,7 +773,7 @@ index 065d618..ab0b66b 100644 | |||
772 | 773 | ||
773 | /** | 774 | /** |
774 | * nfq_set_queue_flags - set flags (options) for the kernel queue | 775 | * nfq_set_queue_flags - set flags (options) for the kernel queue |
775 | @@ -690,7 +678,7 @@ EXPORT_SYMBOL(nfq_set_mode); | 776 | @@ -708,7 +696,7 @@ EXPORT_SYMBOL(nfq_set_mode); |
776 | * | 777 | * |
777 | * \return -1 on error with errno set appropriately; =0 otherwise. | 778 | * \return -1 on error with errno set appropriately; =0 otherwise. |
778 | */ | 779 | */ |
@@ -781,7 +782,7 @@ index 065d618..ab0b66b 100644 | |||
781 | uint32_t mask, uint32_t flags) | 782 | uint32_t mask, uint32_t flags) |
782 | { | 783 | { |
783 | union { | 784 | union { |
784 | @@ -711,7 +699,6 @@ int nfq_set_queue_flags(struct nfq_q_handle *qh, | 785 | @@ -729,7 +717,6 @@ int nfq_set_queue_flags(struct nfq_q_handle *qh, |
785 | 786 | ||
786 | return nfnl_query(qh->h->nfnlh, &u.nmh); | 787 | return nfnl_query(qh->h->nfnlh, &u.nmh); |
787 | } | 788 | } |
@@ -789,7 +790,7 @@ index 065d618..ab0b66b 100644 | |||
789 | 790 | ||
790 | /** | 791 | /** |
791 | * nfq_set_queue_maxlen - Set kernel queue maximum length parameter | 792 | * nfq_set_queue_maxlen - Set kernel queue maximum length parameter |
792 | @@ -724,7 +711,7 @@ EXPORT_SYMBOL(nfq_set_queue_flags); | 793 | @@ -742,7 +729,7 @@ EXPORT_SYMBOL(nfq_set_queue_flags); |
793 | * | 794 | * |
794 | * \return -1 on error; >=0 otherwise. | 795 | * \return -1 on error; >=0 otherwise. |
795 | */ | 796 | */ |
@@ -798,7 +799,7 @@ index 065d618..ab0b66b 100644 | |||
798 | uint32_t queuelen) | 799 | uint32_t queuelen) |
799 | { | 800 | { |
800 | union { | 801 | union { |
801 | @@ -742,7 +729,6 @@ int nfq_set_queue_maxlen(struct nfq_q_handle *qh, | 802 | @@ -760,7 +747,6 @@ int nfq_set_queue_maxlen(struct nfq_q_handle *qh, |
802 | 803 | ||
803 | return nfnl_query(qh->h->nfnlh, &u.nmh); | 804 | return nfnl_query(qh->h->nfnlh, &u.nmh); |
804 | } | 805 | } |
@@ -806,7 +807,7 @@ index 065d618..ab0b66b 100644 | |||
806 | 807 | ||
807 | /** | 808 | /** |
808 | * @} | 809 | * @} |
809 | @@ -829,14 +815,13 @@ static int __set_verdict(struct nfq_q_handle *qh, uint32_t id, | 810 | @@ -847,14 +833,13 @@ static int __set_verdict(struct nfq_q_handle *qh, uint32_t id, |
810 | * | 811 | * |
811 | * \return -1 on error; >= 0 otherwise. | 812 | * \return -1 on error; >= 0 otherwise. |
812 | */ | 813 | */ |
@@ -822,7 +823,7 @@ index 065d618..ab0b66b 100644 | |||
822 | 823 | ||
823 | /** | 824 | /** |
824 | * nfq_set_verdict2 - like nfq_set_verdict, but you can set the mark. | 825 | * nfq_set_verdict2 - like nfq_set_verdict, but you can set the mark. |
825 | @@ -847,14 +832,13 @@ EXPORT_SYMBOL(nfq_set_verdict); | 826 | @@ -865,14 +850,13 @@ EXPORT_SYMBOL(nfq_set_verdict); |
826 | * \param data_len number of bytes of data pointed to by #buf | 827 | * \param data_len number of bytes of data pointed to by #buf |
827 | * \param buf the buffer that contains the packet data | 828 | * \param buf the buffer that contains the packet data |
828 | */ | 829 | */ |
@@ -838,7 +839,7 @@ index 065d618..ab0b66b 100644 | |||
838 | 839 | ||
839 | /** | 840 | /** |
840 | * nfq_set_verdict_batch - issue verdicts on several packets at once | 841 | * nfq_set_verdict_batch - issue verdicts on several packets at once |
841 | @@ -868,13 +852,12 @@ EXPORT_SYMBOL(nfq_set_verdict2); | 842 | @@ -886,13 +870,12 @@ EXPORT_SYMBOL(nfq_set_verdict2); |
842 | * batch support was added in Linux 3.1. | 843 | * batch support was added in Linux 3.1. |
843 | * These functions will fail silently on older kernels. | 844 | * These functions will fail silently on older kernels. |
844 | */ | 845 | */ |
@@ -853,7 +854,7 @@ index 065d618..ab0b66b 100644 | |||
853 | 854 | ||
854 | /** | 855 | /** |
855 | * nfq_set_verdict_batch2 - like nfq_set_verdict_batch, but you can set a mark. | 856 | * nfq_set_verdict_batch2 - like nfq_set_verdict_batch, but you can set a mark. |
856 | @@ -883,13 +866,12 @@ EXPORT_SYMBOL(nfq_set_verdict_batch); | 857 | @@ -901,13 +884,12 @@ EXPORT_SYMBOL(nfq_set_verdict_batch); |
857 | * \param verdict verdict to return to netfilter (NF_ACCEPT, NF_DROP) | 858 | * \param verdict verdict to return to netfilter (NF_ACCEPT, NF_DROP) |
858 | * \param mark mark to put on packet | 859 | * \param mark mark to put on packet |
859 | */ | 860 | */ |
@@ -868,7 +869,7 @@ index 065d618..ab0b66b 100644 | |||
868 | 869 | ||
869 | /** | 870 | /** |
870 | * nfq_set_verdict_mark - like nfq_set_verdict, but you can set the mark. | 871 | * nfq_set_verdict_mark - like nfq_set_verdict, but you can set the mark. |
871 | @@ -905,14 +887,13 @@ EXPORT_SYMBOL(nfq_set_verdict_batch2); | 872 | @@ -923,14 +905,13 @@ EXPORT_SYMBOL(nfq_set_verdict_batch2); |
872 | * This function is deprecated since it is broken, its use is highly | 873 | * This function is deprecated since it is broken, its use is highly |
873 | * discouraged. Please, use nfq_set_verdict2 instead. | 874 | * discouraged. Please, use nfq_set_verdict2 instead. |
874 | */ | 875 | */ |
@@ -884,7 +885,7 @@ index 065d618..ab0b66b 100644 | |||
884 | 885 | ||
885 | /** | 886 | /** |
886 | * @} | 887 | * @} |
887 | @@ -947,12 +928,11 @@ EXPORT_SYMBOL(nfq_set_verdict_mark); | 888 | @@ -965,12 +946,11 @@ EXPORT_SYMBOL(nfq_set_verdict_mark); |
888 | } __attribute__ ((packed)); | 889 | } __attribute__ ((packed)); |
889 | \endverbatim | 890 | \endverbatim |
890 | */ | 891 | */ |
@@ -898,7 +899,7 @@ index 065d618..ab0b66b 100644 | |||
898 | 899 | ||
899 | /** | 900 | /** |
900 | * nfq_get_nfmark - get the packet mark | 901 | * nfq_get_nfmark - get the packet mark |
901 | @@ -960,11 +940,10 @@ EXPORT_SYMBOL(nfq_get_msg_packet_hdr); | 902 | @@ -978,11 +958,10 @@ EXPORT_SYMBOL(nfq_get_msg_packet_hdr); |
902 | * | 903 | * |
903 | * \return the netfilter mark currently assigned to the given queued packet. | 904 | * \return the netfilter mark currently assigned to the given queued packet. |
904 | */ | 905 | */ |
@@ -911,7 +912,7 @@ index 065d618..ab0b66b 100644 | |||
911 | 912 | ||
912 | /** | 913 | /** |
913 | * nfq_get_timestamp - get the packet timestamp | 914 | * nfq_get_timestamp - get the packet timestamp |
914 | @@ -975,7 +954,7 @@ EXPORT_SYMBOL(nfq_get_nfmark); | 915 | @@ -993,7 +972,7 @@ EXPORT_SYMBOL(nfq_get_nfmark); |
915 | * | 916 | * |
916 | * \return 0 on success, non-zero on failure. | 917 | * \return 0 on success, non-zero on failure. |
917 | */ | 918 | */ |
@@ -920,7 +921,7 @@ index 065d618..ab0b66b 100644 | |||
920 | { | 921 | { |
921 | struct nfqnl_msg_packet_timestamp *qpt; | 922 | struct nfqnl_msg_packet_timestamp *qpt; |
922 | qpt = nfnl_get_pointer_to_data(nfad->data, NFQA_TIMESTAMP, | 923 | qpt = nfnl_get_pointer_to_data(nfad->data, NFQA_TIMESTAMP, |
923 | @@ -988,7 +967,6 @@ int nfq_get_timestamp(struct nfq_data *nfad, struct timeval *tv) | 924 | @@ -1006,7 +985,6 @@ int nfq_get_timestamp(struct nfq_data *nfad, struct timeval *tv) |
924 | 925 | ||
925 | return 0; | 926 | return 0; |
926 | } | 927 | } |
@@ -928,7 +929,7 @@ index 065d618..ab0b66b 100644 | |||
928 | 929 | ||
929 | /** | 930 | /** |
930 | * nfq_get_indev - get the interface that the packet was received through | 931 | * nfq_get_indev - get the interface that the packet was received through |
931 | @@ -1001,11 +979,10 @@ EXPORT_SYMBOL(nfq_get_timestamp); | 932 | @@ -1019,11 +997,10 @@ EXPORT_SYMBOL(nfq_get_timestamp); |
932 | * \warning all nfq_get_dev() functions return 0 if not set, since linux | 933 | * \warning all nfq_get_dev() functions return 0 if not set, since linux |
933 | * only allows ifindex >= 1, see net/core/dev.c:2600 (in 2.6.13.1) | 934 | * only allows ifindex >= 1, see net/core/dev.c:2600 (in 2.6.13.1) |
934 | */ | 935 | */ |
@@ -941,7 +942,7 @@ index 065d618..ab0b66b 100644 | |||
941 | 942 | ||
942 | /** | 943 | /** |
943 | * nfq_get_physindev - get the physical interface that the packet was received | 944 | * nfq_get_physindev - get the physical interface that the packet was received |
944 | @@ -1015,11 +992,10 @@ EXPORT_SYMBOL(nfq_get_indev); | 945 | @@ -1033,11 +1010,10 @@ EXPORT_SYMBOL(nfq_get_indev); |
945 | * If the returned index is 0, the packet was locally generated or the | 946 | * If the returned index is 0, the packet was locally generated or the |
946 | * physical input interface is no longer known (ie. POSTROUTING?). | 947 | * physical input interface is no longer known (ie. POSTROUTING?). |
947 | */ | 948 | */ |
@@ -954,7 +955,7 @@ index 065d618..ab0b66b 100644 | |||
954 | 955 | ||
955 | /** | 956 | /** |
956 | * nfq_get_outdev - gets the interface that the packet will be routed out | 957 | * nfq_get_outdev - gets the interface that the packet will be routed out |
957 | @@ -1029,11 +1005,10 @@ EXPORT_SYMBOL(nfq_get_physindev); | 958 | @@ -1047,11 +1023,10 @@ EXPORT_SYMBOL(nfq_get_physindev); |
958 | * returned index is 0, the packet is destined for localhost or the output | 959 | * returned index is 0, the packet is destined for localhost or the output |
959 | * interface is not yet known (ie. PREROUTING?). | 960 | * interface is not yet known (ie. PREROUTING?). |
960 | */ | 961 | */ |
@@ -967,7 +968,7 @@ index 065d618..ab0b66b 100644 | |||
967 | 968 | ||
968 | /** | 969 | /** |
969 | * nfq_get_physoutdev - get the physical interface that the packet output | 970 | * nfq_get_physoutdev - get the physical interface that the packet output |
970 | @@ -1045,11 +1020,10 @@ EXPORT_SYMBOL(nfq_get_outdev); | 971 | @@ -1063,11 +1038,10 @@ EXPORT_SYMBOL(nfq_get_outdev); |
971 | * | 972 | * |
972 | * \return The index of physical interface that the packet output will be routed out. | 973 | * \return The index of physical interface that the packet output will be routed out. |
973 | */ | 974 | */ |
@@ -980,7 +981,7 @@ index 065d618..ab0b66b 100644 | |||
980 | 981 | ||
981 | /** | 982 | /** |
982 | * nfq_get_indev_name - get the name of the interface the packet | 983 | * nfq_get_indev_name - get the name of the interface the packet |
983 | @@ -1089,13 +1063,12 @@ EXPORT_SYMBOL(nfq_get_physoutdev); | 984 | @@ -1107,13 +1081,12 @@ EXPORT_SYMBOL(nfq_get_physoutdev); |
984 | \endverbatim | 985 | \endverbatim |
985 | * | 986 | * |
986 | */ | 987 | */ |
@@ -995,7 +996,7 @@ index 065d618..ab0b66b 100644 | |||
995 | 996 | ||
996 | /** | 997 | /** |
997 | * nfq_get_physindev_name - get the name of the physical interface the | 998 | * nfq_get_physindev_name - get the name of the physical interface the |
998 | @@ -1109,13 +1082,12 @@ EXPORT_SYMBOL(nfq_get_indev_name); | 999 | @@ -1127,13 +1100,12 @@ EXPORT_SYMBOL(nfq_get_indev_name); |
999 | * | 1000 | * |
1000 | * \return -1 in case of error, > 0 if it succeed. | 1001 | * \return -1 in case of error, > 0 if it succeed. |
1001 | */ | 1002 | */ |
@@ -1010,7 +1011,7 @@ index 065d618..ab0b66b 100644 | |||
1010 | 1011 | ||
1011 | /** | 1012 | /** |
1012 | * nfq_get_outdev_name - get the name of the physical interface the | 1013 | * nfq_get_outdev_name - get the name of the physical interface the |
1013 | @@ -1129,13 +1101,12 @@ EXPORT_SYMBOL(nfq_get_physindev_name); | 1014 | @@ -1147,13 +1119,12 @@ EXPORT_SYMBOL(nfq_get_physindev_name); |
1014 | * | 1015 | * |
1015 | * \return -1 in case of error, > 0 if it succeed. | 1016 | * \return -1 in case of error, > 0 if it succeed. |
1016 | */ | 1017 | */ |
@@ -1025,7 +1026,7 @@ index 065d618..ab0b66b 100644 | |||
1025 | 1026 | ||
1026 | /** | 1027 | /** |
1027 | * nfq_get_physoutdev_name - get the name of the interface the | 1028 | * nfq_get_physoutdev_name - get the name of the interface the |
1028 | @@ -1150,13 +1121,12 @@ EXPORT_SYMBOL(nfq_get_outdev_name); | 1029 | @@ -1168,13 +1139,12 @@ EXPORT_SYMBOL(nfq_get_outdev_name); |
1029 | * \return -1 in case of error, > 0 if it succeed. | 1030 | * \return -1 in case of error, > 0 if it succeed. |
1030 | */ | 1031 | */ |
1031 | 1032 | ||
@@ -1040,7 +1041,7 @@ index 065d618..ab0b66b 100644 | |||
1040 | 1041 | ||
1041 | /** | 1042 | /** |
1042 | * nfq_get_packet_hw | 1043 | * nfq_get_packet_hw |
1043 | @@ -1180,12 +1150,11 @@ EXPORT_SYMBOL(nfq_get_physoutdev_name); | 1044 | @@ -1198,12 +1168,11 @@ EXPORT_SYMBOL(nfq_get_physoutdev_name); |
1044 | } __attribute__ ((packed)); | 1045 | } __attribute__ ((packed)); |
1045 | \endverbatim | 1046 | \endverbatim |
1046 | */ | 1047 | */ |
@@ -1054,7 +1055,7 @@ index 065d618..ab0b66b 100644 | |||
1054 | 1055 | ||
1055 | /** | 1056 | /** |
1056 | * nfq_get_uid - get the UID of the user the packet belongs to | 1057 | * nfq_get_uid - get the UID of the user the packet belongs to |
1057 | @@ -1193,7 +1162,7 @@ EXPORT_SYMBOL(nfq_get_packet_hw); | 1058 | @@ -1215,7 +1184,7 @@ EXPORT_SYMBOL(nfq_get_packet_hw); |
1058 | * | 1059 | * |
1059 | * \return 1 if there is a UID available, 0 otherwise. | 1060 | * \return 1 if there is a UID available, 0 otherwise. |
1060 | */ | 1061 | */ |
@@ -1063,7 +1064,7 @@ index 065d618..ab0b66b 100644 | |||
1063 | { | 1064 | { |
1064 | if (!nfnl_attr_present(nfad->data, NFQA_UID)) | 1065 | if (!nfnl_attr_present(nfad->data, NFQA_UID)) |
1065 | return 0; | 1066 | return 0; |
1066 | @@ -1201,7 +1170,6 @@ int nfq_get_uid(struct nfq_data *nfad, uint32_t *uid) | 1067 | @@ -1223,7 +1192,6 @@ int nfq_get_uid(struct nfq_data *nfad, uint32_t *uid) |
1067 | *uid = ntohl(nfnl_get_data(nfad->data, NFQA_UID, uint32_t)); | 1068 | *uid = ntohl(nfnl_get_data(nfad->data, NFQA_UID, uint32_t)); |
1068 | return 1; | 1069 | return 1; |
1069 | } | 1070 | } |
@@ -1071,7 +1072,7 @@ index 065d618..ab0b66b 100644 | |||
1071 | 1072 | ||
1072 | /** | 1073 | /** |
1073 | * nfq_get_gid - get the GID of the user the packet belongs to | 1074 | * nfq_get_gid - get the GID of the user the packet belongs to |
1074 | @@ -1209,7 +1177,7 @@ EXPORT_SYMBOL(nfq_get_uid); | 1075 | @@ -1235,7 +1203,7 @@ EXPORT_SYMBOL(nfq_get_uid); |
1075 | * | 1076 | * |
1076 | * \return 1 if there is a GID available, 0 otherwise. | 1077 | * \return 1 if there is a GID available, 0 otherwise. |
1077 | */ | 1078 | */ |
@@ -1080,15 +1081,15 @@ index 065d618..ab0b66b 100644 | |||
1080 | { | 1081 | { |
1081 | if (!nfnl_attr_present(nfad->data, NFQA_GID)) | 1082 | if (!nfnl_attr_present(nfad->data, NFQA_GID)) |
1082 | return 0; | 1083 | return 0; |
1083 | @@ -1217,7 +1185,6 @@ int nfq_get_gid(struct nfq_data *nfad, uint32_t *gid) | 1084 | @@ -1243,7 +1211,6 @@ int nfq_get_gid(struct nfq_data *nfad, uint32_t *gid) |
1084 | *gid = ntohl(nfnl_get_data(nfad->data, NFQA_GID, uint32_t)); | 1085 | *gid = ntohl(nfnl_get_data(nfad->data, NFQA_GID, uint32_t)); |
1085 | return 1; | 1086 | return 1; |
1086 | } | 1087 | } |
1087 | -EXPORT_SYMBOL(nfq_get_gid); | 1088 | -EXPORT_SYMBOL(nfq_get_gid); |
1088 | 1089 | ||
1089 | |||
1090 | /** | 1090 | /** |
1091 | @@ -1227,7 +1194,7 @@ EXPORT_SYMBOL(nfq_get_gid); | 1091 | * nfq_get_secctx - get the security context for this packet |
1092 | @@ -1256,7 +1223,7 @@ EXPORT_SYMBOL(nfq_get_gid); | ||
1092 | * | 1093 | * |
1093 | * \return -1 on error, otherwise > 0 | 1094 | * \return -1 on error, otherwise > 0 |
1094 | */ | 1095 | */ |
@@ -1097,7 +1098,7 @@ index 065d618..ab0b66b 100644 | |||
1097 | { | 1098 | { |
1098 | if (!nfnl_attr_present(nfad->data, NFQA_SECCTX)) | 1099 | if (!nfnl_attr_present(nfad->data, NFQA_SECCTX)) |
1099 | return -1; | 1100 | return -1; |
1100 | @@ -1240,7 +1207,6 @@ int nfq_get_secctx(struct nfq_data *nfad, unsigned char **secdata) | 1101 | @@ -1269,7 +1236,6 @@ int nfq_get_secctx(struct nfq_data *nfad, unsigned char **secdata) |
1101 | 1102 | ||
1102 | return 0; | 1103 | return 0; |
1103 | } | 1104 | } |
@@ -1105,7 +1106,7 @@ index 065d618..ab0b66b 100644 | |||
1105 | 1106 | ||
1106 | /** | 1107 | /** |
1107 | * nfq_get_payload - get payload | 1108 | * nfq_get_payload - get payload |
1108 | @@ -1253,7 +1219,7 @@ EXPORT_SYMBOL(nfq_get_secctx); | 1109 | @@ -1282,7 +1248,7 @@ EXPORT_SYMBOL(nfq_get_secctx); |
1109 | * | 1110 | * |
1110 | * \return -1 on error, otherwise > 0. | 1111 | * \return -1 on error, otherwise > 0. |
1111 | */ | 1112 | */ |
@@ -1114,7 +1115,7 @@ index 065d618..ab0b66b 100644 | |||
1114 | { | 1115 | { |
1115 | *data = (unsigned char *) | 1116 | *data = (unsigned char *) |
1116 | nfnl_get_pointer_to_data(nfad->data, NFQA_PAYLOAD, char); | 1117 | nfnl_get_pointer_to_data(nfad->data, NFQA_PAYLOAD, char); |
1117 | @@ -1262,7 +1228,6 @@ int nfq_get_payload(struct nfq_data *nfad, unsigned char **data) | 1118 | @@ -1291,7 +1257,6 @@ int nfq_get_payload(struct nfq_data *nfad, unsigned char **data) |
1118 | 1119 | ||
1119 | return -1; | 1120 | return -1; |
1120 | } | 1121 | } |
@@ -1122,7 +1123,7 @@ index 065d618..ab0b66b 100644 | |||
1122 | 1123 | ||
1123 | /** | 1124 | /** |
1124 | * @} | 1125 | * @} |
1125 | @@ -1307,7 +1272,7 @@ do { \ | 1126 | @@ -1336,7 +1301,7 @@ do { \ |
1126 | * would have been printed into the buffer (in case that there is enough | 1127 | * would have been printed into the buffer (in case that there is enough |
1127 | * room in it). See snprintf() return value for more information. | 1128 | * room in it). See snprintf() return value for more information. |
1128 | */ | 1129 | */ |
@@ -1131,7 +1132,7 @@ index 065d618..ab0b66b 100644 | |||
1131 | { | 1132 | { |
1132 | struct nfqnl_msg_packet_hdr *ph; | 1133 | struct nfqnl_msg_packet_hdr *ph; |
1133 | struct nfqnl_msg_packet_hw *hwph; | 1134 | struct nfqnl_msg_packet_hw *hwph; |
1134 | @@ -1460,7 +1425,6 @@ int nfq_snprintf_xml(char *buf, size_t rem, struct nfq_data *tb, int flags) | 1135 | @@ -1489,7 +1454,6 @@ int nfq_snprintf_xml(char *buf, size_t rem, struct nfq_data *tb, int flags) |
1135 | 1136 | ||
1136 | return len; | 1137 | return len; |
1137 | } | 1138 | } |
@@ -1224,6 +1225,3 @@ index ba28c77..5582407 100644 | |||
1224 | 1225 | ||
1225 | /** | 1226 | /** |
1226 | * @} | 1227 | * @} |
1227 | -- | ||
1228 | 2.12.2 | ||
1229 | |||
diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.3.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.3.bb index 754e11d99..896cfdfaa 100644 --- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.3.bb +++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.3.bb | |||
@@ -6,11 +6,9 @@ LICENSE = "GPLv2+" | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" |
7 | DEPENDS = "libnfnetlink libmnl" | 7 | DEPENDS = "libnfnetlink libmnl" |
8 | 8 | ||
9 | PV .= "+git${SRCREV}" | 9 | SRCREV = "601abd1c71ccdf90753cf294c120ad43fb25dc54" |
10 | SRCREV = "981025e103d887fb6a9c9bb49c74ec323108d098" | ||
11 | 10 | ||
12 | SRC_URI = "git://git.netfilter.org/libnetfilter_queue \ | 11 | SRC_URI = "git://git.netfilter.org/libnetfilter_queue \ |
13 | file://0001-Correct-typo-in-the-location-of-internal.h-in-includ.patch \ | ||
14 | file://0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch \ | 12 | file://0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch \ |
15 | " | 13 | " |
16 | 14 | ||