Make the Ethernet address configurable.

unioslo · Nov 21, 2018 · fcd6acd · fcd6acd
1 parent f804eae
commit fcd6acd
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/sbin/flytrap/flytrap.8.in b/sbin/flytrap/flytrap.8.in
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd November 14, 2018
+.Dd November 21, 2018
 .Dt FLYTRAP 8
 .Os
 .Sh NAME
@@ -35,6 +35,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl dfnov
+.Op Fl e Ar addr
 .Op Fl I Ar addr Ns | Ns Ar range Ns | Ns Ar subnet
 .Op Fl i Ar addr Ns | Ns Ar range Ns | Ns Ar subnet
 .Op Fl p Ar pidfile
@@ -55,6 +56,8 @@ The following options are available:
 .Bl -tag -width Fl
 .It Fl d
 Enable log messages at debug level or higher.
+.It Fl e Ar addr
+Use the specified Ethernet address instead of the hardcoded default.
 .It Fl f
 Foreground mode: do not daemonize and do not create a pidfile.
 .It Fl I Ar a.b.c.d Ns | Ns Ar a.b.c.d-e.f.g.h Ns | Ns Ar a.b.c.d/p

diff --git a/sbin/flytrap/main.c b/sbin/flytrap/main.c
@@ -92,6 +92,20 @@ exclude_range(ip4s_node **set, const char *range)
 	return (0);
 }
 
+static int
+set_ether_addr(const char *addr)
+{
+	ether_addr ea;
+	const char *e;
+
+	if ((e = ether_parse(addr, &ea)) == NULL || *e != '\0')
+		return (-1);
+	ft_verbose("ethernet address %02x:%02x:%02x:%02x:%02x:%02x",
+	    ea.o[0], ea.o[1], ea.o[2], ea.o[3], ea.o[4], ea.o[5]);
+	flytrap_ether_addr = ea;
+	return (0);
+}
+
 static void
 daemonize(void)
 {
@@ -117,7 +131,7 @@ usage(void)
 {
 
 	fprintf(stderr, "usage: "
-	    "flytrap [-dfnov] [-p pidfile] [-t csvfile] "
+	    "flytrap [-dfnov] [-p pidfile] [-t csvfile] [-e addr] "
 	    "[-Ii addr|range|subnet] [-Xx addr|range|subnet] "
 	    "iface\n");
 	exit(1);
@@ -132,7 +146,7 @@ main(int argc, char *argv[])
 	ifname = NULL;
 	ft_log_level = FT_LOG_LEVEL_NOTICE;
 	ft_log_init("flytrap", NULL);
-	while ((opt = getopt(argc, argv, "dfhI:i:nop:t:vX:x:")) != -1) {
+	while ((opt = getopt(argc, argv, "de:fhI:i:nop:t:vX:x:")) != -1) {
 		switch (opt) {
 		case 'd':
 			if (ft_log_level > FT_LOG_LEVEL_DEBUG)
@@ -145,6 +159,10 @@ main(int argc, char *argv[])
 			if (include_range(&src_set, optarg) != 0)
 				usage();
 			break;
+		case 'e':
+			if (set_ether_addr(optarg) != 0)
+				usage();
+			break;
 		case 'i':
 			if (include_range(&dst_set, optarg) != 0)
 				usage();