From: David Lamparter <equinox@opensourcerouting.org>
Date: Mon, 28 Nov 2016 16:56:29 +0000 (+0100)
Subject: Merge branch 'vtysh-grammar'
X-Git-Tag: frr-3.0-branchpoint~148
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=82992fed8c6426f431fa92933dcf4cfe4de926d6;p=matthieu%2Ffrr.git

Merge branch 'vtysh-grammar'

Conflicts:
	isisd/isisd.c
	lib/Makefile.am
	lib/thread.c

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---

82992fed8c6426f431fa92933dcf4cfe4de926d6
diff --cc bgpd/bgp_aspath.c
index 89a529d738,de6caa1596..bdafe5a0cb
--- a/bgpd/bgp_aspath.c
+++ b/bgpd/bgp_aspath.c
@@@ -25,8 -25,10 +25,9 @@@ Software Foundation, Inc., 59 Temple Pl
  #include "memory.h"
  #include "vector.h"
  #include "vty.h"
 -#include "str.h"
  #include "log.h"
  #include "stream.h"
+ #include "command.h"
  #include "jhash.h"
  #include "queue.h"
  #include "filter.h"
diff --cc lib/Makefile.am
index 7239506813,f0d5bd53db..cf6c6cd1a7
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -9,28 -10,32 +10,32 @@@ lib_LTLIBRARIES = libzebra.l
  libzebra_la_LDFLAGS = -version-info 0:0:0 
  
  libzebra_la_SOURCES = \
 -	network.c pid_output.c getopt.c getopt1.c daemon.c \
 +	network.c pid_output.c getopt.c getopt1.c \
- 	checksum.c vector.c linklist.c vty.c command.c \
+ 	checksum.c vector.c linklist.c vty.c \
+ 	graph.c command_parse.y command_lex.l command_match.c \
+ 	command.c \
  	sockunion.c prefix.c thread.c if.c buffer.c table.c hash.c \
 -	filter.c routemap.c distribute.c stream.c str.c log.c plist.c \
 +	filter.c routemap.c distribute.c stream.c log.c plist.c \
  	zclient.c sockopt.c smux.c agentx.c snmp.c md5.c if_rmap.c keychain.c privs.c \
  	sigevent.c pqueue.c jhash.c workqueue.c nexthop.c json.c \
  	ptm_lib.c csv.c bfd.c vrf.c systemd.c ns.c memory.c memory_vty.c \
  	imsg-buffer.c imsg.c skiplist.c \
  	qobj.c \
 -	event_counter.c
 +	event_counter.c \
 +	strlcpy.c \
 +	strlcat.c
  
- BUILT_SOURCES = route_types.h gitversion.h
+ BUILT_SOURCES = route_types.h gitversion.h command_parse.h
  
 -libzebra_la_DEPENDENCIES = @LIB_REGEX@
 -
 -libzebra_la_LIBADD = @LIB_REGEX@ @LIBCAP@
 +libzebra_la_LIBADD = @LIBCAP@
  
  pkginclude_HEADERS = \
- 	buffer.h checksum.h command.h filter.h getopt.h hash.h \
+ 	buffer.h checksum.h filter.h getopt.h hash.h \
  	if.h linklist.h log.h \
+ 	graph.h command_match.h \
+ 	command.h \
  	memory.h network.h prefix.h routemap.h distribute.h sockunion.h \
 -	str.h stream.h table.h thread.h vector.h version.h vty.h zebra.h \
 +	stream.h table.h thread.h vector.h version.h vty.h zebra.h \
  	plist.h zclient.h sockopt.h smux.h md5.h if_rmap.h keychain.h \
  	privs.h sigevent.h pqueue.h jhash.h zassert.h \
  	workqueue.h route_types.h libospf.h nexthop.h json.h \