add length checks and comments to proxy LCP parsing

[l2tpns.git] / Makefile

diff --git a/Makefile b/Makefile
index b193c37..d5c9a48 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,62 +1,128 @@
-PREFIX=
-bindir = $(PREFIX)/usr/sbin
-etcdir = $(PREFIX)/etc/l2tpns
-libdir = $(PREFIX)/usr/lib/l2tpns
+DESTDIR =
+bindir = /usr/sbin
+etcdir = /etc/l2tpns
+libdir = /usr/lib/l2tpns
+statedir = /var/lib/l2tpns
+
+DEFINES =
+DEFINES += -DSTATISTICS
+DEFINES += -DSTAT_CALLS
+DEFINES += -DRINGBUFFER
+DEFINES += -DBGP
+DEFINES += -DLIBDIR='"$(libdir)"'
+DEFINES += -DETCDIR='"$(etcdir)"'
+DEFINES += -DSTATEDIR='"$(statedir)"'
+
+OPTIM = -g
+OPTIM += -O3
+OPTIM += -funroll-loops
+OPTIM += -fomit-frame-pointer
+OPTIM += -finline-functions
+#OPTIM += -fstrength-reduce
 
 CC = gcc
-CFLAGS=-Wall -g -O3 -funroll-loops -fomit-frame-pointer -finline-functions
-LDFLAGS = 
-LIBS = -lm -ldl -lcli
-INSTALL = /usr/bin/install -c
+LD = gcc
+INCLUDES = -I.
+CPPFLAGS = $(INCLUDES) $(DEFINES)
+CFLAGS = -Wall $(OPTIM)
+LDFLAGS = -rdynamic
+LDLIBS = -lm
+INSTALL = install -c -D -o root -g root
 
-OBJS=  md5.o \
-       icmp.o \
+OBJS = arp.o \
+       bgp.o \
        cli.o \
-       l2tpns.o \
-       ppp.o \
-       radius.o \
-       throttle.o \
-       rl.o \
-       ll.o \
        cluster.o \
-       cluster_slave.o \
-       arp.o \
        constants.o \
-       ll.o \
        control.o \
-       util.o \
+       icmp.o \
+       l2tpns.o \
+       ll.o \
+       md5.o \
+       ppp.o \
+       radius.o \
+       tbf.o \
+       util.o
 
-PLUGINS=garden.so autothrottle.so autosnoop.so
+PLUGINS = garden.so autothrottle.so autosnoop.so stripdomain.so
+TARGETS = l2tpns nsctl generateload bounce $(PLUGINS)
 
-all:   l2tpns cluster_master nsctl $(PLUGINS)
+all: $(TARGETS)
 
-l2tpns:        $(OBJS)
-       $(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(DEFS)
+clean:
+       rm -f *.o test/*.o $(TARGETS) Makefile.tmp Makefile.bak
 
-cluster_master:        cluster_master.o ll.o cluster.o util.o
-       $(CC) $(CFLAGS) -o $@ $^ $(DEFS)
+depend:
+       (sed -n 'p; /^## Dependencies: (autogenerated) ##/q' Makefile && \
+           gcc -MM $(CPPFLAGS) $(OBJS:.o=.c) && \
+           gcc -MM $(CPPFLAGS) $(PLUGINS:.so=.c) | sed 's/\.o/.so/') >Makefile.tmp
+       mv Makefile Makefile.bak
+       mv Makefile.tmp Makefile
+
+l2tpns:        $(OBJS)
+       $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS) -lcli -ldl
 
 nsctl: nsctl.o control.o
-       $(CC) $(CFLAGS) -o $@ $^ $(DEFS)
+       $(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
-clean:
-       /bin/rm -f *.o *.so l2tpns cluster_master nsctl
+generateload:  test/generateload.o
+       $(LD) $(LDFLAGS) -o $@ $^ # -lpthread
+
+bounce:        test/bounce.o
+       $(LD) $(LDFLAGS) -o $@ $^
+
+%.o: %.c
+       $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+
+%.so: %.c
+       $(CC) -fPIC -shared $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $<
+
+# install config files only if a startup-config does not exist yet
+# this does not interfere when building rpms or debs and makes
+# fast upgrading via make install possible
 
 install: all
-       $(INSTALL) -D -o root -g root -m 0755 l2tpns $(bindir)/l2tpns
-       $(INSTALL) -D -o root -g root -m 0755 cluster_master $(bindir)/cluster_master
-       $(INSTALL) -D -o root -g root -m 0755 nsctl $(bindir)/nsctl
-       $(INSTALL) -D -o root -g root -m 0600 etc/l2tpns.cfg.default $(etcdir)/l2tpns.cfg
-       $(INSTALL) -D -o root -g root -m 0644 etc/ip_pool.default $(etcdir)/l2tpns.ip_pool
-       $(INSTALL) -D -o root -g root -m 0600 etc/users.default $(etcdir)/l2tpns.users
-       for PLUGIN in $(PLUGINS); do \
-               $(INSTALL) -D -o root -g root -m 0755 $(PLUGIN) $(libdir)/$(PLUGIN); \
+       $(INSTALL) -m 0755 l2tpns $(DESTDIR)$(bindir)/l2tpns
+       $(INSTALL) -m 0755 nsctl $(DESTDIR)$(bindir)/nsctl
+       @if [ -f $(DESTDIR)$(etcdir)/startup-config ]; then \
+               echo '***' Installing default config files in $(DESTDIR)$(etcdir) as .defaults; \
+               suffix=.default; \
+       else \
+               echo '***' Installing default config files in $(DESTDIR)$(etcdir) - remember to adjust them; \
+               suffix=; \
+       fi; \
+       $(INSTALL) -m 0600 etc/startup-config.default $(DESTDIR)$(etcdir)/startup-config$$suffix; \
+       $(INSTALL) -m 0644 etc/ip_pool.default $(DESTDIR)$(etcdir)/ip_pool$$suffix; \
+       $(INSTALL) -m 0600 etc/users.default $(DESTDIR)$(etcdir)/users$$suffix
+
+       for plugin in $(PLUGINS); do \
+               $(INSTALL) -m 0755 $$plugin $(DESTDIR)$(libdir)/$$plugin; \
        done
-       if [ ! -e /dev/net/tun ]; then \
+
+       if [ -z $(DESTDIR) ] && [ ! -e /dev/net/tun ]; then \
                mkdir /dev/net; \
                mknod /dev/net/tun c 10 200; \
        fi
 
-%.so: %.c
-       $(CC) -fPIC -shared -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBPATH)
+.PHONY: all clean depend
 
+## Dependencies: (autogenerated) ##
+arp.o: arp.c l2tpns.h
+bgp.o: bgp.c l2tpns.h bgp.h util.h
+cli.o: cli.c l2tpns.h util.h cluster.h tbf.h ll.h bgp.h
+cluster.o: cluster.c l2tpns.h cluster.h util.h tbf.h bgp.h
+constants.o: constants.c constants.h
+control.o: control.c control.h
+icmp.o: icmp.c l2tpns.h
+l2tpns.o: l2tpns.c md5.h l2tpns.h cluster.h plugin.h ll.h constants.h \
+  control.h util.h tbf.h bgp.h
+ll.o: ll.c ll.h
+md5.o: md5.c md5.h
+ppp.o: ppp.c l2tpns.h constants.h plugin.h util.h tbf.h cluster.h
+radius.o: radius.c md5.h constants.h l2tpns.h plugin.h util.h
+tbf.o: tbf.c l2tpns.h util.h tbf.h
+util.o: util.c l2tpns.h bgp.h
+garden.so: garden.c l2tpns.h plugin.h control.h
+autothrottle.so: autothrottle.c l2tpns.h plugin.h control.h
+autosnoop.so: autosnoop.c l2tpns.h plugin.h control.h
+stripdomain.so: stripdomain.c l2tpns.h plugin.h