merd: Rename to PASST
Plug A Simple Socket Transport. Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
parent
b439984641
commit
6709ade2bd
7 changed files with 21 additions and 18 deletions
12
Makefile
12
Makefile
|
@ -1,13 +1,13 @@
|
||||||
CFLAGS += -Wall -Wextra -pedantic
|
CFLAGS += -Wall -Wextra -pedantic
|
||||||
|
|
||||||
all: merd qrap
|
all: passt qrap
|
||||||
|
|
||||||
merd: merd.c merd.h arp.c arp.h dhcp.c dhcp.h util.c util.h
|
passt: passt.c passt.h arp.c arp.h dhcp.c dhcp.h util.c util.h
|
||||||
$(CC) $(CFLAGS) merd.c arp.c dhcp.c util.c -o merd
|
$(CC) $(CFLAGS) passt.c arp.c dhcp.c util.c -o passt
|
||||||
|
|
||||||
qrap: qrap.c merd.h
|
qrap: qrap.c passt.h
|
||||||
$(CC) $(CFLAGS) qrap.o -o qrap
|
$(CC) $(CFLAGS) qrap.c -o qrap
|
||||||
|
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
clean:
|
clean:
|
||||||
-${RM} merd qrap
|
-${RM} passt *.o qrap
|
||||||
|
|
4
arp.c
4
arp.c
|
@ -1,4 +1,4 @@
|
||||||
/* MERD - MacVTap Egress and Routing Daemon
|
/* PASST - Plug A Simple Socket Transport
|
||||||
*
|
*
|
||||||
* arp.c - ARP implementation
|
* arp.c - ARP implementation
|
||||||
*
|
*
|
||||||
|
@ -19,7 +19,7 @@
|
||||||
#include <net/if_arp.h>
|
#include <net/if_arp.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include "merd.h"
|
#include "passt.h"
|
||||||
#include "dhcp.h"
|
#include "dhcp.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
|
||||||
|
|
6
dhcp.c
6
dhcp.c
|
@ -1,6 +1,6 @@
|
||||||
/* MERD - MacVTap Egress and Routing Daemon
|
/* PASST - Plug A Simple Socket Transport
|
||||||
*
|
*
|
||||||
* dhcp.c - Minimalistic DHCP server for MERD
|
* dhcp.c - Minimalistic DHCP server for PASST
|
||||||
*
|
*
|
||||||
* Author: Stefano Brivio <sbrivio@redhat.com>
|
* Author: Stefano Brivio <sbrivio@redhat.com>
|
||||||
* License: GPLv2
|
* License: GPLv2
|
||||||
|
@ -18,7 +18,7 @@
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include "merd.h"
|
#include "passt.h"
|
||||||
#include "dhcp.h"
|
#include "dhcp.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* MERD - MacVTap Egress and Routing Daemon
|
/* PASST - Plug A Simple Socket Transport
|
||||||
*
|
*
|
||||||
* merd.c - Daemon implementation
|
* passt.c - Daemon implementation
|
||||||
*
|
*
|
||||||
* Author: Stefano Brivio <sbrivio@redhat.com>
|
* Author: Stefano Brivio <sbrivio@redhat.com>
|
||||||
* License: GPLv2
|
* License: GPLv2
|
||||||
|
@ -50,7 +50,7 @@
|
||||||
#include <linux/netlink.h>
|
#include <linux/netlink.h>
|
||||||
#include <linux/rtnetlink.h>
|
#include <linux/rtnetlink.h>
|
||||||
|
|
||||||
#include "merd.h"
|
#include "passt.h"
|
||||||
#include "arp.h"
|
#include "arp.h"
|
||||||
#include "dhcp.h"
|
#include "dhcp.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
|
@ -1,5 +1,5 @@
|
||||||
#define CT_SIZE 4096
|
#define CT_SIZE 4096
|
||||||
#define UNIX_SOCK_PATH "/tmp/merd.socket"
|
#define UNIX_SOCK_PATH "/tmp/passt.socket"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* struct ct4 - IPv4 connection tracking entry
|
* struct ct4 - IPv4 connection tracking entry
|
7
qrap.c
7
qrap.c
|
@ -1,4 +1,4 @@
|
||||||
/* MERD - MacVTap Egress and Routing Daemon
|
/* PASST - Plug A Simple Socket Transport
|
||||||
*
|
*
|
||||||
* qrap.c - qemu wrapper connecting UNIX domain socket to tap file descriptor
|
* qrap.c - qemu wrapper connecting UNIX domain socket to tap file descriptor
|
||||||
*
|
*
|
||||||
|
@ -10,6 +10,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include <stdint.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
@ -17,8 +18,10 @@
|
||||||
#include <sys/un.h>
|
#include <sys/un.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
#include <linux/if_ether.h>
|
||||||
|
#include <net/if.h>
|
||||||
|
|
||||||
#include "merd.h"
|
#include "passt.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* usage() - Print usage and exit
|
* usage() - Print usage and exit
|
||||||
|
|
2
util.c
2
util.c
|
@ -1,4 +1,4 @@
|
||||||
/* MERD - MacVTap Egress and Routing Daemon
|
/* PASST - Plug A Simple Socket Transport
|
||||||
*
|
*
|
||||||
* util.c - Convenience helpers
|
* util.c - Convenience helpers
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in a new issue