proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2026-01-24 17:46:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2886 from donaldsharp/stream_resize

Browse Source 
Stream resize
This commit is contained in:
Russ White 2018-08-22 16:04:37 -04:00 committed by GitHub
commit 0a4ecf2729
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 63 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
isisd/isis_circuit.c
View File

@ -536,7 +536,7 @@ void isis_circuit_stream(struct isis_circuit *circuit, struct stream **stream)
*stream = stream_new(stream_size);
} else {
if (STREAM_SIZE(*stream) != stream_size)
stream_resize(*stream, stream_size);
stream_resize_inplace(stream, stream_size);
stream_reset(*stream);
}
}

41
lib/stream.c
View File

@ -28,9 +28,9 @@
#include "network.h"
#include "prefix.h"
#include "log.h"
#include "lib_errors.h"
DEFINE_MTYPE_STATIC(LIB, STREAM, "Stream")
DEFINE_MTYPE_STATIC(LIB, STREAM_DATA, "Stream data")
DEFINE_MTYPE_STATIC(LIB, STREAM_FIFO, "Stream FIFO")
/* Tests whether a position is valid */
@ -100,9 +100,7 @@ struct stream *stream_new(size_t size)
assert(size > 0);
s = XMALLOC(MTYPE_STREAM, sizeof(struct stream));
s->data = XMALLOC(MTYPE_STREAM_DATA, size);
s = XMALLOC(MTYPE_STREAM, sizeof(struct stream) + size);
s->getp = s->endp = 0;
s->next = NULL;
@ -116,7 +114,6 @@ void stream_free(struct stream *s)
if (!s)
return;
XFREE(MTYPE_STREAM_DATA, s->data);
XFREE(MTYPE_STREAM, s);
}
@ -166,27 +163,33 @@ struct stream *stream_dupcat(struct stream *s1, struct stream *s2,
return new;
}
size_t stream_resize(struct stream *s, size_t newsize)
size_t stream_resize_inplace(struct stream **sptr, size_t newsize)
{
uint8_t *newdata;
STREAM_VERIFY_SANE(s);
struct stream *orig = *sptr;
newdata = XREALLOC(MTYPE_STREAM_DATA, s->data, newsize);
STREAM_VERIFY_SANE(orig);
if (newdata == NULL)
return s->size;
orig = XREALLOC(MTYPE_STREAM, orig, sizeof(struct stream) + newsize);
s->data = newdata;
s->size = newsize;
orig->size = newsize;
if (s->endp > s->size)
s->endp = s->size;
if (s->getp > s->endp)
s->getp = s->endp;
if (orig->endp > orig->size)
orig->endp = orig->size;
if (orig->getp > orig->endp)
orig->getp = orig->endp;
STREAM_VERIFY_SANE(s);
STREAM_VERIFY_SANE(orig);
return s->size;
*sptr = orig;
return orig->size;
}
size_t __attribute__((deprecated))stream_resize_orig(struct stream *s,
size_t newsize)
{
assert("stream_resize: Switch code to use stream_resize_inplace" == NULL);
return stream_resize_inplace(&s, newsize);
}
size_t stream_get_getp(struct stream *s)

20
lib/stream.h
View File

@ -98,14 +98,15 @@
struct stream {
struct stream *next;
/* Remainder is ***private*** to stream
/*
* Remainder is ***private*** to stream
* direct access is frowned upon!
* Use the appropriate functions/macros
*/
size_t getp; /* next get position */
size_t endp; /* last valid data position */
size_t size; /* size of data segment */
unsigned char *data; /* data pointer */
size_t getp; /* next get position */
size_t endp; /* last valid data position */
size_t size; /* size of data segment */
unsigned char data[0]; /* data pointer */
};
/* First in first out queue structure. */
@ -154,7 +155,14 @@ extern struct stream *stream_new(size_t);
extern void stream_free(struct stream *);
extern struct stream *stream_copy(struct stream *, struct stream *src);
extern struct stream *stream_dup(struct stream *);
extern size_t stream_resize(struct stream *, size_t);
#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 *);
extern size_t stream_get_endp(struct stream *);
extern size_t stream_get_size(struct stream *);

48
ospfd/ospf_lsa.c
View File

@ -416,7 +416,7 @@ static uint16_t ospf_link_cost(struct ospf_interface *oi)
}
/* Set a link information. */
static char link_info_set(struct stream *s, struct in_addr id,
static char link_info_set(struct stream **s, struct in_addr id,
struct in_addr data, uint8_t type, uint8_t tos,
uint16_t cost)
{
@ -425,11 +425,11 @@ static char link_info_set(struct stream *s, struct in_addr id,
* more.
* we try accomodate those here.
*/
if (STREAM_WRITEABLE(s) < OSPF_ROUTER_LSA_LINK_SIZE) {
if (STREAM_WRITEABLE(*s) < OSPF_ROUTER_LSA_LINK_SIZE) {
size_t ret = OSPF_MAX_LSA_SIZE;
/* Can we enlarge the stream still? */
if (STREAM_SIZE(s) == OSPF_MAX_LSA_SIZE) {
if (STREAM_SIZE(*s) == OSPF_MAX_LSA_SIZE) {
/* we futz the size here for simplicity, really we need
* to account
* for just:
@ -441,30 +441,31 @@ static char link_info_set(struct stream *s, struct in_addr id,
*
* Simpler just to subtract OSPF_MAX_LSA_SIZE though.
*/
ret = stream_resize(
ret = stream_resize_inplace(
s, OSPF_MAX_PACKET_SIZE - OSPF_MAX_LSA_SIZE);
}
if (ret == OSPF_MAX_LSA_SIZE) {
zlog_warn(
"%s: Out of space in LSA stream, left %zd, size %zd",
__func__, STREAM_WRITEABLE(s), STREAM_SIZE(s));
__func__, STREAM_WRITEABLE(*s),
STREAM_SIZE(*s));
return 0;
}
}
/* TOS based routing is not supported. */
stream_put_ipv4(s, id.s_addr); /* Link ID. */
stream_put_ipv4(s, data.s_addr); /* Link Data. */
stream_putc(s, type); /* Link Type. */
stream_putc(s, tos); /* TOS = 0. */
stream_putw(s, cost); /* Link Cost. */
stream_put_ipv4(*s, id.s_addr); /* Link ID. */
stream_put_ipv4(*s, data.s_addr); /* Link Data. */
stream_putc(*s, type); /* Link Type. */
stream_putc(*s, tos); /* TOS = 0. */
stream_putw(*s, cost); /* Link Cost. */
return 1;
}
/* Describe Point-to-Point link (Section 12.4.1.1). */
static int lsa_link_ptop_set(struct stream *s, struct ospf_interface *oi)
static int lsa_link_ptop_set(struct stream **s, struct ospf_interface *oi)
{
int links = 0;
struct ospf_neighbor *nbr;
@ -510,7 +511,7 @@ static int lsa_link_ptop_set(struct stream *s, struct ospf_interface *oi)
}
/* Describe Broadcast Link. */
static int lsa_link_broadcast_set(struct stream *s, struct ospf_interface *oi)
static int lsa_link_broadcast_set(struct stream **s, struct ospf_interface *oi)
{
struct ospf_neighbor *dr;
struct in_addr id, mask;
@ -556,7 +557,7 @@ static int lsa_link_broadcast_set(struct stream *s, struct ospf_interface *oi)
}
}
static int lsa_link_loopback_set(struct stream *s, struct ospf_interface *oi)
static int lsa_link_loopback_set(struct stream **s, struct ospf_interface *oi)
{
struct in_addr id, mask;
@ -570,7 +571,8 @@ static int lsa_link_loopback_set(struct stream *s, struct ospf_interface *oi)
}
/* Describe Virtual Link. */
static int lsa_link_virtuallink_set(struct stream *s, struct ospf_interface *oi)
static int lsa_link_virtuallink_set(struct stream **s,
struct ospf_interface *oi)
{
struct ospf_neighbor *nbr;
uint16_t cost = ospf_link_cost(oi);
@ -593,7 +595,7 @@ static int lsa_link_virtuallink_set(struct stream *s, struct ospf_interface *oi)
12.4.1.4.*/
/* from "edward rrr" <edward_rrr@hotmail.com>
http://marc.theaimsgroup.com/?l=zebra&m=100739222210507&w=2 */
static int lsa_link_ptomp_set(struct stream *s, struct ospf_interface *oi)
static int lsa_link_ptomp_set(struct stream **s, struct ospf_interface *oi)
{
int links = 0;
struct route_node *rn;
@ -634,7 +636,7 @@ static int lsa_link_ptomp_set(struct stream *s, struct ospf_interface *oi)
}
/* Set router-LSA link information. */
static int router_lsa_link_set(struct stream *s, struct ospf_area *area)
static int router_lsa_link_set(struct stream **s, struct ospf_area *area)
{
struct listnode *node;
struct ospf_interface *oi;
@ -677,28 +679,28 @@ static int router_lsa_link_set(struct stream *s, struct ospf_area *area)
}
/* Set router-LSA body. */
static void ospf_router_lsa_body_set(struct stream *s, struct ospf_area *area)
static void ospf_router_lsa_body_set(struct stream **s, struct ospf_area *area)
{
unsigned long putp;
uint16_t cnt;
/* Set flags. */
stream_putc(s, router_lsa_flags(area));
stream_putc(*s, router_lsa_flags(area));
/* Set Zero fields. */
stream_putc(s, 0);
stream_putc(*s, 0);
/* Keep pointer to # links. */
putp = stream_get_endp(s);
putp = stream_get_endp(*s);
/* Forward word */
stream_putw(s, 0);
stream_putw(*s, 0);
/* Set all link information. */
cnt = router_lsa_link_set(s, area);
/* Set # of links here. */
stream_putw_at(s, putp, cnt);
stream_putw_at(*s, putp, cnt);
}
static int ospf_stub_router_timer(struct thread *t)
@ -783,7 +785,7 @@ static struct ospf_lsa *ospf_router_lsa_new(struct ospf_area *area)
OSPF_ROUTER_LSA, ospf->router_id, ospf->router_id);
/* Set router-LSA body fields. */
ospf_router_lsa_body_set(s, area);
ospf_router_lsa_body_set(&s, area);
/* Set length. */
length = stream_get_endp(s);

2
tests/lib/test_stream.c
View File

@ -57,7 +57,7 @@ int main(void)
print_stream(s);
stream_resize(s, stream_get_endp(s));
stream_resize_inplace(&s, stream_get_endp(s));
print_stream(s);