[RAMEN9610-9352][MODAP-10498][COMMON] drivers: net: add pptp files
authorNamhyung Kim <nh78.kim@samsung.com>
Tue, 30 Oct 2018 11:08:09 +0000 (20:08 +0900)
committerhskang <hs1218.kang@samsung.com>
Tue, 11 Dec 2018 08:38:04 +0000 (17:38 +0900)
Change-Id: Ie2a406146d11403dd87233f2e972fca5ad991a6d
Signed-off-by: Namhyung Kim <nh78.kim@samsung.com>
drivers/net/ppp/Kconfig
drivers/net/ppp/Makefile
drivers/net/ppp/pppolac.c [new file with mode: 0644]
drivers/net/ppp/pppopns.c [new file with mode: 0644]
include/linux/if_pppolac.h [new file with mode: 0644]
include/linux/if_pppopns.h [new file with mode: 0644]
include/linux/if_pppox.h
include/uapi/linux/if_pppolac.h [new file with mode: 0644]
include/uapi/linux/if_pppopns.h [new file with mode: 0644]
include/uapi/linux/if_pppox.h

index 1373c6d7278d84dbcfb84a936745e01d8273aa44..282aec4860ebe56b6097a3d6a20da7725c103e2c 100644 (file)
@@ -149,6 +149,23 @@ config PPPOL2TP
          tunnels. L2TP is replacing PPTP for VPN uses.
 if TTY
 
+config PPPOLAC
+       tristate "PPP on L2TP Access Concentrator"
+       depends on PPP && INET
+       help
+         L2TP (RFC 2661) is a tunneling protocol widely used in virtual private
+         networks. This driver handles L2TP data packets between a UDP socket
+         and a PPP channel, but only permits one session per socket. Thus it is
+         fairly simple and suited for clients.
+
+config PPPOPNS
+       tristate "PPP on PPTP Network Server"
+       depends on PPP && INET
+       help
+         PPTP (RFC 2637) is a tunneling protocol widely used in virtual private
+         networks. This driver handles PPTP data packets between a RAW socket
+         and a PPP channel. It is fairly simple and easy to use.
+
 config PPP_ASYNC
        tristate "PPP support for async serial ports"
        depends on PPP
index 16c457d6b3244cd579897074d91749421b449f42..879e1663dd48801e95bcbdf9631a06d450a55b5a 100644 (file)
@@ -12,3 +12,5 @@ obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
 obj-$(CONFIG_PPPOE) += pppox.o pppoe.o
 obj-$(CONFIG_PPPOL2TP) += pppox.o
 obj-$(CONFIG_PPTP) += pppox.o pptp.o
+obj-$(CONFIG_PPPOLAC) += pppox.o pppolac.o
+obj-$(CONFIG_PPPOPNS) += pppox.o pppopns.o
diff --git a/drivers/net/ppp/pppolac.c b/drivers/net/ppp/pppolac.c
new file mode 100644 (file)
index 0000000..95cc6be
--- /dev/null
@@ -0,0 +1,450 @@
+/* drivers/net/pppolac.c
+ *
+ * Driver for PPP on L2TP Access Concentrator / PPPoLAC Socket (RFC 2661)
+ *
+ * Copyright (C) 2009 Google, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+/* This driver handles L2TP data packets between a UDP socket and a PPP channel.
+ * The socket must keep connected, and only one session per socket is permitted.
+ * Sequencing of outgoing packets is controlled by LNS. Incoming packets with
+ * sequences are reordered within a sliding window of one second. Currently
+ * reordering only happens when a packet is received. It is done for simplicity
+ * since no additional locks or threads are required. This driver only works on
+ * IPv4 due to the lack of UDP encapsulation support in IPv6. */
+
+#include <linux/module.h>
+#include <linux/jiffies.h>
+#include <linux/workqueue.h>
+#include <linux/skbuff.h>
+#include <linux/file.h>
+#include <linux/netdevice.h>
+#include <linux/net.h>
+#include <linux/udp.h>
+#include <linux/ppp_defs.h>
+#include <linux/if_ppp.h>
+#include <linux/if_pppox.h>
+#include <linux/ppp_channel.h>
+#include <net/tcp_states.h>
+#include <asm/uaccess.h>
+
+#define L2TP_CONTROL_BIT       0x80
+#define L2TP_LENGTH_BIT                0x40
+#define L2TP_SEQUENCE_BIT      0x08
+#define L2TP_OFFSET_BIT                0x02
+#define L2TP_VERSION           0x02
+#define L2TP_VERSION_MASK      0x0F
+
+#define PPP_ADDR       0xFF
+#define PPP_CTRL       0x03
+
+union unaligned {
+       __u32 u32;
+} __attribute__((packed));
+
+static inline union unaligned *unaligned(void *ptr)
+{
+       return (union unaligned *)ptr;
+}
+
+struct meta {
+       __u32 sequence;
+       __u32 timestamp;
+};
+
+static inline struct meta *skb_meta(struct sk_buff *skb)
+{
+       return (struct meta *)skb->cb;
+}
+
+/******************************************************************************/
+
+static int pppolac_recv_core(struct sock *sk_udp, struct sk_buff *skb)
+{
+       struct sock *sk = (struct sock *)sk_udp->sk_user_data;
+       struct pppolac_opt *opt = &pppox_sk(sk)->proto.lac;
+       struct meta *meta = skb_meta(skb);
+       __u32 now = jiffies;
+       __u8 bits;
+       __u8 *ptr;
+
+       /* Drop the packet if L2TP header is missing. */
+       if (skb->len < sizeof(struct udphdr) + 6)
+               goto drop;
+
+       /* Put it back if it is a control packet. */
+       if (skb->data[sizeof(struct udphdr)] & L2TP_CONTROL_BIT)
+               return opt->backlog_rcv(sk_udp, skb);
+
+       /* Skip UDP header. */
+       skb_pull(skb, sizeof(struct udphdr));
+
+       /* Check the version. */
+       if ((skb->data[1] & L2TP_VERSION_MASK) != L2TP_VERSION)
+               goto drop;
+       bits = skb->data[0];
+       ptr = &skb->data[2];
+
+       /* Check the length if it is present. */
+       if (bits & L2TP_LENGTH_BIT) {
+               if ((ptr[0] << 8 | ptr[1]) != skb->len)
+                       goto drop;
+               ptr += 2;
+       }
+
+       /* Skip all fields including optional ones. */
+       if (!skb_pull(skb, 6 + (bits & L2TP_SEQUENCE_BIT ? 4 : 0) +
+                       (bits & L2TP_LENGTH_BIT ? 2 : 0) +
+                       (bits & L2TP_OFFSET_BIT ? 2 : 0)))
+               goto drop;
+
+       /* Skip the offset padding if it is present. */
+       if (bits & L2TP_OFFSET_BIT &&
+                       !skb_pull(skb, skb->data[-2] << 8 | skb->data[-1]))
+               goto drop;
+
+       /* Check the tunnel and the session. */
+       if (unaligned(ptr)->u32 != opt->local)
+               goto drop;
+
+       /* Check the sequence if it is present. */
+       if (bits & L2TP_SEQUENCE_BIT) {
+               meta->sequence = ptr[4] << 8 | ptr[5];
+               if ((__s16)(meta->sequence - opt->recv_sequence) < 0)
+                       goto drop;
+       }
+
+       /* Skip PPP address and control if they are present. */
+       if (skb->len >= 2 && skb->data[0] == PPP_ADDR &&
+                       skb->data[1] == PPP_CTRL)
+               skb_pull(skb, 2);
+
+       /* Fix PPP protocol if it is compressed. */
+       if (skb->len >= 1 && skb->data[0] & 1)
+               *(u8 *)skb_push(skb, 1) = 0;
+
+       /* Drop the packet if PPP protocol is missing. */
+       if (skb->len < 2)
+               goto drop;
+
+       /* Perform reordering if sequencing is enabled. */
+       atomic_set(&opt->sequencing, bits & L2TP_SEQUENCE_BIT);
+       if (bits & L2TP_SEQUENCE_BIT) {
+               struct sk_buff *skb1;
+
+               /* Insert the packet into receive queue in order. */
+               skb_set_owner_r(skb, sk);
+               skb_queue_walk(&sk->sk_receive_queue, skb1) {
+                       struct meta *meta1 = skb_meta(skb1);
+                       __s16 order = meta->sequence - meta1->sequence;
+                       if (order == 0)
+                               goto drop;
+                       if (order < 0) {
+                               meta->timestamp = meta1->timestamp;
+                               skb_insert(skb1, skb, &sk->sk_receive_queue);
+                               skb = NULL;
+                               break;
+                       }
+               }
+               if (skb) {
+                       meta->timestamp = now;
+                       skb_queue_tail(&sk->sk_receive_queue, skb);
+               }
+
+               /* Remove packets from receive queue as long as
+                * 1. the receive buffer is full,
+                * 2. they are queued longer than one second, or
+                * 3. there are no missing packets before them. */
+               skb_queue_walk_safe(&sk->sk_receive_queue, skb, skb1) {
+                       meta = skb_meta(skb);
+                       if (atomic_read(&sk->sk_rmem_alloc) < sk->sk_rcvbuf &&
+                                       now - meta->timestamp < HZ &&
+                                       meta->sequence != opt->recv_sequence)
+                               break;
+                       skb_unlink(skb, &sk->sk_receive_queue);
+                       opt->recv_sequence = (__u16)(meta->sequence + 1);
+                       skb_orphan(skb);
+                       ppp_input(&pppox_sk(sk)->chan, skb);
+               }
+               return NET_RX_SUCCESS;
+       }
+
+       /* Flush receive queue if sequencing is disabled. */
+       skb_queue_purge(&sk->sk_receive_queue);
+       skb_orphan(skb);
+       ppp_input(&pppox_sk(sk)->chan, skb);
+       return NET_RX_SUCCESS;
+drop:
+       kfree_skb(skb);
+       return NET_RX_DROP;
+}
+
+static int pppolac_recv(struct sock *sk_udp, struct sk_buff *skb)
+{
+       sock_hold(sk_udp);
+       sk_receive_skb(sk_udp, skb, 0);
+       return 0;
+}
+
+static struct sk_buff_head delivery_queue;
+
+static void pppolac_xmit_core(struct work_struct *delivery_work)
+{
+       mm_segment_t old_fs = get_fs();
+       struct sk_buff *skb;
+
+       set_fs(KERNEL_DS);
+       while ((skb = skb_dequeue(&delivery_queue))) {
+               struct sock *sk_udp = skb->sk;
+               struct kvec iov = {.iov_base = skb->data, .iov_len = skb->len};
+               struct msghdr msg = {
+                       .msg_flags = MSG_NOSIGNAL | MSG_DONTWAIT,
+               };
+
+               iov_iter_kvec(&msg.msg_iter, WRITE | ITER_KVEC, &iov, 1,
+                             skb->len);
+               sk_udp->sk_prot->sendmsg(sk_udp, &msg, skb->len);
+               kfree_skb(skb);
+       }
+       set_fs(old_fs);
+}
+
+static DECLARE_WORK(delivery_work, pppolac_xmit_core);
+
+static int pppolac_xmit(struct ppp_channel *chan, struct sk_buff *skb)
+{
+       struct sock *sk_udp = (struct sock *)chan->private;
+       struct pppolac_opt *opt = &pppox_sk(sk_udp->sk_user_data)->proto.lac;
+
+       /* Install PPP address and control. */
+       skb_push(skb, 2);
+       skb->data[0] = PPP_ADDR;
+       skb->data[1] = PPP_CTRL;
+
+       /* Install L2TP header. */
+       if (atomic_read(&opt->sequencing)) {
+               skb_push(skb, 10);
+               skb->data[0] = L2TP_SEQUENCE_BIT;
+               skb->data[6] = opt->xmit_sequence >> 8;
+               skb->data[7] = opt->xmit_sequence;
+               skb->data[8] = 0;
+               skb->data[9] = 0;
+               opt->xmit_sequence++;
+       } else {
+               skb_push(skb, 6);
+               skb->data[0] = 0;
+       }
+       skb->data[1] = L2TP_VERSION;
+       unaligned(&skb->data[2])->u32 = opt->remote;
+
+       /* Now send the packet via the delivery queue. */
+       skb_set_owner_w(skb, sk_udp);
+       skb_queue_tail(&delivery_queue, skb);
+       schedule_work(&delivery_work);
+       return 1;
+}
+
+/******************************************************************************/
+
+static struct ppp_channel_ops pppolac_channel_ops = {
+       .start_xmit = pppolac_xmit,
+};
+
+static int pppolac_connect(struct socket *sock, struct sockaddr *useraddr,
+       int addrlen, int flags)
+{
+       struct sock *sk = sock->sk;
+       struct pppox_sock *po = pppox_sk(sk);
+       struct sockaddr_pppolac *addr = (struct sockaddr_pppolac *)useraddr;
+       struct socket *sock_udp = NULL;
+       struct sock *sk_udp;
+       int error;
+
+       if (addrlen != sizeof(struct sockaddr_pppolac) ||
+                       !addr->local.tunnel || !addr->local.session ||
+                       !addr->remote.tunnel || !addr->remote.session) {
+               return -EINVAL;
+       }
+
+       lock_sock(sk);
+       error = -EALREADY;
+       if (sk->sk_state != PPPOX_NONE)
+               goto out;
+
+       sock_udp = sockfd_lookup(addr->udp_socket, &error);
+       if (!sock_udp)
+               goto out;
+       sk_udp = sock_udp->sk;
+       lock_sock(sk_udp);
+
+       /* Remove this check when IPv6 supports UDP encapsulation. */
+       error = -EAFNOSUPPORT;
+       if (sk_udp->sk_family != AF_INET)
+               goto out;
+       error = -EPROTONOSUPPORT;
+       if (sk_udp->sk_protocol != IPPROTO_UDP)
+               goto out;
+       error = -EDESTADDRREQ;
+       if (sk_udp->sk_state != TCP_ESTABLISHED)
+               goto out;
+       error = -EBUSY;
+       if (udp_sk(sk_udp)->encap_type || sk_udp->sk_user_data)
+               goto out;
+       if (!sk_udp->sk_bound_dev_if) {
+               struct dst_entry *dst = sk_dst_get(sk_udp);
+               error = -ENODEV;
+               if (!dst)
+                       goto out;
+               sk_udp->sk_bound_dev_if = dst->dev->ifindex;
+               dst_release(dst);
+       }
+
+       po->chan.hdrlen = 12;
+       po->chan.private = sk_udp;
+       po->chan.ops = &pppolac_channel_ops;
+       po->chan.mtu = PPP_MRU - 80;
+       po->proto.lac.local = unaligned(&addr->local)->u32;
+       po->proto.lac.remote = unaligned(&addr->remote)->u32;
+       atomic_set(&po->proto.lac.sequencing, 1);
+       po->proto.lac.backlog_rcv = sk_udp->sk_backlog_rcv;
+
+       error = ppp_register_channel(&po->chan);
+       if (error)
+               goto out;
+
+       sk->sk_state = PPPOX_CONNECTED;
+       udp_sk(sk_udp)->encap_type = UDP_ENCAP_L2TPINUDP;
+       udp_sk(sk_udp)->encap_rcv = pppolac_recv;
+       sk_udp->sk_backlog_rcv = pppolac_recv_core;
+       sk_udp->sk_user_data = sk;
+out:
+       if (sock_udp) {
+               release_sock(sk_udp);
+               if (error)
+                       sockfd_put(sock_udp);
+       }
+       release_sock(sk);
+       return error;
+}
+
+static int pppolac_release(struct socket *sock)
+{
+       struct sock *sk = sock->sk;
+
+       if (!sk)
+               return 0;
+
+       lock_sock(sk);
+       if (sock_flag(sk, SOCK_DEAD)) {
+               release_sock(sk);
+               return -EBADF;
+       }
+
+       if (sk->sk_state != PPPOX_NONE) {
+               struct sock *sk_udp = (struct sock *)pppox_sk(sk)->chan.private;
+               lock_sock(sk_udp);
+               skb_queue_purge(&sk->sk_receive_queue);
+               pppox_unbind_sock(sk);
+               udp_sk(sk_udp)->encap_type = 0;
+               udp_sk(sk_udp)->encap_rcv = NULL;
+               sk_udp->sk_backlog_rcv = pppox_sk(sk)->proto.lac.backlog_rcv;
+               sk_udp->sk_user_data = NULL;
+               release_sock(sk_udp);
+               sockfd_put(sk_udp->sk_socket);
+       }
+
+       sock_orphan(sk);
+       sock->sk = NULL;
+       release_sock(sk);
+       sock_put(sk);
+       return 0;
+}
+
+/******************************************************************************/
+
+static struct proto pppolac_proto = {
+       .name = "PPPOLAC",
+       .owner = THIS_MODULE,
+       .obj_size = sizeof(struct pppox_sock),
+};
+
+static struct proto_ops pppolac_proto_ops = {
+       .family = PF_PPPOX,
+       .owner = THIS_MODULE,
+       .release = pppolac_release,
+       .bind = sock_no_bind,
+       .connect = pppolac_connect,
+       .socketpair = sock_no_socketpair,
+       .accept = sock_no_accept,
+       .getname = sock_no_getname,
+       .poll = sock_no_poll,
+       .ioctl = pppox_ioctl,
+       .listen = sock_no_listen,
+       .shutdown = sock_no_shutdown,
+       .setsockopt = sock_no_setsockopt,
+       .getsockopt = sock_no_getsockopt,
+       .sendmsg = sock_no_sendmsg,
+       .recvmsg = sock_no_recvmsg,
+       .mmap = sock_no_mmap,
+};
+
+static int pppolac_create(struct net *net, struct socket *sock, int kern)
+{
+       struct sock *sk;
+
+       sk = sk_alloc(net, PF_PPPOX, GFP_KERNEL, &pppolac_proto, kern);
+       if (!sk)
+               return -ENOMEM;
+
+       sock_init_data(sock, sk);
+       sock->state = SS_UNCONNECTED;
+       sock->ops = &pppolac_proto_ops;
+       sk->sk_protocol = PX_PROTO_OLAC;
+       sk->sk_state = PPPOX_NONE;
+       return 0;
+}
+
+/******************************************************************************/
+
+static struct pppox_proto pppolac_pppox_proto = {
+       .create = pppolac_create,
+       .owner = THIS_MODULE,
+};
+
+static int __init pppolac_init(void)
+{
+       int error;
+
+       error = proto_register(&pppolac_proto, 0);
+       if (error)
+               return error;
+
+       error = register_pppox_proto(PX_PROTO_OLAC, &pppolac_pppox_proto);
+       if (error)
+               proto_unregister(&pppolac_proto);
+       else
+               skb_queue_head_init(&delivery_queue);
+       return error;
+}
+
+static void __exit pppolac_exit(void)
+{
+       unregister_pppox_proto(PX_PROTO_OLAC);
+       proto_unregister(&pppolac_proto);
+}
+
+module_init(pppolac_init);
+module_exit(pppolac_exit);
+
+MODULE_DESCRIPTION("PPP on L2TP Access Concentrator (PPPoLAC)");
+MODULE_AUTHOR("Chia-chi Yeh <chiachi@android.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/ppp/pppopns.c b/drivers/net/ppp/pppopns.c
new file mode 100644 (file)
index 0000000..a01a071
--- /dev/null
@@ -0,0 +1,429 @@
+/* drivers/net/pppopns.c
+ *
+ * Driver for PPP on PPTP Network Server / PPPoPNS Socket (RFC 2637)
+ *
+ * Copyright (C) 2009 Google, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+/* This driver handles PPTP data packets between a RAW socket and a PPP channel.
+ * The socket is created in the kernel space and connected to the same address
+ * of the control socket. Outgoing packets are always sent with sequences but
+ * without acknowledgements. Incoming packets with sequences are reordered
+ * within a sliding window of one second. Currently reordering only happens when
+ * a packet is received. It is done for simplicity since no additional locks or
+ * threads are required. This driver should work on both IPv4 and IPv6. */
+
+#include <linux/module.h>
+#include <linux/jiffies.h>
+#include <linux/workqueue.h>
+#include <linux/skbuff.h>
+#include <linux/file.h>
+#include <linux/netdevice.h>
+#include <linux/net.h>
+#include <linux/ppp_defs.h>
+#include <linux/if.h>
+#include <linux/if_ppp.h>
+#include <linux/if_pppox.h>
+#include <linux/ppp_channel.h>
+#include <asm/uaccess.h>
+
+#define GRE_HEADER_SIZE                8
+
+#define PPTP_GRE_BITS          htons(0x2001)
+#define PPTP_GRE_BITS_MASK     htons(0xEF7F)
+#define PPTP_GRE_SEQ_BIT       htons(0x1000)
+#define PPTP_GRE_ACK_BIT       htons(0x0080)
+#define PPTP_GRE_TYPE          htons(0x880B)
+
+#define PPP_ADDR       0xFF
+#define PPP_CTRL       0x03
+
+struct header {
+       __u16   bits;
+       __u16   type;
+       __u16   length;
+       __u16   call;
+       __u32   sequence;
+} __attribute__((packed));
+
+struct meta {
+       __u32 sequence;
+       __u32 timestamp;
+};
+
+static inline struct meta *skb_meta(struct sk_buff *skb)
+{
+       return (struct meta *)skb->cb;
+}
+
+/******************************************************************************/
+
+static int pppopns_recv_core(struct sock *sk_raw, struct sk_buff *skb)
+{
+       struct sock *sk = (struct sock *)sk_raw->sk_user_data;
+       struct pppopns_opt *opt = &pppox_sk(sk)->proto.pns;
+       struct meta *meta = skb_meta(skb);
+       __u32 now = jiffies;
+       struct header *hdr;
+
+       /* Skip transport header */
+       skb_pull(skb, skb_transport_header(skb) - skb->data);
+
+       /* Drop the packet if GRE header is missing. */
+       if (skb->len < GRE_HEADER_SIZE)
+               goto drop;
+       hdr = (struct header *)skb->data;
+
+       /* Check the header. */
+       if (hdr->type != PPTP_GRE_TYPE || hdr->call != opt->local ||
+                       (hdr->bits & PPTP_GRE_BITS_MASK) != PPTP_GRE_BITS)
+               goto drop;
+
+       /* Skip all fields including optional ones. */
+       if (!skb_pull(skb, GRE_HEADER_SIZE +
+                       (hdr->bits & PPTP_GRE_SEQ_BIT ? 4 : 0) +
+                       (hdr->bits & PPTP_GRE_ACK_BIT ? 4 : 0)))
+               goto drop;
+
+       /* Check the length. */
+       if (skb->len != ntohs(hdr->length))
+               goto drop;
+
+       /* Check the sequence if it is present. */
+       if (hdr->bits & PPTP_GRE_SEQ_BIT) {
+               meta->sequence = ntohl(hdr->sequence);
+               if ((__s32)(meta->sequence - opt->recv_sequence) < 0)
+                       goto drop;
+       }
+
+       /* Skip PPP address and control if they are present. */
+       if (skb->len >= 2 && skb->data[0] == PPP_ADDR &&
+                       skb->data[1] == PPP_CTRL)
+               skb_pull(skb, 2);
+
+       /* Fix PPP protocol if it is compressed. */
+       if (skb->len >= 1 && skb->data[0] & 1)
+               *(u8 *)skb_push(skb, 1) = 0;
+
+       /* Drop the packet if PPP protocol is missing. */
+       if (skb->len < 2)
+               goto drop;
+
+       /* Perform reordering if sequencing is enabled. */
+       if (hdr->bits & PPTP_GRE_SEQ_BIT) {
+               struct sk_buff *skb1;
+
+               /* Insert the packet into receive queue in order. */
+               skb_set_owner_r(skb, sk);
+               skb_queue_walk(&sk->sk_receive_queue, skb1) {
+                       struct meta *meta1 = skb_meta(skb1);
+                       __s32 order = meta->sequence - meta1->sequence;
+                       if (order == 0)
+                               goto drop;
+                       if (order < 0) {
+                               meta->timestamp = meta1->timestamp;
+                               skb_insert(skb1, skb, &sk->sk_receive_queue);
+                               skb = NULL;
+                               break;
+                       }
+               }
+               if (skb) {
+                       meta->timestamp = now;
+                       skb_queue_tail(&sk->sk_receive_queue, skb);
+               }
+
+               /* Remove packets from receive queue as long as
+                * 1. the receive buffer is full,
+                * 2. they are queued longer than one second, or
+                * 3. there are no missing packets before them. */
+               skb_queue_walk_safe(&sk->sk_receive_queue, skb, skb1) {
+                       meta = skb_meta(skb);
+                       if (atomic_read(&sk->sk_rmem_alloc) < sk->sk_rcvbuf &&
+                                       now - meta->timestamp < HZ &&
+                                       meta->sequence != opt->recv_sequence)
+                               break;
+                       skb_unlink(skb, &sk->sk_receive_queue);
+                       opt->recv_sequence = meta->sequence + 1;
+                       skb_orphan(skb);
+                       ppp_input(&pppox_sk(sk)->chan, skb);
+               }
+               return NET_RX_SUCCESS;
+       }
+
+       /* Flush receive queue if sequencing is disabled. */
+       skb_queue_purge(&sk->sk_receive_queue);
+       skb_orphan(skb);
+       ppp_input(&pppox_sk(sk)->chan, skb);
+       return NET_RX_SUCCESS;
+drop:
+       kfree_skb(skb);
+       return NET_RX_DROP;
+}
+
+static void pppopns_recv(struct sock *sk_raw)
+{
+       struct sk_buff *skb;
+       while ((skb = skb_dequeue(&sk_raw->sk_receive_queue))) {
+               sock_hold(sk_raw);
+               sk_receive_skb(sk_raw, skb, 0);
+       }
+}
+
+static struct sk_buff_head delivery_queue;
+
+static void pppopns_xmit_core(struct work_struct *delivery_work)
+{
+       mm_segment_t old_fs = get_fs();
+       struct sk_buff *skb;
+
+       set_fs(KERNEL_DS);
+       while ((skb = skb_dequeue(&delivery_queue))) {
+               struct sock *sk_raw = skb->sk;
+               struct kvec iov = {.iov_base = skb->data, .iov_len = skb->len};
+               struct msghdr msg = {
+                       .msg_flags = MSG_NOSIGNAL | MSG_DONTWAIT,
+               };
+
+               iov_iter_kvec(&msg.msg_iter, WRITE | ITER_KVEC, &iov, 1,
+                             skb->len);
+               sk_raw->sk_prot->sendmsg(sk_raw, &msg, skb->len);
+               kfree_skb(skb);
+       }
+       set_fs(old_fs);
+}
+
+static DECLARE_WORK(delivery_work, pppopns_xmit_core);
+
+static int pppopns_xmit(struct ppp_channel *chan, struct sk_buff *skb)
+{
+       struct sock *sk_raw = (struct sock *)chan->private;
+       struct pppopns_opt *opt = &pppox_sk(sk_raw->sk_user_data)->proto.pns;
+       struct header *hdr;
+       __u16 length;
+
+       /* Install PPP address and control. */
+       skb_push(skb, 2);
+       skb->data[0] = PPP_ADDR;
+       skb->data[1] = PPP_CTRL;
+       length = skb->len;
+
+       /* Install PPTP GRE header. */
+       hdr = (struct header *)skb_push(skb, 12);
+       hdr->bits = PPTP_GRE_BITS | PPTP_GRE_SEQ_BIT;
+       hdr->type = PPTP_GRE_TYPE;
+       hdr->length = htons(length);
+       hdr->call = opt->remote;
+       hdr->sequence = htonl(opt->xmit_sequence);
+       opt->xmit_sequence++;
+
+       /* Now send the packet via the delivery queue. */
+       skb_set_owner_w(skb, sk_raw);
+       skb_queue_tail(&delivery_queue, skb);
+       schedule_work(&delivery_work);
+       return 1;
+}
+
+/******************************************************************************/
+
+static struct ppp_channel_ops pppopns_channel_ops = {
+       .start_xmit = pppopns_xmit,
+};
+
+static int pppopns_connect(struct socket *sock, struct sockaddr *useraddr,
+       int addrlen, int flags)
+{
+       struct sock *sk = sock->sk;
+       struct pppox_sock *po = pppox_sk(sk);
+       struct sockaddr_pppopns *addr = (struct sockaddr_pppopns *)useraddr;
+       struct sockaddr_storage ss;
+       struct socket *sock_tcp = NULL;
+       struct socket *sock_raw = NULL;
+       struct sock *sk_tcp;
+       struct sock *sk_raw;
+       int error;
+
+       if (addrlen != sizeof(struct sockaddr_pppopns))
+               return -EINVAL;
+
+       lock_sock(sk);
+       error = -EALREADY;
+       if (sk->sk_state != PPPOX_NONE)
+               goto out;
+
+       sock_tcp = sockfd_lookup(addr->tcp_socket, &error);
+       if (!sock_tcp)
+               goto out;
+       sk_tcp = sock_tcp->sk;
+       error = -EPROTONOSUPPORT;
+       if (sk_tcp->sk_protocol != IPPROTO_TCP)
+               goto out;
+       addrlen = sizeof(struct sockaddr_storage);
+       error = kernel_getpeername(sock_tcp, (struct sockaddr *)&ss, &addrlen);
+       if (error)
+               goto out;
+       if (!sk_tcp->sk_bound_dev_if) {
+               struct dst_entry *dst = sk_dst_get(sk_tcp);
+               error = -ENODEV;
+               if (!dst)
+                       goto out;
+               sk_tcp->sk_bound_dev_if = dst->dev->ifindex;
+               dst_release(dst);
+       }
+
+       error = sock_create(ss.ss_family, SOCK_RAW, IPPROTO_GRE, &sock_raw);
+       if (error)
+               goto out;
+       sk_raw = sock_raw->sk;
+       sk_raw->sk_bound_dev_if = sk_tcp->sk_bound_dev_if;
+       error = kernel_connect(sock_raw, (struct sockaddr *)&ss, addrlen, 0);
+       if (error)
+               goto out;
+
+       po->chan.hdrlen = 14;
+       po->chan.private = sk_raw;
+       po->chan.ops = &pppopns_channel_ops;
+       po->chan.mtu = PPP_MRU - 80;
+       po->proto.pns.local = addr->local;
+       po->proto.pns.remote = addr->remote;
+       po->proto.pns.data_ready = sk_raw->sk_data_ready;
+       po->proto.pns.backlog_rcv = sk_raw->sk_backlog_rcv;
+
+       error = ppp_register_channel(&po->chan);
+       if (error)
+               goto out;
+
+       sk->sk_state = PPPOX_CONNECTED;
+       lock_sock(sk_raw);
+       sk_raw->sk_data_ready = pppopns_recv;
+       sk_raw->sk_backlog_rcv = pppopns_recv_core;
+       sk_raw->sk_user_data = sk;
+       release_sock(sk_raw);
+out:
+       if (sock_tcp)
+               sockfd_put(sock_tcp);
+       if (error && sock_raw)
+               sock_release(sock_raw);
+       release_sock(sk);
+       return error;
+}
+
+static int pppopns_release(struct socket *sock)
+{
+       struct sock *sk = sock->sk;
+
+       if (!sk)
+               return 0;
+
+       lock_sock(sk);
+       if (sock_flag(sk, SOCK_DEAD)) {
+               release_sock(sk);
+               return -EBADF;
+       }
+
+       if (sk->sk_state != PPPOX_NONE) {
+               struct sock *sk_raw = (struct sock *)pppox_sk(sk)->chan.private;
+               lock_sock(sk_raw);
+               skb_queue_purge(&sk->sk_receive_queue);
+               pppox_unbind_sock(sk);
+               sk_raw->sk_data_ready = pppox_sk(sk)->proto.pns.data_ready;
+               sk_raw->sk_backlog_rcv = pppox_sk(sk)->proto.pns.backlog_rcv;
+               sk_raw->sk_user_data = NULL;
+               release_sock(sk_raw);
+               sock_release(sk_raw->sk_socket);
+       }
+
+       sock_orphan(sk);
+       sock->sk = NULL;
+       release_sock(sk);
+       sock_put(sk);
+       return 0;
+}
+
+/******************************************************************************/
+
+static struct proto pppopns_proto = {
+       .name = "PPPOPNS",
+       .owner = THIS_MODULE,
+       .obj_size = sizeof(struct pppox_sock),
+};
+
+static struct proto_ops pppopns_proto_ops = {
+       .family = PF_PPPOX,
+       .owner = THIS_MODULE,
+       .release = pppopns_release,
+       .bind = sock_no_bind,
+       .connect = pppopns_connect,
+       .socketpair = sock_no_socketpair,
+       .accept = sock_no_accept,
+       .getname = sock_no_getname,
+       .poll = sock_no_poll,
+       .ioctl = pppox_ioctl,
+       .listen = sock_no_listen,
+       .shutdown = sock_no_shutdown,
+       .setsockopt = sock_no_setsockopt,
+       .getsockopt = sock_no_getsockopt,
+       .sendmsg = sock_no_sendmsg,
+       .recvmsg = sock_no_recvmsg,
+       .mmap = sock_no_mmap,
+};
+
+static int pppopns_create(struct net *net, struct socket *sock, int kern)
+{
+       struct sock *sk;
+
+       sk = sk_alloc(net, PF_PPPOX, GFP_KERNEL, &pppopns_proto, kern);
+       if (!sk)
+               return -ENOMEM;
+
+       sock_init_data(sock, sk);
+       sock->state = SS_UNCONNECTED;
+       sock->ops = &pppopns_proto_ops;
+       sk->sk_protocol = PX_PROTO_OPNS;
+       sk->sk_state = PPPOX_NONE;
+       return 0;
+}
+
+/******************************************************************************/
+
+static struct pppox_proto pppopns_pppox_proto = {
+       .create = pppopns_create,
+       .owner = THIS_MODULE,
+};
+
+static int __init pppopns_init(void)
+{
+       int error;
+
+       error = proto_register(&pppopns_proto, 0);
+       if (error)
+               return error;
+
+       error = register_pppox_proto(PX_PROTO_OPNS, &pppopns_pppox_proto);
+       if (error)
+               proto_unregister(&pppopns_proto);
+       else
+               skb_queue_head_init(&delivery_queue);
+       return error;
+}
+
+static void __exit pppopns_exit(void)
+{
+       unregister_pppox_proto(PX_PROTO_OPNS);
+       proto_unregister(&pppopns_proto);
+}
+
+module_init(pppopns_init);
+module_exit(pppopns_exit);
+
+MODULE_DESCRIPTION("PPP on PPTP Network Server (PPPoPNS)");
+MODULE_AUTHOR("Chia-chi Yeh <chiachi@android.com>");
+MODULE_LICENSE("GPL");
diff --git a/include/linux/if_pppolac.h b/include/linux/if_pppolac.h
new file mode 100644 (file)
index 0000000..e40aa10
--- /dev/null
@@ -0,0 +1,23 @@
+/* include/linux/if_pppolac.h
+ *
+ * Header for PPP on L2TP Access Concentrator / PPPoLAC Socket (RFC 2661)
+ *
+ * Copyright (C) 2009 Google, Inc.
+ * Author: Chia-chi Yeh <chiachi@android.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __LINUX_IF_PPPOLAC_H
+#define __LINUX_IF_PPPOLAC_H
+
+#include <uapi/linux/if_pppolac.h>
+
+#endif /* __LINUX_IF_PPPOLAC_H */
diff --git a/include/linux/if_pppopns.h b/include/linux/if_pppopns.h
new file mode 100644 (file)
index 0000000..4ac621a
--- /dev/null
@@ -0,0 +1,23 @@
+/* include/linux/if_pppopns.h
+ *
+ * Header for PPP on PPTP Network Server / PPPoPNS Socket (RFC 2637)
+ *
+ * Copyright (C) 2009 Google, Inc.
+ * Author: Chia-chi Yeh <chiachi@android.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __LINUX_IF_PPPOPNS_H
+#define __LINUX_IF_PPPOPNS_H
+
+#include <uapi/linux/if_pppopns.h>
+
+#endif /* __LINUX_IF_PPPOPNS_H */
index ba7a9b0c7c57e64ef794a55f62330705adbe7267..325727a7096ae0525babccc76ce6a263738d224e 100644 (file)
@@ -43,6 +43,25 @@ struct pptp_opt {
        u32 seq_sent, seq_recv;
        int ppp_flags;
 };
+
+struct pppolac_opt {
+       __u32           local;
+       __u32           remote;
+       __u32           recv_sequence;
+       __u32           xmit_sequence;
+       atomic_t        sequencing;
+       int             (*backlog_rcv)(struct sock *sk_udp, struct sk_buff *skb);
+};
+
+struct pppopns_opt {
+       __u16           local;
+       __u16           remote;
+       __u32           recv_sequence;
+       __u32           xmit_sequence;
+       void            (*data_ready)(struct sock *sk_raw);
+       int             (*backlog_rcv)(struct sock *sk_raw, struct sk_buff *skb);
+};
+
 #include <net/sock.h>
 
 struct pppox_sock {
@@ -53,6 +72,8 @@ struct pppox_sock {
        union {
                struct pppoe_opt pppoe;
                struct pptp_opt  pptp;
+               struct pppolac_opt lac;
+               struct pppopns_opt pns;
        } proto;
        __be16                  num;
 };
diff --git a/include/uapi/linux/if_pppolac.h b/include/uapi/linux/if_pppolac.h
new file mode 100644 (file)
index 0000000..b7eb815
--- /dev/null
@@ -0,0 +1,33 @@
+/* include/uapi/linux/if_pppolac.h
+ *
+ * Header for PPP on L2TP Access Concentrator / PPPoLAC Socket (RFC 2661)
+ *
+ * Copyright (C) 2009 Google, Inc.
+ * Author: Chia-chi Yeh <chiachi@android.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _UAPI_LINUX_IF_PPPOLAC_H
+#define _UAPI_LINUX_IF_PPPOLAC_H
+
+#include <linux/socket.h>
+#include <linux/types.h>
+
+struct sockaddr_pppolac {
+       sa_family_t     sa_family;      /* AF_PPPOX */
+       unsigned int    sa_protocol;    /* PX_PROTO_OLAC */
+       int             udp_socket;
+       struct __attribute__((packed)) {
+               __u16   tunnel, session;
+       } local, remote;
+} __attribute__((packed));
+
+#endif /* _UAPI_LINUX_IF_PPPOLAC_H */
diff --git a/include/uapi/linux/if_pppopns.h b/include/uapi/linux/if_pppopns.h
new file mode 100644 (file)
index 0000000..a392b52
--- /dev/null
@@ -0,0 +1,32 @@
+/* include/uapi/linux/if_pppopns.h
+ *
+ * Header for PPP on PPTP Network Server / PPPoPNS Socket (RFC 2637)
+ *
+ * Copyright (C) 2009 Google, Inc.
+ * Author: Chia-chi Yeh <chiachi@android.com>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _UAPI_LINUX_IF_PPPOPNS_H
+#define _UAPI_LINUX_IF_PPPOPNS_H
+
+#include <linux/socket.h>
+#include <linux/types.h>
+
+struct sockaddr_pppopns {
+       sa_family_t     sa_family;      /* AF_PPPOX */
+       unsigned int    sa_protocol;    /* PX_PROTO_OPNS */
+       int             tcp_socket;
+       __u16           local;
+       __u16           remote;
+} __attribute__((packed));
+
+#endif /* _UAPI_LINUX_IF_PPPOPNS_H */
index e7a693c28f16560c7d646ca3f954d952428a408b..6b29966973f27e125d04a5d7a2a8ef392ca44508 100644 (file)
@@ -25,6 +25,8 @@
 #include <linux/if.h>
 #include <linux/if_ether.h>
 #include <linux/if_pppol2tp.h>
+#include <linux/if_pppolac.h>
+#include <linux/if_pppopns.h>
 #include <linux/in.h>
 #include <linux/in6.h>
 
@@ -60,7 +62,9 @@ struct pptp_addr {
 #define PX_PROTO_OE    0 /* Currently just PPPoE */
 #define PX_PROTO_OL2TP 1 /* Now L2TP also */
 #define PX_PROTO_PPTP  2
-#define PX_MAX_PROTO   3
+#define PX_PROTO_OLAC  3
+#define PX_PROTO_OPNS  4
+#define PX_MAX_PROTO   5
 
 struct sockaddr_pppox {
        __kernel_sa_family_t sa_family;       /* address family, AF_PPPOX */