summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2017-07-28 14:42:13 +0200
committerDavid Lamparter <equinox@opensourcerouting.org>2017-07-31 23:03:30 +0200
commita805d3bbb18f9cbaabf87850ba944b036e39240f (patch)
treeb66a4048687b5c7b4cd73805d454483ed3d32463
parentbuild: non-recursive qpb & fpm (diff)
downloadfrr-a805d3bbb18f9cbaabf87850ba944b036e39240f.tar.xz
frr-a805d3bbb18f9cbaabf87850ba944b036e39240f.zip
protobuf: fix build
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
-rw-r--r--fpm/fpm.proto2
-rw-r--r--qpb/qpb.proto4
-rw-r--r--qpb/qpb_allocator.c3
3 files changed, 6 insertions, 3 deletions
diff --git a/fpm/fpm.proto b/fpm/fpm.proto
index 318e80a92..4597c7f8e 100644
--- a/fpm/fpm.proto
+++ b/fpm/fpm.proto
@@ -20,6 +20,8 @@
// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
//
+syntax = "proto2";
+
//
// Protobuf definitions pertaining to the Forwarding Plane Manager component.
//
diff --git a/qpb/qpb.proto b/qpb/qpb.proto
index a1595a9ab..c06debb95 100644
--- a/qpb/qpb.proto
+++ b/qpb/qpb.proto
@@ -20,6 +20,8 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+syntax = "proto2";
+
/*
* Protobuf definitions pertaining to the Quagga/FRR Protobuf component.
*/
@@ -87,4 +89,4 @@ enum Protocol {
ISIS = 8;
BGP = 9;
OTHER = 10;
-} \ No newline at end of file
+}
diff --git a/qpb/qpb_allocator.c b/qpb/qpb_allocator.c
index 8b0ee941a..7e5ba5b0c 100644
--- a/qpb/qpb_allocator.c
+++ b/qpb/qpb_allocator.c
@@ -42,8 +42,7 @@ static void _qpb_free(void *allocator_data, void *ptr)
linear_allocator_free(allocator_data, ptr);
}
-static ProtobufCAllocator allocator_template = {_qpb_alloc, _qpb_free, NULL,
- 8192, NULL};
+static ProtobufCAllocator allocator_template = {_qpb_alloc, _qpb_free, NULL};
/*
* qpb_allocator_init_linear