Add extended matches (nbyte, cmp, u32, meta)

diff --git a/Makefile b/Makefile
index 52eb4ecb154e7d3cdaf06a4af5479266e2e6e7f5..b98f12cc32cd5e81fb5e4afc83dfd025d361f34e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,7 @@ CC = gcc
 HOSTCC = gcc
 CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
 CFLAGS = $(CCOPTS) -I../include $(DEFINES)
+YACCFLAGS = -d -t -v
 
 LDLIBS += -L../lib -lnetlink -lutil
 

diff --git a/tc/Makefile b/tc/Makefile
index 06546f9cd9c1fc992dba4bf0be6b3c3237cb48d7..d735af0380d0e1296ddcee25c209300c5d0347ce 100644 (file)
--- a/tc/Makefile
+++ b/tc/Makefile
@@ -1,5 +1,6 @@
 TCOBJ= tc.o tc_qdisc.o tc_class.o tc_filter.o tc_util.o \
-       m_police.o m_estimator.o m_action.o
+       m_police.o m_estimator.o m_action.o m_ematch.o \
+       emp_ematch.yacc.o emp_ematch.lex.o
 
 include ../Config
 
@@ -14,6 +15,7 @@ TCMODULES += f_rsvp.o
 TCMODULES += f_u32.o
 TCMODULES += f_route.o
 TCMODULES += f_fw.o
+TCMODULES += f_basic.o
 TCMODULES += q_dsmark.o
 TCMODULES += q_gred.o
 TCMODULES += f_tcindex.o
@@ -28,6 +30,10 @@ TCMODULES += p_ip.o
 TCMODULES += p_icmp.o
 TCMODULES += p_tcp.o
 TCMODULES += p_udp.o
+TCMODULES += em_nbyte.o
+TCMODULES += em_cmp.o
+TCMODULES += em_u32.o
+TCMODULES += em_meta.o
 
 TCOBJ += $(TCMODULES)
 
@@ -72,3 +78,8 @@ clean:
 q_atm.so: q_atm.c
        $(CC) $(CFLAGS) -shared -fpic -o q_atm.so q_atm.c -latm
 
+%.yacc.c: %.y
+       $(YACC) $(YACCFLAGS) -o $@ $<
+
+%.lex.c: %.l
+       $(LEX) $(LEXFLAGS) -o $@ $<