Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / lib / stream.h

diff --git a/lib/stream.h b/lib/stream.h
index 4f75f121ca25a6ad3034f51fdd800686933e256e..85eebb47bef2f0ab24d3b8674adeba655a847796 100644 (file)
--- a/lib/stream.h
+++ b/lib/stream.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Packet interface
  * Copyright (C) 1999 Kunihiro Ishiguro
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * GNU Zebra is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef _ZEBRA_STREAM_H
@@ -197,13 +182,12 @@ extern int stream_put_in_addr_at(struct stream *s, size_t putp,
                                 const struct in_addr *addr);
 extern int stream_put_in6_addr_at(struct stream *s, size_t putp,
                                  const struct in6_addr *addr);
-extern int stream_put_prefix_addpath(struct stream *s,
-                                    const struct prefix *p,
-                                    int addpath_encode,
+extern int stream_put_prefix_addpath(struct stream *s, const struct prefix *p,
+                                    bool addpath_capable,
                                     uint32_t addpath_tx_id);
 extern int stream_put_prefix(struct stream *s, const struct prefix *p);
 extern int stream_put_labeled_prefix(struct stream *, const struct prefix *,
-                                    mpls_label_t *, int addpath_encode,
+                                    mpls_label_t *, bool addpath_capable,
                                     uint32_t addpath_tx_id);
 extern void stream_get(void *, struct stream *, size_t);
 extern bool stream_get2(void *data, struct stream *s, size_t size);
@@ -262,6 +246,16 @@ extern int stream_empty(struct stream *); /* is the stream empty? */
 /* debugging */
 extern void stream_hexdump(const struct stream *s);
 
+/**
+ * Reorganize the buffer data so it can fit more. This function is normally
+ * called right after stream data is consumed so we can read more data
+ * (the functions that consume data start with `stream_get*()` and macros
+ * `STREAM_GET*()`).
+ *
+ * \param s stream pointer.
+ */
+extern void stream_pulldown(struct stream *s);
+
 /* deprecated */
 extern uint8_t *stream_pnt(struct stream *);
 
@@ -377,6 +371,18 @@ extern void stream_fifo_free(struct stream_fifo *fifo);
  * bit), for 64-bit values (you need to cast them anyway), and neither for
  * encoding (because it's downcasted.)
  */
+static inline const uint8_t *ptr_get_be64(const uint8_t *ptr, uint64_t *out)
+{
+       uint32_t tmp1, tmp2;
+
+       memcpy(&tmp1, ptr, sizeof(tmp1));
+       memcpy(&tmp2, ptr + sizeof(tmp1), sizeof(tmp1));
+
+       *out = (((uint64_t)ntohl(tmp1)) << 32) | ntohl(tmp2);
+
+       return ptr + 8;
+}
+
 static inline const uint8_t *ptr_get_be32(const uint8_t *ptr, uint32_t *out)
 {
        uint32_t tmp;