[Netnice-commitlog] netnice : linux-netnice/net Kconfig,1.1.1.1,1.1.1.1.2.1 Makefile,1.1.1.1,1.1.1.1
Status: Alpha
Brought to you by:
taost6
Menu
▾
▴
[Netnice-commitlog] netnice : linux-netnice/net Kconfig,1.1.1.1,1.1.1.1.2.1 Makefile,1.1.1.1,1.1.1.1.2.1 socket.c,1.1.1.1,1.1.1.1.2.1 sysctl_net.c,1.1.1.1,1.1.1.1.2.1
|
From: bhatt k. m. <rou...@us...> - 2006-02-16 13:12:15
|
Update of /cvsroot/netnice/linux-netnice/net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19888/net Modified Files: Tag: patch1 Kconfig Makefile socket.c sysctl_net.c Log Message: patch1 initial netnice patch applied to linux kernel version 2.6.15. developers please do not commit to the main branch directly. keep it clean. create separate branches for experimental patches. the procedure is cvs co linux-netnice [hack hack & hack till you are satisfied] //create a tag cvs tag -b "tag-name" cvs update -r "tag-name" cvs commit this way you won't end up commiting to the main tree thanks --Kartikey BHATT Index: Makefile =================================================================== RCS file: /cvsroot/netnice/linux-netnice/net/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -d -r1.1.1.1 -r1.1.1.1.2.1 --- Makefile 16 Feb 2006 11:06:28 -0000 1.1.1.1 +++ Makefile 16 Feb 2006 13:11:50 -0000 1.1.1.1.2.1 @@ -22,6 +22,7 @@ ifneq ($(CONFIG_IPV6),) obj-y += ipv6/ endif +obj-$(CONFIG_NETNICE) += netnice/ obj-$(CONFIG_PACKET) += packet/ obj-$(CONFIG_NET_KEY) += key/ obj-$(CONFIG_NET_SCHED) += sched/ Index: Kconfig =================================================================== RCS file: /cvsroot/netnice/linux-netnice/net/Kconfig,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -d -r1.1.1.1 -r1.1.1.1.2.1 --- Kconfig 16 Feb 2006 11:06:28 -0000 1.1.1.1 +++ Kconfig 16 Feb 2006 13:11:50 -0000 1.1.1.1.2.1 @@ -59,6 +59,14 @@ endif # if INET +config NETNICE + bool "Netnice for linux" + ---help--- + Experimental traffic shaper which exposes its control API + through a pseudo file system called NNFS (NetNice FileSystem). + + If unsure, say N. + menuconfig NETFILTER bool "Network packet filtering (replaces ipchains)" ---help--- Index: socket.c =================================================================== RCS file: /cvsroot/netnice/linux-netnice/net/socket.c,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -d -r1.1.1.1 -r1.1.1.1.2.1 --- socket.c 16 Feb 2006 11:06:29 -0000 1.1.1.1 +++ socket.c 16 Feb 2006 13:11:50 -0000 1.1.1.1.2.1 @@ -89,6 +89,10 @@ #include <linux/wireless.h> /* Note : will define WIRELESS_EXT */ #endif /* CONFIG_NET_RADIO */ +#ifdef CONFIG_NETNICE +#include <linux/vif.h> +#endif + #include <asm/uaccess.h> #include <asm/unistd.h> @@ -290,8 +294,11 @@ ei->socket.ops = NULL; ei->socket.sk = NULL; ei->socket.file = NULL; - ei->socket.flags = 0; - + ei->socket.flags = 0; +#ifdef CONFIG_NETNICE + ei->socket.so_vifnet = NULL; +#endif + return &ei->vfs_inode; } @@ -475,6 +482,9 @@ return NULL; sock = SOCKET_I(inode); +#ifdef CONFIG_NETNICE + sock->so_vifnet = NULL; +#endif inode->i_mode = S_IFSOCK|S_IRWXUGO; inode->i_uid = current->fsuid; @@ -523,6 +533,13 @@ if (sock->fasync_list) printk(KERN_ERR "sock_release: fasync list not empty!\n"); +#ifdef CONFIG_NETNICE + if (sock->so_vifnet) { + pvif_rmall(sock->so_vifnet); + sock->so_vifnet = NULL; + } +#endif + get_cpu_var(sockets_in_use)--; put_cpu_var(sockets_in_use); if (!sock->file) { @@ -1137,6 +1154,10 @@ sock->type = type; +#ifdef CONFIG_NETNICE + sock->so_vifnet = vif_cpvif((struct pvifnet *)current->p_vifnet); +#endif + /* * We will call the ->create function, that possibly is in a loadable * module, so we have to bump that loadable module refcnt first. @@ -1394,6 +1415,10 @@ security_socket_post_accept(sock, newsock); +#ifdef CONFIG_NETNICE + newsock->so_vifnet = vif_cpvif((struct pvifnet *)sock->so_vifnet); +#endif + out_put: sockfd_put(sock); out: @@ -1433,6 +1458,10 @@ if (err) goto out_put; +#ifdef CONFIG_NETNICE + sock->so_vifnet = vif_cpvif((struct pvifnet *)current->p_vifnet); +#endif + err = sock->ops->connect(sock, (struct sockaddr *) address, addrlen, sock->file->f_flags); out_put: Index: sysctl_net.c =================================================================== RCS file: /cvsroot/netnice/linux-netnice/net/sysctl_net.c,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -d -r1.1.1.1 -r1.1.1.1.2.1 --- sysctl_net.c 16 Feb 2006 11:06:28 -0000 1.1.1.1 +++ sysctl_net.c 16 Feb 2006 13:11:50 -0000 1.1.1.1.2.1 @@ -5,6 +5,29 @@ * Added /proc/sys/net directories for each protocol family. [MS] * * $Log$ + * Revision 1.1.1.1.2.1 2006/02/16 13:11:50 route810 + * patch1 + * + * initial netnice patch applied to linux kernel version 2.6.15. + * developers please do not commit to the main branch directly. + * keep it clean. + * + * create separate branches for experimental patches. + * + * the procedure is + * + * cvs co linux-netnice + * [hack hack & hack till you are satisfied] + * //create a tag + * cvs tag -b "tag-name" + * cvs update -r "tag-name" + * cvs commit + * + * this way you won't end up commiting to the main tree + * + * thanks + * --Kartikey BHATT + * * Revision 1.1.1.1 2006/02/16 11:06:28 route810 * Setting up a decent HACKING environment for Linux. * This is an initial import of Linux Kernel v 2.6.15. @@ -36,6 +59,10 @@ #include <linux/if_tr.h> #endif +#ifdef CONFIG_NETNICE +extern struct ctl_table netnice_table[]; +#endif + struct ctl_table net_table[] = { { .ctl_name = NET_CORE, @@ -59,6 +86,14 @@ .child = ipv4_table }, #endif +#ifdef CONFIG_NETNICE + { + .ctl_name = NET_NETNICE, + .procname = "netnice", + .mode = 0555, + .child = netnice_table + }, +#endif #ifdef CONFIG_TR { .ctl_name = NET_TR, |