#include <linux/module.h>
+#include <linux/version.h>
#include <net/sock.h>
#include <net/protocol.h>
#include <net/ip.h>
#include <net/route.h>
#include "swift.h"
+#include "debug.h"
-MODULE_DESCRIPTION("Swift Transport Protocol");
+MODULE_DESCRIPTION("Multi-Party Transport Protocol");
MODULE_AUTHOR("Adrian Bondrescu/Cornel Mercan");
MODULE_LICENSE("GPL");
-struct swift_sock {
+struct mptp_sock {
struct inet_sock sock;
- /* swift socket speciffic data */
- __be16 src;
- __be16 dst;
+ /* mptp socket speciffic data */
+ uint8_t src;
+ uint8_t dst;
};
-static struct swift_sock * sock_port_map[MAX_SWIFT_PORT];
+static struct mptp_sock * sock_port_map[MAX_MPTP_PORT];
-static inline struct swift_sock * swift_sk(struct sock * sock)
+static inline struct mptp_sock * mptp_sk(struct sock * sock)
{
- return (struct swift_sock *)(sock);
+ return (struct mptp_sock *)(sock);
}
-static inline struct swifthdr * swift_hdr(const struct sk_buff * skb)
+static inline struct mptphdr * mptp_hdr(const struct sk_buff * skb)
{
- return (struct swifthdr *) skb_transport_header(skb);
+ return (struct mptphdr *) skb_transport_header(skb);
}
-static inline __be16 get_next_free_port(void)
+static inline uint8_t get_next_free_port(void)
{
int i;
- for (i = MIN_SWIFT_PORT; i < MAX_SWIFT_PORT; i ++)
+ for (i = MIN_MPTP_PORT; i < MAX_MPTP_PORT; i ++)
if (sock_port_map[i] == NULL)
return i;
return 0;
}
-static inline void swift_unhash(__be16 port)
+static inline void mptp_unhash(uint8_t port)
{
sock_port_map[port] = NULL;
}
-static inline void swift_hash(__be16 port, struct swift_sock *ssh)
+static inline void mptp_hash(uint8_t port, struct mptp_sock *ssh)
{
sock_port_map[port] = ssh;
}
-static inline struct swift_sock * swift_lookup(__be16 port)
+static inline struct mptp_sock * mptp_lookup(uint8_t port)
{
return sock_port_map[port];
}
-static int swift_release(struct socket *sock)
+static int mptp_release(struct socket *sock)
{
struct sock *sk = sock->sk;
- struct swift_sock * ssk = swift_sk(sk);
+ struct mptp_sock * ssk = mptp_sk(sk);
- if (!sk)
+ if (unlikely(!sk))
return 0;
- swift_unhash(ssk->src);
+ mptp_unhash(ssk->src);
sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
skb_queue_purge(&sk->sk_receive_queue);
- printk(KERN_DEBUG "swift_release sock=%p\n", sk);
+ log_debug("mptp_release sock=%p\n", sk);
sock_put(sk);
return 0;
}
-static int swift_bind(struct socket *sock, struct sockaddr *addr, int addr_len)
+static int mptp_bind(struct socket *sock, struct sockaddr *addr, int addr_len)
{
- struct sockaddr_swift *swift_addr;
- struct swift_sock *ssk;
+ struct sockaddr_mptp *mptp_addr;
+ struct mptp_sock *ssk;
int err;
- __be16 port;
+ uint8_t port;
- err = -EINVAL;
- if (addr_len < sizeof(struct sockaddr_swift)) {
- printk(KERN_ERR "Invalid size for sockaddr\n");
+ if (unlikely(addr_len < sizeof(struct sockaddr_mptp))) {
+ log_error("Invalid size for sockaddr\n");
+ err = -EINVAL;
goto out;
}
- swift_addr = (struct sockaddr_swift *) addr;
+ mptp_addr = (struct sockaddr_mptp *) addr;
- err = -EINVAL;
- if (swift_addr->sin_family != AF_INET) {
- printk(KERN_ERR "Invalid family for sockaddr\n");
- goto out;
- }
+ port = mptp_addr->dests[0].port;
- port = ntohs(swift_addr->sin_port);
-
- err = -EINVAL;
- if (port == 0 || port >= MAX_SWIFT_PORT) {
- printk(KERN_ERR "Invalid value for sockaddr port (%u)\n", port);
+ if (unlikely(port == 0 || port >= MAX_MPTP_PORT)) {
+ log_error("Invalid value for sockaddr port (%u)\n", port);
+ err = -EINVAL;
goto out;
}
- err = -EADDRINUSE;
- if (swift_lookup(port) != NULL) {
- printk(KERN_ERR "Port %u already in use\n", port);
+ if (unlikely(mptp_lookup(port) != NULL)) {
+ log_error("Port %u already in use\n", port);
+ err = -EADDRINUSE;
goto out;
}
- ssk = swift_sk(sock->sk);
+ ssk = mptp_sk(sock->sk);
+ sock->sk->sk_rcvbuf = 10 * 1024 * 1024;
ssk->src = port;
- swift_hash(port, ssk);
+ mptp_hash(port, ssk);
- printk(KERN_DEBUG "Socket %p bound to port %u\n", ssk, port);
+ log_debug("Socket %p bound to port %u\n", ssk, port);
return 0;
out:
- return -EINVAL;
+ return err;
}
-static int swift_connect(struct socket *sock, struct sockaddr *addr, int addr_len, int flags)
+static int mptp_connect(struct socket *sock, struct sockaddr *addr, int addr_len, int flags)
{
int err;
struct sock * sk;
struct inet_sock * isk;
- struct swift_sock * ssk;
+ struct mptp_sock * ssk;
- printk(KERN_DEBUG "swift_connect\n");
+ log_debug("mptp_connect\n");
- err = -EINVAL;
- if (sock == NULL) {
- printk(KERN_ERR "Sock is NULL\n");
+ if (unlikely(sock == NULL)) {
+ log_error("Sock is NULL\n");
+ err = -EINVAL;
goto out;
}
sk = sock->sk;
- err = -EINVAL;
- if (sk == NULL) {
- printk(KERN_ERR "Sock->sk is NULL\n");
+ if (unlikely(sk == NULL)) {
+ log_error("Sock->sk is NULL\n");
+ err = -EINVAL;
goto out;
}
-
+
isk = inet_sk(sk);
- ssk = swift_sk(sk);
+ ssk = mptp_sk(sk);
- if (ssk->src != 0) {
- printk(KERN_ERR "ssk->src is not NULL\n");
+ if (unlikely(ssk->src != 0)) {
+ log_error("ssk->src is not NULL\n");
+ err = -EINVAL;
goto out;
}
- err = -EINVAL;
- if (addr) {
- struct sockaddr_swift * swift_addr = (struct sockaddr_swift *) addr;
+ if (likely(addr)) {
+ struct sockaddr_mptp * mptp_addr = (struct sockaddr_mptp *) addr;
- err = -EINVAL;
- if (addr_len < sizeof(*swift_addr) || swift_addr->sin_family != AF_INET) {
- printk(KERN_ERR "Invalid size or address family\n");
+ if (unlikely(addr_len < sizeof(*mptp_addr) ||
+ addr_len < mptp_addr->count * sizeof(struct mptp_dest) ||
+ mptp_addr->count <= 0)) {
+ log_error("Invalid size or address family\n");
+ err = -EINVAL;
goto out;
}
- ssk->dst = ntohs(swift_addr->sin_port);
- if (ssk->dst == 0 || ssk->dst >= MAX_SWIFT_PORT) {
- printk(KERN_ERR "Invalid value for destination port(%u)\n", ssk->dst);
+ ssk->dst = mptp_addr->dests[0].port;
+ if (unlikely(ssk->dst == 0 || ssk->dst >= MAX_MPTP_PORT)) {
+ log_error("Invalid value for destination port(%u)\n", ssk->dst);
+ err = -EINVAL;
goto out;
}
- isk->inet_daddr = swift_addr->sin_addr.s_addr;
- printk(KERN_DEBUG "Received from user space destination port=%u and address=%u\n", ssk->dst, isk->inet_daddr);
+ isk->inet_daddr = mptp_addr->dests[0].addr;
+ log_debug("Received from user space destination port=%u and address=%u\n", ssk->dst, isk->inet_daddr);
} else {
- printk(KERN_ERR "Invalid swift_addr (NULL)\n");
+ log_error("Invalid mptp_addr (NULL)\n");
+ err = -EINVAL;
goto out;
}
- err = -ENOMEM;
ssk->src = get_next_free_port();
- if (ssk->src == 0) {
- printk(KERN_ERR "No free ports\n");
+ if (unlikely(ssk->src == 0)) {
+ log_error("No free ports\n");
+ err = -ENOMEM;
goto out;
}
- swift_hash(ssk->src, ssk);
+ mptp_hash(ssk->src, ssk);
return 0;
out:
return err;
-
}
-static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t len)
+static int mptp_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t len)
{
int err;
- __be16 dport;
- __be32 daddr;
- __be16 sport;
- struct sk_buff * skb;
- struct sock * sk;
- struct inet_sock * isk;
- struct swift_sock * ssk;
- struct swifthdr * shdr;
- int connected = 0;
- int totlen;
- struct rtable * rt = NULL;
-
- err = -EINVAL;
- if (sock == NULL) {
- printk(KERN_ERR "Sock is NULL\n");
- goto out;
- }
- sk = sock->sk;
-
- err = -EINVAL;
- if (sk == NULL) {
- printk(KERN_ERR "Sock->sk is NULL\n");
- goto out;
- }
-
- isk = inet_sk(sk);
- ssk = swift_sk(sk);
-
- sport = ssk->src;
- if (sport == 0) {
- err = -ENOMEM;
- sport = get_next_free_port();
- if (sport == 0) {
- printk(KERN_ERR "No free ports\n");
- goto out;
- }
- }
-
- if (msg->msg_name) {
- struct sockaddr_swift * swift_addr = (struct sockaddr_swift *) msg->msg_name;
-
- err = -EINVAL;
- if (msg->msg_namelen < sizeof(*swift_addr) || swift_addr->sin_family != AF_INET) {
- printk(KERN_ERR "Invalid size or address family\n");
- goto out;
- }
-
- dport = ntohs(swift_addr->sin_port);
- if (dport == 0 || dport >= MAX_SWIFT_PORT) {
- printk(KERN_ERR "Invalid value for destination port(%u)\n", dport);
- goto out;
- }
-
- daddr = swift_addr->sin_addr.s_addr;
- printk(KERN_DEBUG "Received from user space destination port=%u and address=%u\n", dport, daddr);
- } else {
- err = -EDESTADDRREQ;
- if (!ssk->dst || !isk->inet_daddr) {
- printk(KERN_ERR "No destination port/address\n");
- goto out;
- }
- dport = ssk->dst;
- daddr = isk->inet_daddr;
-
- printk(KERN_DEBUG "Got from socket destination port=%u and address=%u\n", dport, daddr);
- connected = 1;
- }
-
- totlen = len + sizeof(struct swifthdr) + sizeof(struct iphdr);
- skb = sock_alloc_send_skb(sk, totlen, msg->msg_flags & MSG_DONTWAIT, &err);
- if (!skb) {
- printk(KERN_ERR "sock_alloc_send_skb failed\n");
- goto out;
- }
- printk(KERN_DEBUG "Allocated %u bytes for skb (payload size=%u)\n", totlen, len);
-
- skb_reset_network_header(skb);
- skb_reserve(skb, sizeof(struct iphdr));
- printk(KERN_DEBUG "Reseted network header\n");
- skb_reset_transport_header(skb);
- skb_put(skb, sizeof(struct swifthdr));
- printk(KERN_DEBUG "Reseted transport header\n");
-
- shdr = (struct swifthdr *) skb_transport_header(skb);
- shdr->dst = ntohs(dport);
- shdr->src = ntohs(sport);
- shdr->len = ntohs(len + sizeof(struct swifthdr));
-
- printk(KERN_DEBUG "payload=%p\n", skb_put(skb, len));
-
- err = skb_copy_datagram_from_iovec(skb, sizeof(struct swifthdr), msg->msg_iov, 0, len);
- if (err) {
- printk(KERN_ERR "skb_copy_datagram_from_iovec failed\n");
- goto out_free;
- }
- printk(KERN_DEBUG "Copied %u bytes into the skb\n", len);
-
- if (connected)
- rt = (struct rtable *) __sk_dst_check(sk, 0);
-
- if (rt == NULL) {
- struct flowi fl = { .fl4_dst = daddr,
- .proto = sk->sk_protocol,
- .flags = inet_sk_flowi_flags(sk),
- };
- err = ip_route_output_flow(sock_net(sk), &rt, &fl, sk, 0);
- if (err) {
- printk(KERN_ERR "Route lookup failed\n");
- goto out_free;
- }
- sk_dst_set(sk, dst_clone(&rt->dst));
- }
-
- err = ip_queue_xmit(skb);
- if (!err)
- printk(KERN_DEBUG "Sent %u bytes on wire\n", len);
- else
- printk(KERN_ERR "ip_queue_xmit failed\n");
+ uint8_t dport;
+ __be32 daddr;
+ uint8_t sport;
+ struct sk_buff * skb;
+ struct sock * sk;
+ struct inet_sock * isk;
+ struct mptp_sock * ssk;
+ struct mptphdr * shdr;
+ int connected = 0;
+ int totlen;
+ struct rtable * rt = NULL;
+ int dests = 0;
+ int i;
+ struct sockaddr_mptp * mptp_addr = NULL;
+
+ if (unlikely(sock == NULL)) {
+ log_error("Sock is NULL\n");
+ err = -EINVAL;
+ goto out;
+ }
+ sk = sock->sk;
+
+ if (unlikely(sk == NULL)) {
+ log_error("Sock->sk is NULL\n");
+ err = -EINVAL;
+ goto out;
+ }
+
+ isk = inet_sk(sk);
+ ssk = mptp_sk(sk);
+
+ sport = ssk->src;
+ if (sport == 0) {
+ sport = get_next_free_port();
+ if (unlikely(sport == 0)) {
+ log_error("No free ports\n");
+ err = -ENOMEM;
+ goto out;
+ }
+ }
+
+ if (msg->msg_name) {
+ mptp_addr = (struct sockaddr_mptp *) msg->msg_name;
+
+ if (unlikely(msg->msg_namelen < sizeof(*mptp_addr) ||
+ msg->msg_namelen < mptp_addr->count * sizeof(struct mptp_dest) ||
+ mptp_addr->count <= 0)) {
+ log_error("Invalid size for msg_name\n");
+ err = -EINVAL;
+ goto out;
+ }
+
+ dests = mptp_addr->count;
+ } else {
+ BUG();
+ if (unlikely(!ssk->dst || !isk->inet_daddr)) {
+ log_error("No destination port/address\n");
+ err = -EDESTADDRREQ;
+ goto out;
+ }
+ dport = ssk->dst;
+ daddr = isk->inet_daddr;
+
+ log_debug("Got from socket destination port=%u and address=%u\n", dport, daddr);
+ connected = 1;
+ }
+
+ if (msg->msg_iovlen < dests)
+ dests = msg->msg_iovlen;
+
+ for (i = 0; i < dests; i++) {
+ struct mptp_dest *dest = &mptp_addr->dests[i];
+ struct iovec *iov = &msg->msg_iov[i];
+ char *payload;
+
+ dport = dest->port;
+ if (unlikely(dport == 0 || dport >= MAX_MPTP_PORT)) {
+ log_error("Invalid value for destination port(%u)\n", dport);
+ err = -EINVAL;
+ goto out;
+ }
+
+ daddr = dest->addr;
+ log_debug("Received from user space destination port=%u and address=%u\n", dport, daddr);
+
+ len = iov->iov_len;
+ totlen = len + sizeof(struct mptphdr) + sizeof(struct iphdr);
+ skb = sock_alloc_send_skb(sk, totlen, msg->msg_flags & MSG_DONTWAIT, &err);
+ if (unlikely(!skb)) {
+ log_error("sock_alloc_send_skb failed\n");
+ goto out;
+ }
+ log_debug("Allocated %u bytes for skb (payload size=%u)\n", totlen, len);
+
+ skb_reset_network_header(skb);
+ skb_reserve(skb, sizeof(struct iphdr));
+ log_debug("Reseted network header\n");
+ skb_reset_transport_header(skb);
+ skb_put(skb, sizeof(struct mptphdr));
+ log_debug("Reseted transport header\n");
+
+ shdr = (struct mptphdr *) skb_transport_header(skb);
+ shdr->dst = dport;
+ shdr->src = sport;
+ shdr->len = ntohs(len + sizeof(struct mptphdr));
+
+ payload = skb_put(skb, len);
+ log_debug("payload=%p\n", payload);
+
+ err = skb_copy_datagram_from_iovec(skb, sizeof(struct mptphdr), iov, 0, len);
+ if (unlikely(err)) {
+ log_error("skb_copy_datagram_from_iovec failed\n");
+ goto out_free;
+ }
+ log_debug("Copied %u bytes into the skb\n", len);
+
+ if (connected)
+ rt = (struct rtable *) __sk_dst_check(sk, 0);
+
+ if (rt == NULL) {
+ struct flowi fl = { .fl4_dst = daddr,
+ .proto = sk->sk_protocol,
+ .flags = inet_sk_flowi_flags(sk),
+ };
+ err = ip_route_output_flow(sock_net(sk), &rt, &fl, sk, 0);
+ if (unlikely(err)) {
+ log_error("Route lookup failed\n");
+ goto out_free;
+ }
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36)
+ sk_dst_set(sk, dst_clone(&rt->u.dst));
+#else
+ sk_dst_set(sk, dst_clone(&rt->dst));
+#endif
+ }
+
+ skb->local_df = 1;
+ err = ip_queue_xmit(skb);
+ if (likely(!err))
+ log_debug("Sent %u bytes on wire\n", len);
+ else
+ log_error("ip_queue_xmit failed\n");
+ }
return err;
return err;
}
-static int swift_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t len, int flags)
+static int mptp_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t len, int flags)
{
struct sk_buff *skb;
- struct sockaddr_swift *swift_addr;
+ struct sockaddr_mptp *mptp_addr;
struct sock * sk = sock->sk;
int err, copied;
+ int i;
+ struct sockaddr_mptp *ret_addr = (struct sockaddr_mptp *) msg->msg_name;
+
+ log_debug("Trying to receive sock=%p sk=%p flags=%d\n", sock, sk, flags);
skb = skb_recv_datagram(sk, flags, flags & MSG_DONTWAIT, &err);
- if (!skb) {
- printk(KERN_ERR "skb_recv_datagram\n");
+ if (unlikely(!skb)) {
+ log_error("skb_recv_datagram failed with %d\n", err);
goto out;
}
- printk(KERN_DEBUG "Received skb %p\n", skb);
+ for (i = 0; i < msg->msg_iovlen; i++) {
+ log_debug("Received skb %p\n", skb);
- swift_addr = (struct sockaddr_swift *) skb->cb;
- msg->msg_namelen = sizeof(struct sockaddr_swift);
+ mptp_addr = (struct sockaddr_mptp *) skb->cb;
- copied = skb->len;
- if (copied > len) {
- copied = len;
- msg->msg_flags |= MSG_TRUNC;
- }
+ copied = skb->len;
+ if (copied > msg->msg_iov[i].iov_len) {
+ copied = msg->msg_iov[i].iov_len;
+ msg->msg_flags |= MSG_TRUNC;
+ }
- err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
- if (err) {
- printk(KERN_ERR "skb_copy_datagram_iovec\n");
- goto out_free;
- }
+ err = skb_copy_datagram_iovec(skb, 0, &msg->msg_iov[i], copied);
+ if (unlikely(err)) {
+ log_error("skb_copy_datagram_iovec\n");
+ goto out_free;
+ }
+ log_debug("Received %d bytes\n", copied);
- sock_recv_ts_and_drops(msg, sk, skb);
+ sock_recv_ts_and_drops(msg, sk, skb);
- if (msg->msg_name)
- memcpy(msg->msg_name, swift_addr, msg->msg_namelen);
-
- err = copied;
+ if (ret_addr)
+ memcpy(&ret_addr->dests[i], &mptp_addr->dests[0], sizeof(ret_addr->dests[i]));
+
+ err = copied;
out_free:
- skb_free_datagram(sk, skb);
+ skb_free_datagram(sk, skb);
+
+ if (i == msg->msg_iovlen - 1)
+ break;
+
+ skb = skb_recv_datagram(sk, flags, 1, &err);
+ if (likely(err == -EAGAIN)) {
+ log_debug("No more skbs in the queue, returning...\n");
+ err = copied;
+ break;
+ }
+ }
+
+ ret_addr->count = i + 1;
+ msg->msg_namelen = sizeof(struct sockaddr_mptp) + (i + 1) * sizeof(struct mptp_dest);
out:
return err;
}
-static int swift_rcv(struct sk_buff *skb)
+static int mptp_rcv(struct sk_buff *skb)
{
- struct swifthdr *shdr;
- struct swift_sock *ssk;
+ struct mptphdr *shdr;
+ struct mptp_sock *ssk;
__be16 len;
- __be16 src, dst;
- struct sockaddr_swift * swift_addr;
+ uint8_t src, dst;
+ struct sockaddr_mptp * mptp_addr;
int err;
+ int addr_size = sizeof(struct sockaddr_mptp) + sizeof(struct mptp_dest);
- if (!pskb_may_pull(skb, sizeof(struct swifthdr))) {
- printk(KERN_ERR "Insufficient space for header\n");
+ if (unlikely(!pskb_may_pull(skb, sizeof(struct mptphdr)))) {
+ log_error("Insufficient space for header\n");
goto drop;
}
- shdr = (struct swifthdr *) skb->data;
+ shdr = (struct mptphdr *) skb->data;
len = ntohs(shdr->len);
- if (skb->len < len) {
- printk(KERN_ERR "Malformed packet (packet_len=%u, skb_len=%u)\n", len, skb->len);
+ if (unlikely(skb->len < len)) {
+ log_error("Malformed packet (packet_len=%u, skb_len=%u)\n", len, skb->len);
goto drop;
}
- if (len < sizeof(struct swifthdr)) {
- printk(KERN_ERR "Malformed packet (packet_len=%u sizeof(swifthdr)=%u\n", len, sizeof(struct swifthdr));
+ if (unlikely(len < sizeof(struct mptphdr))) {
+ log_error("Malformed packet (packet_len=%u sizeof(mptphdr)=%u\n", len, sizeof(struct mptphdr));
goto drop;
}
- src = ntohs(shdr->src);
- dst = ntohs(shdr->dst);
- if (src == 0 || dst == 0 || src >= MAX_SWIFT_PORT || dst >= MAX_SWIFT_PORT) {
- printk(KERN_ERR "Malformed packet (src=%u, dst=%u)\n", shdr->src, shdr->dst);
+ src = shdr->src;
+ dst = shdr->dst;
+ if (unlikely(src == 0 || dst == 0 || src >= MAX_MPTP_PORT || dst >= MAX_MPTP_PORT)) {
+ log_error("Malformed packet (src=%u, dst=%u)\n", shdr->src, shdr->dst);
goto drop;
}
- skb_pull(skb, sizeof(struct swifthdr));
- len -= sizeof(struct swifthdr);
+ skb_pull(skb, sizeof(struct mptphdr));
+ len -= sizeof(struct mptphdr);
pskb_trim(skb, len);
- printk(KERN_DEBUG "Received %u bytes from from port=%u to port=%u\n", len - sizeof(struct swifthdr), src, dst);
+ log_debug("Received %u bytes from from port=%u to port=%u\n", len - sizeof(struct mptphdr), src, dst);
- ssk = swift_lookup(dst);
+ ssk = mptp_lookup(dst);
if (ssk == NULL) {
- printk(KERN_ERR "Swift lookup failed for port %u\n", dst);
+ log_error("MPTP lookup failed for port %u\n", dst);
goto drop;
}
- BUILD_BUG_ON(sizeof(struct sockaddr_swift) > sizeof(skb->cb));
+ BUG_ON(addr_size > sizeof(skb->cb));
- swift_addr = (struct sockaddr_swift *) skb->cb;
- swift_addr->sin_family = AF_INET;
- swift_addr->sin_port = shdr->src;
- swift_addr->sin_addr.s_addr = ip_hdr(skb)->saddr;
+ mptp_addr = (struct sockaddr_mptp *) skb->cb;
+ mptp_addr->dests[0].port = shdr->src;
+ mptp_addr->dests[0].addr = ip_hdr(skb)->saddr;
- printk(KERN_DEBUG "Setting sin_port=%u, sin_addr=%u\n", ntohs(shdr->src), swift_addr->sin_addr.s_addr);
+ log_debug("Setting sin_port=%u, sin_addr=%u\n", ntohs(shdr->src), mptp_addr->dests[0].addr);
err = ip_queue_rcv_skb((struct sock *) &ssk->sock, skb);
- if (err) {
- printk(KERN_ERR "ip_queu_rcv_skb\n");
+ if (unlikely(err)) {
+ log_error("ip_queue_rcv_skb failed with %d\n", err);
consume_skb(skb);
}
return NET_RX_SUCCESS;
return NET_RX_DROP;
}
-static struct proto swift_prot = {
- .obj_size = sizeof(struct swift_sock),
+static struct proto mptp_prot = {
+ .obj_size = sizeof(struct mptp_sock),
.owner = THIS_MODULE,
- .name = "SWIFT",
+ .name = "MPTP",
};
-static const struct proto_ops swift_ops = {
+static const struct proto_ops mptp_ops = {
.family = PF_INET,
.owner = THIS_MODULE,
- .release = swift_release,
- .bind = swift_bind,
- .connect = swift_connect,
+ .release = mptp_release,
+ .bind = mptp_bind,
+ .connect = mptp_connect,
.socketpair = sock_no_socketpair,
.accept = sock_no_accept,
.getname = sock_no_getname,
.shutdown = sock_no_shutdown,
.setsockopt = sock_no_setsockopt,
.getsockopt = sock_no_getsockopt,
- .sendmsg = swift_sendmsg,
- .recvmsg = swift_recvmsg,
+ .sendmsg = mptp_sendmsg,
+ .recvmsg = mptp_recvmsg,
.mmap = sock_no_mmap,
.sendpage = sock_no_sendpage,
};
-static const struct net_protocol swift_protocol = {
- .handler = swift_rcv,
+static const struct net_protocol mptp_protocol = {
+ .handler = mptp_rcv,
.no_policy = 1,
.netns_ok = 1,
};
-static struct inet_protosw swift_protosw = {
+static struct inet_protosw mptp_protosw = {
.type = SOCK_DGRAM,
- .protocol = IPPROTO_SWIFT,
- .prot = &swift_prot,
- .ops = &swift_ops,
+ .protocol = IPPROTO_MPTP,
+ .prot = &mptp_prot,
+ .ops = &mptp_ops,
.no_check = 0,
};
-static int __init swift_init(void)
+static int __init mptp_init(void)
{
int rc;
- rc = proto_register(&swift_prot, 1);
- if (rc) {
- printk(KERN_ERR "Error registering swift protocol\n");
+ rc = proto_register(&mptp_prot, 1);
+ if (unlikely(rc)) {
+ log_error("Error registering mptp protocol\n");
goto out;
}
- rc = inet_add_protocol(&swift_protocol, IPPROTO_SWIFT);
- if (rc) {
- printk(KERN_ERR "Error adding swift protocol\n");
+ rc = inet_add_protocol(&mptp_protocol, IPPROTO_MPTP);
+ if (unlikely(rc)) {
+ log_error("Error adding mptp protocol\n");
goto out_unregister;
}
- inet_register_protosw(&swift_protosw);
- printk(KERN_DEBUG "Swift entered\n");
+ inet_register_protosw(&mptp_protosw);
+ log_debug("MPTP entered\n");
return 0;
out_unregister:
- proto_unregister(&swift_prot);
+ proto_unregister(&mptp_prot);
out:
return rc;
}
-static void __exit swift_exit(void)
+static void __exit mptp_exit(void)
{
- inet_unregister_protosw(&swift_protosw);
+ inet_unregister_protosw(&mptp_protosw);
- inet_del_protocol(&swift_protocol, IPPROTO_SWIFT);
+ inet_del_protocol(&mptp_protocol, IPPROTO_MPTP);
- proto_unregister(&swift_prot);
+ proto_unregister(&mptp_prot);
- printk(KERN_DEBUG "Swift exited\n");
+ log_debug("MPTP exited\n");
}
-module_init(swift_init);
-module_exit(swift_exit);
+module_init(mptp_init);
+module_exit(mptp_exit);