Changeset 967946027f391d9ee29dbaab2986f915c6a3ec3e

Timestamp:

11/16/09 02:32:36 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1258338756 +0000

git-parent:

[1009200a29dd792369da0fd327e60af0de0e013a]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1258338756 +0000

Message:

cleanup... make should not rebuild noitd and stratcond every time now

Files:

• src/Makefile.in (modified) (11 diffs)
• src/modules/dns.c (modified) (1 diff)
• src/modules/external.c (modified) (2 diffs)

src/Makefile.in

@@ -32 +32 @@
-NOWHOLE_ARCHIVE=@NOWHOLE_ARCHIVE@
-
-SUBS=lua utils eventer udns noitedit man
-MODDIR=modules
-
@@ -46 +45 @@
-        eventer/eventer_POSIX_fd_opset.h eventer/eventer_SSL_fd_opset.h \
-        eventer/eventer_jobq.h \
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-NOIT_OBJS=noitd.o noit_listener.o \
@@ -59 +66 @@
-        noit_http.o noit_rest.o noit_check_rest.o noit_filters_rest.o
-
+NOIT_LIBS=udns/libudns.o noitedit/libnoitedit.a eventer/libeventer.a \
+        jlog/libjlog.a utils/libnoit_utils.a
+
-STRATCON_OBJS=stratcond.o noit_listener.o \
-        noit_console.o noit_console_state.o noit_console_telnet.o \
@@ -68 +78 @@
-        stratcon_iep.o
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                (cd $$dir && make -s) ; \
-        done
-
-make-modules:
-        @for dir in $(MODDIR) ; do \
-                echo "- building $$dir bits" ; \
-                (cd $$dir && make -s) ; \
-        done
-
-java-bits:
-        @echo "- building java bits"
-        @test -n "@JAVAPARTS@" && (cd java && make -s)
-
-jlog/libjlog.a:
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        @$(CC) -o $@ $(NOIT_OBJS) \
-                udns/libudns.o \
@@ -102 +138 @@
-        @echo "- linking $@"
-
-make-subdirs $(STRATCON_OBJS) java-bits
+$(STRATCON_OBJS) $(STRATCON_LIBS)
-        @$(CC) -o $@ $(STRATCON_OBJS) \
-                udns/libudns.o \
@@ -134 +170 @@
-
-test-noit.conf: noit.conf.in Makefile
-
+@
-                -e "s^%modulesdir%^`pwd`/modules^g;" \
-                -e "s^%modulesluadir%^`pwd`/modules-lua^g;" \
@@ -142 +178 @@
-
-noit.conf:      noit.conf.in Makefile
-
+@
-                -e "s^%modulesdir%^$(MODULES_DIR)^g;" \
-                -e "s^%modulesluadir%^$(MODULES_DIR)^g;" \
@@ -150 +186 @@
-
-test-stratcon.conf:     stratcon.conf.in Makefile
-
+@
-                -e "s^%modulesdir%^`pwd`/modules^g;" \
-                -e "s^%modulesluadir%^`pwd`/modules-lua^g;" \
@@ -160 +196 @@
-
-stratcon.conf:  stratcon.conf.in Makefile
-
+@
-                -e "s^%modulesdir%^$(MODULES_DIR)^g;" \
-                -e "s^%modulesluadir%^$(MODULES_DIR)^g;" \
@@ -178 +214 @@
-        $(top_srcdir)/buildtools/mkinstalldirs $(DESTDIR)$(includedir)/eventer
-        $(top_srcdir)/buildtools/mkinstalldirs $(DESTDIR)$(includedir)/utils
+        $(top_srcdir)/buildtools/mkinstalldirs $(DESTDIR)$(includedir)/noitedit
+        $(top_srcdir)/buildtools/mkinstalldirs $(DESTDIR)$(includedir)/jlog
-        for file in $(HEADERS) ; do \
-                $(INSTALL) -m 0644 $$file $(DESTDIR)$(includedir)/$$file ; \
@@ -200 +238 @@
-install:        install-dirs install-docs install-headers install-noitd install-stratcond
-
-
-
-
-
-
-
-
+
-        rm -f *.o noitd
-        rm jlog/libjlog.a
-        (cd jlog && make clean)
-
+
+
+
+
+
+
+
+
+

src/modules/dns.c

@@ -480 +480 @@
-  dns_getdn(pkt, &cur, end, dn, sizeof(dn));
-  dns_initparse(&p, NULL, pkt, cur, end);
-
+
+
-  nrr = 0;
-

src/modules/external.c

@@ -235 +235 @@
-      struct iovec v[3];
-      memset(&r, 0, sizeof(r));
-
+(char *)
-      v[0].iov_len = sizeof(r.check_no);
-
+(char *)
-      v[1].iov_len = sizeof(r.exit_code);
-
+(char *)
-      v[2].iov_len = sizeof(r.stdoutlen);
-      expectlen = v[0].iov_len + v[1].iov_len + v[2].iov_len;
@@ -337 +337 @@
-    check->flags &= ~NP_RUNNING;
-  }
-  return EVENTER_READ;
-
- widowed: