aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Gustafsson <robg@student.chalmers.se>2017-09-28 15:09:48 +0200
committerRobert Gustafsson <robg@student.chalmers.se>2017-09-28 15:09:48 +0200
commit7bd84e78376e5f5b87349d00766b024964bb84b3 (patch)
treee33b8217efc27ceaac23e64159d96b2d919cb5b3
parenta333c2c239a964ba2f898d23528186af1c5a1608 (diff)
downloadmidbro-7bd84e78376e5f5b87349d00766b024964bb84b3.tar.gz
midbro-7bd84e78376e5f5b87349d00766b024964bb84b3.tar.bz2
Add new main file
-rw-r--r--broccoli/Makefile11
-rw-r--r--broccoli/broevent.c13
-rw-r--r--broccoli/includes/broevent.h5
-rw-r--r--broccoli/midbropasad.c12
4 files changed, 25 insertions, 16 deletions
diff --git a/broccoli/Makefile b/broccoli/Makefile
index d895274..3fafbea 100644
--- a/broccoli/Makefile
+++ b/broccoli/Makefile
@@ -2,10 +2,13 @@ CC=gcc
CFLAGS = -c -Wall -I/usr/local/include -I/usr/local/include -DBROCCOLI
LDFLAGS = -L/usr/local/lib -lbroccoli
-all: broevent
+all: midbropasad
-broevent: broevent.o fifoqueue.o
- $(CC) broevent.o fifoqueue.o -o broevent $(LDFLAGS)
+midbropasad: midbropasad.o broevent.o fifoqueue.o
+ $(CC) midbropasad.o broevent.o fifoqueue.o -o midbropasad $(LDFLAGS)
+
+midbropasad.o: midbropasad.c
+ $(CC) $(CFLAGS) midbropasad.c
broevent.o: broevent.c
$(CC) $(CFLAGS) broevent.c
@@ -13,4 +16,4 @@ broevent.o: broevent.c
fifoqueue.o: fifoqueue.c
$(CC) -c -Wall fifoqueue.c
clean:
- rm *.o broevent
+ rm *.o midbropasad
diff --git a/broccoli/broevent.c b/broccoli/broevent.c
index a2b7a28..94d06b8 100644
--- a/broccoli/broevent.c
+++ b/broccoli/broevent.c
@@ -1,7 +1,5 @@
-#ifdef BROCCOLI
-#include <broccoli.h>
-#endif
#include "includes/fifoqueue.h"
+#include "includes/broevent.h"
char *host_default = "127.0.0.1";
char *port_default = "47760";
@@ -60,12 +58,3 @@ bro_event_listener()
bro_conn_delete(bc);
}
-
- int
-main(int argc, char **argv)
-{
- Fifo_q * q = init_queue(5);
-
- free(q);
- return 0;
-}
diff --git a/broccoli/includes/broevent.h b/broccoli/includes/broevent.h
new file mode 100644
index 0000000..4021737
--- /dev/null
+++ b/broccoli/includes/broevent.h
@@ -0,0 +1,5 @@
+#ifdef BROCCOLI
+#include <broccoli.h>
+#endif
+
+void bro_event_listener();
diff --git a/broccoli/midbropasad.c b/broccoli/midbropasad.c
new file mode 100644
index 0000000..5c0c413
--- /dev/null
+++ b/broccoli/midbropasad.c
@@ -0,0 +1,12 @@
+#include "includes/fifoqueue.h"
+#include "includes/broevent.h"
+
+ int
+main(int argc, char **argv)
+{
+ Fifo_q * q = init_queue(5);
+ bro_event_listener();
+
+ free(q);
+ return 0;
+}