Changes - j0ke.net Open Build Service

Changes of Revision 4

[-] [+]	Changed	ipclassify.spec
@@ -6,6 +6,7 @@ License: GPL Url: https://sourceforge.net/projects/ipclassify/ Source0: %{name}-%{version}.tar.bz2 +Patch0: ipclassify-nfq_set_verdict2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libnetfilter_queue-devel libnfnetlink-devel BuildRequires: flex @@ -21,6 +22,7 @@ %prep %setup -q +%patch0 %build %__make
[-] [+]	Added	ipclassify-nfq_set_verdict2.patch ^
@@ -0,0 +1,56 @@ +--- ipclassify.c.orig 2011-06-19 18:59:59.870026592 +0200 ++++ ipclassify.c 2011-06-19 19:00:19.682341166 +0200 +@@ -597,7 +597,7 @@ + pthread_rwlock_wrlock(&queue->rwlock); + queue->ttl_rejected++; + pthread_rwlock_unlock(&queue->rwlock); +- status=nfq_set_verdict2(qh, id, NF_DROP, queue->rejectMark, 0, NULL); ++ status=nfq_set_verdict(qh, id, NF_DROP, queue->rejectMark, 0, NULL); + if(status < 0) { + snprintf((char )mstr,DEFBUFSIZE,"Queue: %d: nfq_set_verdict():error: %s, hits: %d, SRC: %s", + queue->queue,tmprec.blockname,tmprec.hits,ip2str(SRC_ADDR(payload))); +@@ -616,7 +616,7 @@ + } + } else { + // NF_ACCEPT the packet +- status = nfq_set_verdict2(qh, id, NF_ACCEPT, queue->acceptMark, 0, NULL); ++ status = nfq_set_verdict(qh, id, NF_ACCEPT, queue->acceptMark, 0, NULL); + if(status < 0) { + snprintf((char )mstr,DEFBUFSIZE,"Queue: %d: nfq_set_verdict():error: ",queue->queue); + log2file(mstr); +@@ -633,7 +633,7 @@ + pthread_rwlock_wrlock(&queue->rwlock); + queue->ttl_rejected++; + pthread_rwlock_unlock(&queue->rwlock); +- status=nfq_set_verdict2(qh, id, NF_DROP, queue->rejectMark, 0, NULL); ++ status=nfq_set_verdict(qh, id, NF_DROP, queue->rejectMark, 0, NULL); + if(status < 0) { + snprintf((char )mstr,DEFBUFSIZE,"Queue: %d: nfq_set_verdict():error: %s, hits: %d, DEST: %s", + queue->queue,tmprec.blockname,tmprec.hits,ip2str(DEST_ADDR(payload))); +@@ -652,7 +652,7 @@ + } + } else { + // NF_ACCEPT the packet +- status = nfq_set_verdict2(qh, id, NF_ACCEPT, queue->acceptMark, 0, NULL); ++ status = nfq_set_verdict(qh, id, NF_ACCEPT, queue->acceptMark, 0, NULL); + if(status < 0) { + snprintf((char )mstr,DEFBUFSIZE,"Queue: %d: nfq_set_verdict():error: ",queue->queue); + log2file(mstr); +@@ -670,7 +670,7 @@ + pthread_rwlock_wrlock(&queue->rwlock); + queue->ttl_rejected++; + pthread_rwlock_unlock(&queue->rwlock); +- status=nfq_set_verdict2(qh, id, NF_DROP, queue->rejectMark, 0, NULL); ++ status=nfq_set_verdict(qh, id, NF_DROP, queue->rejectMark, 0, NULL); + if(status < 0) { + snprintf((char )mstr,DEFBUFSIZE,"Queue: %d: nfq_set_verdict():error: %s, hits: %d, SRC: %s, DEST: %s", + queue->queue,tmprec.blockname,tmprec.hits,ip2str(SRC_ADDR(payload)),ip2str(DEST_ADDR(payload))); +@@ -689,7 +689,7 @@ + } + } else { + // NF_ACCEPT the packet +- status = nfq_set_verdict2(qh, id, NF_ACCEPT, queue->acceptMark, 0, NULL); ++ status = nfq_set_verdict(qh, id, NF_ACCEPT, queue->acceptMark, 0, NULL); + if(status < 0) { + snprintf((char )mstr,DEFBUFSIZE,"Queue: %d: nfq_set_verdict():error: ",queue->queue); + log2file(mstr);