Revert "using per-cpu threads for packet receiveing/transmiting"

This reverts commit 9db6020c.

gentoo/net-dialup/accel-pptp/accel-pptp-0.8.1.ebuild

+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpd/pptpd-1.3.1.ebuild,v 1.1 2006/03/26 09:13:06 mrness Exp $
+
+inherit linux-mod eutils autotools
+
+DESCRIPTION="Point-to-Point Tunnelling Protocol Client/Server for Linux"
+SRC_URI="mirror://sourceforge/accel-pptp/${P}.tar.bz2"
+HOMEPAGE="http://accel-pptp.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL"
+KEYWORDS="~amd64 ~x86"
+IUSE="tcpd server"
+
+DEPEND="server? (!net-dialup/pptpd) 
+        >=net-dialup/ppp-2.4.2
+        >=virtual/linux-sources-2.6.15
+	tcpd? ( sys-apps/tcp-wrappers )"
+RDEPEND="virtual/modutils"
+
+MODULE_NAMES="pptp(misc:${S}/kernel/driver)"
+BUILD_TARGETS="default"
+BUILD_PARAMS="KDIR=${KERNEL_DIR}"
+CONFIG_CHECK="PPP PPPOE"
+MODULESD_PPTP_ALIASES=("net-pf-24 pptp")
+
+src_unpack() {
+	unpack ${A}
+
+	local PPPD_VER=`best_version net-dialup/ppp`
+	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+	PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+	#Match pptpd-logwtmp.so's version with pppd's version (#89895)
+	#sed -i -e "s:\\(#define[ \\t]*VERSION[ \\t]*\\)\".*\":\\1\"${PPPD_VER}\":" "${S}/pptpd-1.3.3/plugins/patchlevel.h"
+	#sed -i -e "s:\\(#define[ \\t]*PPP_VERSION[ \\t]*\\)\".*\":\\1\"${PPPD_VER}\":" "${S}/pppd_plugin/src/pppd/patchlevel.h"
+	
+	convert_to_m ${S}/kernel/driver/Makefile
+
+	cd ${S}/pppd_plugin
+	eautoreconf
+
+	if use server; then
+	    cd ${S}/pptpd-1.3.3
+	    eautoreconf
+	fi
+}
+
+src_compile() {
+	
+	if use server; then
+	    cd ${S}/pptpd-1.3.3
+	    local myconf
+	    use tcpd && myconf="--with-libwrap"
+	    econf --with-bcrelay \
+		${myconf} || die "configure failed"
+	    emake COPTS="${CFLAGS}" || die "make failed"
+	fi
+	
+	cd ${S}/pppd_plugin
+	local myconf
+	econf ${myconf} || die "configure failed"
+	emake COPTS="${CFLAGS}" || die "make failed"
+	
+	cd ${S}/kernel/driver
+	linux-mod_src_compile || die "failed to build driver"
+}
+
+src_install () {
+	if use server; then
+	    cd ${S}/pptpd-1.3.3
+	    einstall || die "make install failed"
+
+	    insinto /etc
+	    doins samples/pptpd.conf
+
+	    insinto /etc/ppp
+	    doins samples/options.pptpd
+
+	    exeinto /etc/init.d
+	    newexe "${FILESDIR}/pptpd-init" pptpd
+
+	    insinto /etc/conf.d
+	    newins "${FILESDIR}/pptpd-confd" pptpd
+	fi
+	
+	if use client; then
+	    cd ${S}/example
+	    insinto /etc/ppp
+	    doins ppp/options.pptp
+	    insinto /etc/ppp/peers
+	    doins ppp/peers/pptp_test
+	fi
+
+	cd ${S}/pppd_plugin/src/.libs
+	local PPPD_VER=`best_version net-dialup/ppp`
+	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+	PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+	insinto /usr/lib/pppd/${PPPD_VER}
+	newins pptp.so.0.0.0 pptp.so
+
+	cd ${S}/kernel/driver
+	linux-mod_src_install
+	
+	cd ${S}
+	dodoc README
+	cp -R example "${D}/usr/share/doc/${P}/exmaple"
+}
+
+pkg_postinst () {
+    modules-update
+}

gentoo/net-dialup/accel-pptp/files/options.pptp

+#
+# Lock the port
+#
+#lock
+
+#
+# We don't need the tunnel server to authenticate itself
+#
+noauth
+
+#
+# Turn off transmission protocols we know won't be used
+#
+nobsdcomp
+nodeflate
+
+#
+# We want MPPE
+#
+require-mppe
+
+#
+# We want a sane mtu/mru
+#
+mtu 1437
+mru 1437
+
+#
+# Time this thing out of it goes poof
+#
+lcp-echo-failure 10
+lcp-echo-interval 10

gentoo/net-dialup/accel-pptp/files/pptpd-confd

+# Config file for /etc/init.d/pptpd
+
+# Any extra options you want to pass to pptpd
+# on start-up should be put here.
+PPTPD_OPTS=""

gentoo/net-dialup/accel-pptp/files/pptpd-init

+#!/sbin/runscript
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting pptpd"
+	modprobe pptp
+	start-stop-daemon --start --quiet --exec /usr/sbin/pptpd -- ${PPTPD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping pptpd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/pptpd.pid
+	result=$?
+	start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/pptpctrl
+	result=$(( $result + $? ))
+	eend $result
+}

kernel/driver/pptp.c

@@ -31,7 +31,6 @@
 #include <linux/netfilter_ipv4.h>
 #include <linux/version.h>
 #include <linux/spinlock.h>
-#include <linux/kthread.h>
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 #include <linux/tqueue.h>
@@ -51,7 +50,7 @@
 
 #define DEBUG
 
-#define PPTP_DRIVER_VERSION "0.8.5-rc1"
+#define PPTP_DRIVER_VERSION "0.8.4"
 
 MODULE_DESCRIPTION("Point-to-Point Tunneling Protocol for Linux");
 MODULE_AUTHOR("Kozlov D. (xeb@mail.ru)");
@@ -59,29 +58,18 @@ MODULE_LICENSE("GPL");
 
 static int log_level=0;
 static int log_packets=10;
-static int smp_affinity=0xffffffff;
 
 #define MAX_CALLID 65535
 
 static unsigned long *callid_bitmap=NULL;
 static struct pppox_sock **callid_sock=NULL;
 
-struct task_struct **thread_list=NULL;
-static struct sk_buff_head rxq;
-static struct sk_buff_head txq;
-static DEFINE_SPINLOCK(rxq_lock);
-static DEFINE_SPINLOCK(txq_lock);
-static DECLARE_WAIT_QUEUE_HEAD(rxq_wait);
-static DECLARE_WAIT_QUEUE_HEAD(txq_wait);
-
-
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 MODULE_PARM(log_level,"i");
 MODULE_PARM(log_packets,"i");
 #else
 module_param(log_level,int,0);
 module_param(log_packets,int,0);
-module_param(smp_affinity,int,0);
 #endif
 MODULE_PARM_DESC(log_level,"Logging level (default=0)");
 
@@ -488,14 +476,18 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
 	#endif
 
 	nf_reset(skb);
+
 	skb->ip_summed = CHECKSUM_NONE;
 	ip_select_ident(iph, &rt->u.dst, NULL);
 	ip_send_check(iph);
-	
-	spin_lock_bh(&txq_lock);
-	skb_queue_tail(&txq,skb);
-	spin_unlock_bh(&txq_lock);
-	wake_up(&txq_wait);
+
+	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+ 	err = NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, skb, NULL, rt->u.dst.dev, ip_send);
+	#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
+ 	err = NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, skb, NULL, rt->u.dst.dev, dst_output);
+ 	#else
+ 	err = ip_local_out(skb);
+ 	#endif
 
 tx_error:
 	return 1;
@@ -690,15 +682,6 @@ drop:
 	return NET_RX_DROP;
 }
 
-static int __pptp_rcv(struct sk_buff *skb)
-{
-	spin_lock_bh(&rxq_lock);
-	skb_queue_tail(&rxq,skb);
-	spin_unlock_bh(&rxq_lock);
-	wake_up(&rxq_wait);
-	return NET_RX_SUCCESS;
-}
-
 static int pptp_bind(struct socket *sock,struct sockaddr *uservaddr,int sockaddr_len)
 {
 	struct sock *sk = sock->sk;
@@ -1079,77 +1062,23 @@ static struct pppox_proto pppox_pptp_proto = {
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 static struct inet_protocol net_pptp_protocol = {
-	.handler	= __pptp_rcv,
+	.handler	= pptp_rcv,
 	//.err_handler	=	pptp_err,
 	.protocol = IPPROTO_GRE,
 	.name     = "PPTP",
 };
 #else
 static struct net_protocol net_pptp_protocol = {
-	.handler	= __pptp_rcv,
+	.handler	= pptp_rcv,
 	//.err_handler	=	pptp_err,
 };
 #endif
 
-static int worker_thread_rx(void*p)
-{
-	struct sk_buff *skb;
-	DEFINE_WAIT(wait);
-
-	set_user_nice(current,-5);
-
-	while(1) {
-		prepare_to_wait(&rxq_wait,&wait,TASK_UNINTERRUPTIBLE);
-		spin_lock_bh(&rxq_lock);
-		skb=skb_dequeue(&rxq);
-		spin_unlock_bh(&rxq_lock);
-		if (skb) pptp_rcv(skb);
-		else if (kthread_should_stop()) return 0;
-		else schedule();
-		finish_wait(&rxq_wait,&wait);
-	}
-}
-
-static int worker_thread_tx(void*p)
-{
-	struct sk_buff *skb;
-	DEFINE_WAIT(wait);
-
-	set_user_nice(current,-5);
-
-	while(1) {
-		prepare_to_wait(&txq_wait,&wait,TASK_UNINTERRUPTIBLE);
-		spin_lock_bh(&txq_lock);
-		skb=skb_dequeue(&txq);
-		spin_unlock_bh(&txq_lock);
-		if (skb){
-			#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-		 	NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, skb, NULL, skb->dst.dev, ip_send);
-			#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
-		 	NF_HOOK(PF_INET, NF_IP_LOCAL_OUT, skb, NULL, skb->dst.dev, dst_output);
-		 	#else
-		 	ip_local_out(skb);
-		 	#endif
-		}else if (kthread_should_stop()) return 0;
-		else schedule();
-		finish_wait(&txq_wait,&wait);
-	}
-}
-
 static int pptp_init_module(void)
 {
 	int err=0;
-	int i;
-	struct task_struct *t;
-
 	printk(KERN_INFO "PPTP driver version " PPTP_DRIVER_VERSION "\n");
 
-	skb_queue_head_init(&rxq);
-	skb_queue_head_init(&txq);
-
-	thread_list=kzalloc(num_present_cpus()*sizeof(*thread_list)*2,GFP_KERNEL);
-	if (!thread_list) return -ENOMEM;
-
 	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 	inet_add_protocol(&net_pptp_protocol);
 	#else
@@ -1173,74 +1102,31 @@ static int pptp_init_module(void)
 		goto out_unregister_sk_proto;
 	}
 	
+	
 	//assuming PAGESIZE is 4096 bytes
 	callid_bitmap=(unsigned long*)__get_free_pages(GFP_KERNEL,1);
-	if (!callid_bitmap){
-		err=-ENOMEM;
-		goto out_unregister_pppox_proto;
-	}
 	memset(callid_bitmap,0,PAGE_SIZE<<1);
 
 	#if (BITS_PER_LONG == 32)
 	callid_sock=(struct pppox_sock **)__get_free_pages(GFP_KERNEL,6);
-	if (!callid_sock) {
-    free_pages((unsigned long)callid_sock,6);
-		err=-ENOMEM;
-		goto out_unregister_pppox_proto;
-	}
 	memset(callid_sock,0,PAGE_SIZE<<6);
 	#elif (BITS_PER_LONG == 64)
-  callid_sock=(struct pppox_sock **)__get_free_pages(GFP_KERNEL,7);
-	if (!callid_sock) {
-    free_pages((unsigned long)callid_sock,7);
-		err=-ENOMEM;
-		goto out_unregister_pppox_proto;
-	}
-  memset(callid_sock,0,PAGE_SIZE<<7);
-  #else
-  #error unknown size of LONG
-  #endif
-
-	for(i=0; i<num_present_cpus(); i++){
-		if (smp_affinity&(1<<i)) {
-			t=kthread_create(worker_thread_rx,NULL,"%s-%d","pptp-rx",i);
-			if (IS_ERR(t)){
-				kfree(t);
-				goto out_threads;
-			}
-			kthread_bind(t,i);
-			wake_up_process(t);
-			thread_list[i*2]=t;
-
-			t=kthread_create(worker_thread_tx,NULL,"%s-%d","pptp-tx",i);
-			if (IS_ERR(t)){
-				kfree(t);
-				goto out_threads;
-			}
-			kthread_bind(t,i);
-			wake_up_process(t);
-			thread_list[i*2+1]=t;
-		}
-	}
+        callid_sock=(struct pppox_sock **)__get_free_pages(GFP_KERNEL,7);
+        memset(callid_sock,0,PAGE_SIZE<<7);
+        #else
+        #error unknown size of LONG
+        #endif
 
 out:
 	return err;
-out_threads:
-	for(i=0; i<num_present_cpus()*2; i++)
-		if (thread_list[i]){
-			kthread_stop(thread_list[i]);
-			kfree(thread_list[i]);
-		}
-out_unregister_pppox_proto:
-	unregister_pppox_proto(PX_PROTO_PPTP);
 out_unregister_sk_proto:
 	#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
 	proto_unregister(&pptp_sk_proto);
 	#endif
 
-	#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
 out_inet_del_protocol:
-	#endif
+#endif
 
 	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 	inet_del_protocol(&net_pptp_protocol);
@@ -1251,23 +1137,7 @@ out_inet_del_protocol:
 }
 
 static void pptp_exit_module(void)
-{	
-	int i;
-
-	spin_lock_bh(&rxq_lock);
-	skb_queue_purge(&rxq);
-	spin_unlock_bh(&rxq_lock);
-	
-	spin_lock_bh(&txq_lock);
-	skb_queue_purge(&txq);
-	spin_unlock_bh(&txq_lock);
-
-	for(i=0; i<num_present_cpus()*2; i++)
-		if (thread_list[i]){
-			kthread_stop(thread_list[i]);
-			kfree(thread_list[i]);
-		}
-
+{
 	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 	flush_scheduled_tasks();
 	#else

pppd_plugin/configure

@@ -2236,7 +2236,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=pptp
- VERSION=0.8.5-rc1
+ VERSION=0.8.4
 
 
 cat >>confdefs.h <<_ACEOF

pppd_plugin/configure.in

 AC_INIT(configure.in)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(pptp,0.8.5-rc1)
+AM_INIT_AUTOMAKE(pptp,0.8.4)
 
 AC_LANG_C
 AC_PROG_CC

pptpd-1.3.3/configure

@@ -2043,7 +2043,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=pptpd
- VERSION=0.8.5-rc1
+ VERSION=0.8.4
 
 
 cat >>confdefs.h <<_ACEOF

pptpd-1.3.3/configure.in

 AC_INIT(configure.in)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(pptpd,0.8.5-rc1)
+AM_INIT_AUTOMAKE(pptpd,0.8.4)
 
 AC_DEFINE(BCRELAY,[],"Enable Broadcast Relay")
 AC_DEFINE(PPPD_VERSION,[],"PPPD version")

pptpd-1.3.3/pptpd.c

@@ -152,7 +152,7 @@ int main(int argc, char **argv)
 
 	/* open a connection to the syslog daemon */
 	openlog("pptpd", LOG_PID, PPTP_FACILITY);
-	//syslog(LOG_ERR, "MGR: Config file not found!");
+	syslog(LOG_ERR, "MGR: Config file not found!");
 
 	/* process command line options */
 	while (1) {