Rename babel to babeld.

CHANGES

@@ -1,5 +1,6 @@
-babel 0.96 (unreleased)
+babeld 0.96 (unreleased)
 
+  * Renamed babel to babeld.
   * Routes are now automatically flushed when an interface goes down or an
     IPv4 address changes, which avoids desynchronisation between Babel and
     the kernel.

Makefile

@@ -8,44 +8,44 @@ CFLAGS = $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES)
 
 LDLIBS = -lrt
 
-SRCS = babel.c net.c kernel.c util.c network.c source.c neighbour.c \
+SRCS = babeld.c net.c kernel.c util.c network.c source.c neighbour.c \
        route.c xroute.c message.c resend.c config.c local.c
 
-OBJS = babel.o net.o kernel.o util.o network.o source.o neighbour.o \
+OBJS = babeld.o net.o kernel.o util.o network.o source.o neighbour.o \
        route.o xroute.o message.o resend.o config.o local.o
 
-babel: $(OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o babel $(OBJS) $(LDLIBS)
+babeld: $(OBJS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o babeld $(OBJS) $(LDLIBS)
 
 .SUFFIXES: .man .html
 
 .man.html:
 	rman -f html $< | \
-	sed -e "s|<a href='babel.8'|<a href=\"babel.html\"|" \
+	sed -e "s|<a href='babeld.8'|<a href=\"babeld.html\"|" \
             -e "s|<a href='\\(ahcp[-a-z]*\\).8'|<a href=\"../ahcp/\1.html\"|" \
 	    -e "s|<a href='[^']*8'>\\(.*(8)\\)</a>|\1|" \
 	> $@
 
-babel.html: babel.man
+babeld.html: babeld.man
 
 .PHONY: all install install.minimal uninstall clean
 
-all: babel babel.man
+all: babeld babeld.man
 
-install.minimal: babel
-	-rm -f $(TARGET)$(PREFIX)/bin/babel
+install.minimal: babeld
+	-rm -f $(TARGET)$(PREFIX)/bin/babeld
 	mkdir -p $(TARGET)$(PREFIX)/bin
-	cp -f babel $(TARGET)$(PREFIX)/bin
+	cp -f babeld $(TARGET)$(PREFIX)/bin
 
 install: install.minimal all
 	mkdir -p $(TARGET)$(PREFIX)/man/man8
-	cp -f babel.man $(TARGET)$(PREFIX)/man/man8/babel.8
+	cp -f babeld.man $(TARGET)$(PREFIX)/man/man8/babeld.8
 
 uninstall:
-	-rm -f $(TARGET)$(PREFIX)/bin/babel
-	-rm -f $(TARGET)$(PREFIX)/man/man8/babel.8
+	-rm -f $(TARGET)$(PREFIX)/bin/babeld
+	-rm -f $(TARGET)$(PREFIX)/man/man8/babeld.8
 
 clean:
-	-rm -f babel babel.html *.o *~ core TAGS gmon.out
+	-rm -f babeld babeld.html *.o *~ core TAGS gmon.out
 
 kernel.o: kernel_netlink.c kernel_socket.c

babel.c → babeld.c

@@ -38,7 +38,7 @@ THE SOFTWARE.
 #include <net/if.h>
 #include <arpa/inet.h>
 
-#include "babel.h"
+#include "babeld.h"
 #include "util.h"
 #include "net.h"
 #include "kernel.h"
@@ -66,7 +66,7 @@ int wireless_hello_interval = -1;
 int wired_hello_interval = -1;
 int idle_hello_interval = -1;
 int do_daemonise = 0;
-char *logfile = NULL, *pidfile = "/var/run/babel.pid";
+char *logfile = NULL, *pidfile = "/var/run/babeld.pid";
 
 unsigned char *receive_buffer = NULL;
 int receive_buffer_size = 0;

babel.man → babeld.man

@@ -1,8 +1,8 @@
-.TH BABEL 8
+.TH BABELD 8
 .SH NAME
-babel \- ad-hoc network routing daemon
+babeld \- ad-hoc network routing daemon
 .SH SYNOPSIS
-.B babel
+.B babeld
 .IR option ...
 [
 .B \-\-
@@ -26,7 +26,7 @@ Specify the UDP port number to be used by the protocol.
 .BI \-S " state-file"
 Set the name of the file used for preserving long-term information
 between invocations of the
-.B babel
+.B babeld
 daemon.  If this file is deleted, the daemon will run in passive mode
 for 3 minutes when it is next started (see
 .B -P
@@ -79,7 +79,8 @@ Listen for connections from a front-end on port
 .IR port .
 .TP
 .BI \-t " table"
-Use the given kernel routing table for routes inserted by Babel.
+Use the given kernel routing table for routes inserted by
+.BR babeld .
 .TP
 .BI \-T " table"
 Export routes from the given kernel routing table.
@@ -102,7 +103,7 @@ otherwise.
 .TP
 .BI \-I " pidfile"
 Specify a file to write our process id to.  The default is
-.BR /var/run/babel.pid .
+.BR /var/run/babeld.pid .
 .TP
 .IR interface ...
 The list of interfaces on which the protocol should operate.
@@ -249,7 +250,7 @@ is not specified, it defaults to
 .BR allow .
 
 By default,
-.B Babel
+.B babeld
 redistributes all local addresses, and no other routes.  In order to
 make sure that only the routes you specify are redistributed, you
 should include the line
@@ -260,7 +261,7 @@ as the last line in your configuration file.
 .SH EXAMPLES
 You can participate in a Babel network by simply running
 .IP
-# babel wlan0
+# babeld wlan0
 .PP
 where
 .B wlan0
@@ -269,18 +270,18 @@ is the name of your wireless interface.
 In order to gateway between multiple interfaces, just list them all on
 the command line:
 .IP
-# babel wlan0 eth0 sit1
+# babeld wlan0 eth0 sit1
 .PP
 On an access point, you'll probably want to redistribute some external
 routes into Babel:
 .IP
-# babel \\
+# babeld \\
     \-C 'redistribute metric 256' \\
     wlan0
 .PP
 or, if you want to constrain the routes that you redistribute,
 .IP
-# babel \\
+# babeld \\
     \-C 'redistribute proto 11 ip ::/0 le 64 metric 256' \\
     \-C 'redistribute proto 11 ip 0.0.0.0/0 le 24 metric 256' \\
     wlan0
@@ -292,7 +293,7 @@ The default location of the configuration file.
 .B /var/lib/babel\-state
 The default location of the file storing long-term state.
 .TP
-.B /var/run/babel.pid
+.B /var/run/babeld.pid
 The default location of the pid file.
 .TP
 .B /var/log/babel.log

config.c

@@ -24,7 +24,7 @@ THE SOFTWARE.
 #include <string.h>
 #include <stdio.h>
 
-#include "babel.h"
+#include "babeld.h"
 #include "util.h"
 #include "network.h"
 #include "config.h"

kernel.c

@@ -23,7 +23,7 @@ THE SOFTWARE.
 #include <sys/time.h>
 #include <time.h>
 
-#include "babel.h"
+#include "babeld.h"
 
 #ifdef __APPLE__
 #include "kernel_socket.c"

kernel.h

@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 #include <netinet/in.h>
-#include "babel.h"
+#include "babeld.h"
 
 #define KERNEL_INFINITY 0xFFFF
 

kernel_netlink.c

@@ -46,7 +46,7 @@ THE SOFTWARE.
 #define RTA_TABLE 15
 #endif
 
-#include "babel.h"
+#include "babeld.h"
 #include "kernel.h"
 #include "util.h"
 #include "network.h"

kernel_socket.c

@@ -41,7 +41,7 @@ THE SOFTWARE.
 #include <net/if_dl.h>
 #include <net/route.h>
 
-#include "babel.h"
+#include "babeld.h"
 #include "neighbour.h"
 #include "kernel.h"
 #include "util.h"

local.c

@@ -26,7 +26,7 @@ THE SOFTWARE.
 #include <unistd.h>
 #include <errno.h>
 
-#include "babel.h"
+#include "babeld.h"
 #include "network.h"
 #include "source.h"
 #include "neighbour.h"

message.c

@@ -27,7 +27,7 @@ THE SOFTWARE.
 
 #include <arpa/inet.h>
 
-#include "babel.h"
+#include "babeld.h"
 #include "util.h"
 #include "net.h"
 #include "network.h"

neighbour.c

@@ -26,7 +26,7 @@ THE SOFTWARE.
 #include <sys/time.h>
 #include <time.h>
 
-#include "babel.h"
+#include "babeld.h"
 #include "util.h"
 #include "network.h"
 #include "neighbour.h"

net.c

@@ -30,7 +30,7 @@ THE SOFTWARE.
 #include <netinet/in.h>
 #include <errno.h>
 
-#include "babel.h"
+#include "babeld.h"
 #include "util.h"
 #include "net.h"
 

network.c

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #include <net/if.h>
 #include <arpa/inet.h>
 
-#include "babel.h"
+#include "babeld.h"
 #include "util.h"
 #include "kernel.h"
 #include "network.h"

resend.c

@@ -25,7 +25,7 @@ THE SOFTWARE.
 #include <string.h>
 #include <stdlib.h>
 
-#include "babel.h"
+#include "babeld.h"
 #include "util.h"
 #include "neighbour.h"
 #include "resend.h"

route.c

@@ -26,7 +26,7 @@ THE SOFTWARE.
 #include <errno.h>
 #include <assert.h>
 
-#include "babel.h"
+#include "babeld.h"
 #include "util.h"
 #include "kernel.h"
 #include "network.h"

source.c

@@ -24,7 +24,7 @@ THE SOFTWARE.
 #include <stdio.h>
 #include <string.h>
 
-#include "babel.h"
+#include "babeld.h"
 #include "util.h"
 #include "source.h"
 #include "network.h"

util.c

@@ -32,7 +32,7 @@ THE SOFTWARE.
 #include <sys/socket.h>
 #include <arpa/inet.h>
 
-#include "babel.h"
+#include "babeld.h"
 #include "util.h"
 
 unsigned

xroute.c

@@ -27,7 +27,7 @@ THE SOFTWARE.
 #include <assert.h>
 #include <netinet/in.h>
 
-#include "babel.h"
+#include "babeld.h"
 #include "kernel.h"
 #include "neighbour.h"
 #include "message.h"