removed accel-dp related files

accel-dp will be continued in separated branch

4 files changed, 0 insertions, 677 deletions

diff --git a/accel-pppd/CMakeLists.txt b/accel-pppd/CMakeLists.txt
index 505beed..70c4105 100644
--- a/accel-pppd/CMakeLists.txt
+++ b/accel-pppd/CMakeLists.txt
@@ -47,8 +47,6 @@ IF (SHAPER)
 	ADD_SUBDIRECTORY(shaper)
 ENDIF (SHAPER)
 
-ADD_SUBDIRECTORY(net)
-
 INCLUDE(CheckIncludeFile)
 CHECK_INCLUDE_FILE("linux/netfilter/ipset/ip_set.h" HAVE_IPSET)
 
diff --git a/accel-pppd/net/CMakeLists.txt b/accel-pppd/net/CMakeLists.txt
deleted file mode 100644
index f27c7c5..0000000
--- a/accel-pppd/net/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-IF (DEFINED DPDK)
-    ADD_LIBRARY(net-accel-dp SHARED dp.c)
-
-    INSTALL(TARGETS net-accel-dp
-        LIBRARY DESTINATION lib${LIB_SUFFIX}/accel-ppp
-    )
-ENDIF()
diff --git a/accel-pppd/net/dp.c b/accel-pppd/net/dp.c
deleted file mode 100644
index be5ebc0..0000000
--- a/accel-pppd/net/dp.c
+++ /dev/null
@@ -1,667 +0,0 @@
-#include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <pthread.h>
-#include <sched.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/ioctl.h>
-#include <sys/uio.h>
-#include <linux/ppp-ioctl.h>
-#include <linux/if.h>
-
-#include "triton.h"
-#include "ap_net.h"
-#include "log.h"
-
-#include "if_dp.h"
-
-#define MAX_PIPE 16
-
-struct dp_pipe {
-	struct list_head entry;
-	int sock;
-	uint8_t pid;
-};
-
-static struct sockaddr_un dp_addr;
-static int dp_sock;
-
-static LIST_HEAD(pipes);
-static pthread_mutex_t pipe_lock;
-static int pipe_cnt;
-
-static int pipe_open(uint8_t pid)
-{
-	struct msg_pipe msg = {
-		.id = MSG_PIPE,
-		.pid = pid,
-	};
-	struct msg_result res;
-	int sock = socket(AF_UNIX, SOCK_SEQPACKET, 0);
-	if (sock < 0) {
-		log_error("dp: socket: %s\n", strerror(errno));
-		return -1;
-	}
-
-	if (connect(sock, (struct sockaddr *)&dp_addr, sizeof(dp_addr))) {
-		log_error("dp: connect: %s\n", strerror(errno));
-		close(sock);
-		return -1;
-	}
-
-	if (write(sock, &msg, sizeof(msg)) < 0) {
-		close(sock);
-		return -1;
-	}
-
-	if (read(sock, &res, sizeof(res)) != sizeof(res)) {
-		close(sock);
-		return -1;
-	}
-
-	if (res.err) {
-		log_error("dp: failed to connect pipe: %s\n", strerror(res.err));
-		close(sock);
-		return -1;
-	}
-
-	return sock;
-}
-
-static struct dp_pipe *pipe_get()
-{
-	struct dp_pipe *p;
-	uint8_t pid;
-	int sock;
-
-	while (1) {
-		pthread_mutex_lock(&pipe_lock);
-		if (list_empty(&pipes)) {
-			if (pipe_cnt == MAX_PIPE) {
-				pthread_mutex_unlock(&pipe_lock);
-				sched_yield();
-			}
-			pid = pipe_cnt;
-			pipe_cnt++;
-			pthread_mutex_unlock(&pipe_lock);
-
-			sock = pipe_open(pid);
-			if (sock < 0)
-				return NULL;
-
-			p = malloc(sizeof(*p));
-			p->pid = pid;
-			p->sock = sock;
-			break;
-		} else {
-			p = list_entry(pipes.next, typeof(*p), entry);
-			list_del(&p->entry);
-			pthread_mutex_unlock(&pipe_lock);
-			break;
-		}
-	}
-
-	return p;
-}
-
-static void pipe_put(struct dp_pipe *p)
-{
-	pthread_mutex_lock(&pipe_lock);
-	list_add(&p->entry, &pipes);
-	pthread_mutex_unlock(&pipe_lock);
-}
-
-static int dp_socket(int domain, int type, int proto)
-{
-	struct msg_socket msg = {
-		.id = MSG_SOCKET,
-		.domain = domain,
-		.type = type,
-		.proto = proto,
-	};
-	struct msg_result res;
-
-	int sock = socket(AF_UNIX, SOCK_SEQPACKET, 0);
-	if (sock < 0) {
-		log_error("dp: socket: %s\n", strerror(errno));
-		return -1;
-	}
-
-	if (connect(sock, (struct sockaddr *)&dp_addr, sizeof(dp_addr))) {
-		log_error("dp: connect: %s\n", strerror(errno));
-		close(sock);
-		return -1;
-	}
-
-	if (write(sock, &msg, sizeof(msg)) < 0) {
-		close(sock);
-		return -1;
-	}
-
-	if (read(sock, &res, sizeof(res)) != sizeof(res)) {
-		close(sock);
-		errno = EBADE;
-		return -1;
-	}
-
-	if (res.err) {
-		close(sock);
-		errno = res.err;
-		return -1;
-	}
-
-	return sock;
-}
-
-static int dp_connect(int sock, const struct sockaddr *addr, socklen_t len)
-{
-	struct msg_connect msg = {
-		.id = MSG_CONNECT,
-		.addrlen = len,
-	};
-	struct msg_result res;
-	struct iovec iov[2] = {
-		{
-			.iov_base = &msg,
-			.iov_len = sizeof(msg),
-		},
-		{
-			.iov_base = (void *)addr,
-			.iov_len = len,
-		}
-	};
-
-	if (writev(sock, iov, 2) < 0)
-		return -1;
-
-	if (read(sock, &res, sizeof(res)) != sizeof(res)) {
-		errno = EBADE;
-		return -1;
-	}
-
-	if (res.err) {
-		errno = res.err;
-		return -1;
-	}
-
-	return 0;
-}
-
-static int dp_bind(int sock, const struct sockaddr *addr, socklen_t len)
-{
-	struct msg_bind msg = {
-		.id = MSG_BIND,
-		.addrlen = len,
-	};
-	struct msg_result res;
-	struct iovec iov[2] = {
-		{
-			.iov_base = &msg,
-			.iov_len = sizeof(msg),
-		},
-		{
-			.iov_base = (void *)addr,
-			.iov_len = len,
-		}
-	};
-
-	if (writev(sock, iov, 2) < 0)
-		return -1;
-
-	if (read(sock, &res, sizeof(res)) != sizeof(res)) {
-		errno = EBADE;
-		return -1;
-	}
-
-	if (res.err) {
-		errno = res.err;
-		return -1;
-	}
-
-	return 0;
-}
-
-static int dp_listen(int sock, int backlog)
-{
-	struct msg_listen msg = {
-		.id = MSG_LISTEN,
-		.backlog = backlog,
-	};
-	struct msg_result res;
-
-	if (write(sock, &msg, sizeof(msg)) < 0)
-		return -1;
-
-	if (read(sock, &res, sizeof(res)) != sizeof(res)) {
-		errno = EBADE;
-		return -1;
-	}
-
-	if (res.err) {
-		errno = res.err;
-		return -1;
-	}
-
-	return 0;
-}
-
-static ssize_t dp_read(int sock, void *buf, size_t len)
-{
-	/*struct msg_recv msg = {
-		.id = MSG_RECV,
-		.len = len,
-		.flags = 0,
-		.addrlen = 0,
-	};*/
-	struct msg_result res;
-	struct iovec iov[2] = {
-		{
-			.iov_base = &res,
-			.iov_len = sizeof(res),
-		},
-		{
-			.iov_base = buf,
-			.iov_len = len,
-		}
-	};
-	struct msghdr msg = {
-		.msg_iov = iov,
-		.msg_iovlen = 2,
-	};
-	int n;
-
-	/*if (write(sock, &msg, sizeof(msg)))
-		return -1;*/
-
-again:
-	n = recvmsg(sock, &msg, MSG_DONTWAIT);
-	if (n < 0)
-		return -1;
-
-	if (n < sizeof(res)) {
-		errno = EBADE;
-		return -1;
-	}
-
-	if (res.err) {
-		errno = res.err;
-		return -1;
-	}
-
-	if (!res.len)
-		goto again;
-
-	return res.len;
-}
-
-static ssize_t dp_recvfrom(int sock, void *buf, size_t len, int flags, struct sockaddr *src_addr, socklen_t *addrlen)
-{
-	/*struct msg_recv msg = {
-		.id = MSG_RECV,
-		.len = len,
-		.flags = flags,
-		.addrlen = 0,
-	};*/
-	struct msg_result res;
-	struct iovec iov[2] = {
-		{
-			.iov_base = &res,
-			.iov_len = sizeof(res),
-		},
-		{
-			.iov_base = buf,
-			.iov_len = len,
-		}
-	};
-	int n;
-	struct msghdr msg = {
-		.msg_iov = iov,
-		.msg_iovlen = 2,
-	};
-
-	/*if (write(sock, &msg, sizeof(msg)))
-		return -1;*/
-
-again:
-	n = recvmsg(sock, &msg, MSG_DONTWAIT);
-	if (n < 0)
-		return -1;
-
-	if (n < sizeof(res)) {
-		errno = EBADE;
-		return -1;
-	}
-
-	if (res.err) {
-		errno = res.err;
-		return -1;
-	}
-
-	if (!res.len)
-		goto again;
-
-	memcpy(src_addr, &res.ss, res.addrlen);
-	*addrlen = res.addrlen;
-
-	return res.len;
-}
-
-static ssize_t dp_write(int sock, const void *buf, size_t len)
-{
-	struct msg_send msg = {
-		.id = MSG_SEND,
-		.len = len,
-		.flags = 0,
-		.addrlen = 0,
-	};
-	struct msg_result res;
-	struct iovec iov[2] = {
-		{
-			.iov_base = &msg,
-			.iov_len = sizeof(msg),
-		},
-		{
-			.iov_base = (void *)buf,
-			.iov_len = len,
-		}
-	};
-	struct dp_pipe *p = pipe_get();
-	int r;
-
-	if (!p)
-		return -1;
-
-	msg.pid = p->pid;
-
-	if (writev(sock, iov, 2) < 0) {
-		pipe_put(p);
-		return -1;
-	}
-
-	r = read(p->sock, &res, sizeof(res));
-
-	pipe_put(p);
-
-	if (r != sizeof(res)) {
-		errno = EBADE;
-		return -1;
-	}
-
-	if (res.err) {
-		errno = res.err;
-		return -1;
-	}
-
-	return res.len;
-}
-
-static ssize_t dp_sendto(int sock, const void *buf, size_t len, int flags, const struct sockaddr *dest_addr, socklen_t addrlen)
-{
-	struct msg_send msg = {
-		.id = MSG_SEND,
-		.len = len,
-		.flags = flags,
-		.addrlen = addrlen,
-	};
-	struct msg_result res;
-	struct iovec iov[3] = {
-		{
-			.iov_base = &msg,
-			.iov_len = sizeof(msg),
-		},
-		{
-			.iov_base = (void *)dest_addr,
-			.iov_len = addrlen,
-		},
-		{
-			.iov_base = (void *)buf,
-			.iov_len = len,
-		}
-	};
-	struct dp_pipe *p = pipe_get();
-	int r;
-
-	if (!p)
-		return -1;
-
-	msg.pid = p->pid;
-
-	if (writev(sock, iov, 3) < 0) {
-		pipe_put(p);
-		return -1;
-	}
-
-	r = read(p->sock, &res, sizeof(res));
-
-	pipe_put(p);
-
-	if (r != sizeof(res)) {
-		errno = EBADE;
-		return -1;
-	}
-
-	if (res.err) {
-		errno = res.err;
-		return -1;
-	}
-
-	return res.len;
-}
-
-static int dp_set_nonblocking(int sock, int f)
-{
-	return 0;
-}
-
-static int dp_setsockopt(int sock, int level, int optname, const void *optval, socklen_t optlen)
-{
-	return 0;
-}
-
-
-static int dp_ppp_open()
-{
-	struct msg_hdr msg = {
-		.id = MSG_PPP_OPEN,
-	};
-	struct msg_result res;
-	int sock = socket(AF_UNIX, SOCK_SEQPACKET, 0);
-
-	if (sock < 0)
-		return -1;
-
-	if (connect(sock, (struct sockaddr *)&dp_addr, sizeof(dp_addr))) {
-		close(sock);
-		return -1;
-	}
-
-	if (write(sock, &msg, sizeof(msg)) < 0) {
-		close(sock);
-		return -1;
-	}
-
-	if (read(sock, &res, sizeof(res)) != sizeof(res)) {
-		close(sock);
-		errno = EBADE;
-		return -1;
-	}
-
-	if (res.err) {
-		close(sock);
-		errno = res.err;
-		return -1;
-	}
-
-	return sock;
-}
-
-static int dp_ppp_ioctl(int fd, unsigned long request, void *arg)
-{
-	struct msg_ioctl msg = {
-		.id = MSG_IOCTL,
-		.request = request,
-	};
-	struct msg_result res;
-	struct iovec iov[2] = {
-		{
-			.iov_base = &msg,
-			.iov_len = sizeof(msg),
-		},
-		{
-			.iov_base = arg,
-		}
-	};
-	struct dp_pipe *p = pipe_get();
-	int r;
-
-	if (!p)
-		return -1;
-
-	switch (request) {
-		case PPPIOCSNPMODE:
-			iov[1].iov_len = sizeof(struct npioctl);
-			break;
-		case PPPIOCSCOMPRESS:
-			iov[1].iov_len = sizeof(struct ppp_option_data);
-			break;
-		case PPPIOCGFLAGS:
-		case PPPIOCGCHAN:
-			iov[1].iov_len = 0;
-			break;
-		case PPPIOCNEWUNIT:
-		case PPPIOCSFLAGS:
-		case PPPIOCSMRU:
-		case PPPIOCATTCHAN:
-		case PPPIOCCONNECT:
-			iov[1].iov_len = sizeof(int);
-			break;
-
-	}
-
-	msg.pid = p->pid;
-
-	if (writev(fd, iov, 2) < 0) {
-		pipe_put(p);
-		return -1;
-	}
-
-	iov[0].iov_base = &res;
-	iov[0].iov_len = sizeof(res);
-	iov[1].iov_base = arg;
-	iov[1].iov_len = 1024;
-
-	r = readv(p->sock, iov, 2);
-
-	pipe_put(p);
-
-	if (r < sizeof(res)) {
-		errno = EBADE;
-		return -1;
-	}
-
-	if (res.err) {
-		errno = res.err;
-		return -1;
-	}
-
-	return res.len;
-}
-
-static int dp_sock_ioctl(unsigned long request, void *arg)
-{
-	struct msg_ioctl msg = {
-		.id = MSG_SOCK_IOCTL,
-		.request = request,
-	};
-	struct msg_result res;
-	struct iovec iov[2] = {
-		{
-			.iov_base = &msg,
-			.iov_len = sizeof(msg),
-		},
-		{
-			.iov_base = arg,
-			.iov_len = sizeof(struct ifreq),
-		}
-	};
-	struct dp_pipe *p = pipe_get();
-	int r;
-
-	if (!p)
-		return -1;
-
-	msg.pid = p->pid;
-
-	if (writev(dp_sock, iov, 2) < 0) {
-		pipe_put(p);
-		return -1;
-	}
-
-	iov[0].iov_base = &res;
-	iov[0].iov_len = sizeof(res);
-
-	r = readv(p->sock, iov, 2);
-
-	pipe_put(p);
-
-	if (r < sizeof(res)) {
-		errno = EBADE;
-		return -1;
-	}
-
-	if (res.err) {
-		errno = res.err;
-		return -1;
-	}
-
-	return 0;
-}
-
-static const struct ap_net dp_net = {
-	.name = "accel-dp",
-	.socket = dp_socket,
-	.connect = dp_connect,
-	.bind = dp_bind,
-	.listen = dp_listen,
-	.read = dp_read,
-	.recvfrom = dp_recvfrom,
-	.write = dp_write,
-	.sendto = dp_sendto,
-	.set_nonblocking = dp_set_nonblocking,
-	.setsockopt = dp_setsockopt,
-	.ppp_open = dp_ppp_open,
-	.ppp_ioctl = dp_ppp_ioctl,
-	.sock_ioctl = dp_sock_ioctl,
-};
-
-static void init()
-{
-	const char *opt = conf_get_opt("accel-dp", "socket");
-
-	if (!opt)
-		return;
-
-	if (strlen(opt) >= sizeof(dp_addr.sun_path)) {
-		log_error("net-dpdk: socket path is too long\n");
-		return;
-	}
-
-	strcpy(dp_addr.sun_path, opt);
-
-	dp_addr.sun_family = AF_UNIX;
-
-	dp_sock = socket(AF_UNIX, SOCK_SEQPACKET, 0);
-	if (dp_sock < 0)
-		return;
-
-	if (connect(dp_sock, (struct sockaddr *)&dp_addr, sizeof(dp_addr))) {
-		log_error("dpdk: connect: %s\n", strerror(errno));
-		close(dp_sock);
-		return;
-	}
-
-	ap_net_register(&dp_net);
-}
-
-DEFINE_INIT(1, init)
diff --git a/accel-pppd/net/if_dp.h b/accel-pppd/net/if_dp.h
deleted file mode 120000
index 32df37a..0000000
--- a/accel-pppd/net/if_dp.h
+++ /dev/null
@@ -1 +0,0 @@
-../../accel-dp/if_dp.h
\ No newline at end of file