Merge pull request #5746 from donaldsharp/bgp_sa

[mirror_frr.git] / lib / stream.h

diff --git a/lib/stream.h b/lib/stream.h
index 5341bfa40bde4468dfd8eee46f062123078d9562..c0d25e057988aa00ce6733ee65fd33d321a5d9e8 100644 (file)
--- a/lib/stream.h
+++ b/lib/stream.h
@@ -153,11 +153,6 @@ extern void stream_free(struct stream *);
 extern struct stream *stream_copy(struct stream *, struct stream *src);
 extern struct stream *stream_dup(struct stream *);
 
-#if CONFDATE > 20190821
-CPP_NOTICE("lib: time to remove stream_resize_orig")
-#endif
-extern size_t stream_resize_orig(struct stream *s, size_t newsize);
-#define stream_resize stream_resize_orig
 extern size_t stream_resize_inplace(struct stream **sptr, size_t newsize);
 
 extern size_t stream_get_getp(struct stream *);
@@ -191,15 +186,19 @@ extern int stream_putl_at(struct stream *, size_t, uint32_t);
 extern int stream_putq(struct stream *, uint64_t);
 extern int stream_putq_at(struct stream *, size_t, uint64_t);
 extern int stream_put_ipv4(struct stream *, uint32_t);
-extern int stream_put_in_addr(struct stream *, struct in_addr *);
-extern int stream_put_in_addr_at(struct stream *, size_t, struct in_addr *);
-extern int stream_put_in6_addr_at(struct stream *, size_t, struct in6_addr *);
-extern int stream_put_prefix_addpath(struct stream *, struct prefix *,
+extern int stream_put_in_addr(struct stream *s, const struct in_addr *addr);
+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,
                                     uint32_t addpath_tx_id);
-extern int stream_put_prefix(struct stream *, struct prefix *);
+extern int stream_put_prefix(struct stream *s, const struct prefix *p);
 extern int stream_put_labeled_prefix(struct stream *, struct prefix *,
-                                    mpls_label_t *);
+                                    mpls_label_t *, int addpath_encode,
+                                    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);
 extern void stream_get_from(void *, struct stream *, size_t, size_t);