diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2017-11-08 12:51:16 -0500 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2017-12-01 13:51:06 -0500 |
| commit | 2d34fb80b81c929bcf0d2524b0f2383ee01ea5dc (patch) | |
| tree | 1322d2443437dc9afbe112152c0a6c9745e89a71 /ospfd/ospf_dump.c | |
| parent | 493472ba8ecb44f21bc9cd85c1307262648d5bc3 (diff) | |
*: don't use deprecated stream.h macros
Some of the deprecated stream.h macros see such little use that we may
as well just remove them and use the non-deprecated macros.
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'ospfd/ospf_dump.c')
| -rw-r--r-- | ospfd/ospf_dump.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c index 6876054a63..6a410f4ed3 100644 --- a/ospfd/ospf_dump.c +++ b/ospfd/ospf_dump.c @@ -230,7 +230,7 @@ static void ospf_packet_hello_dump(struct stream *s, u_int16_t length) struct ospf_hello *hello; int i; - hello = (struct ospf_hello *)STREAM_PNT(s); + hello = (struct ospf_hello *)stream_pnt(s); zlog_debug("Hello"); zlog_debug(" NetworkMask %s", inet_ntoa(hello->network_mask)); @@ -278,7 +278,7 @@ static void ospf_router_lsa_dump(struct stream *s, u_int16_t length) struct router_lsa *rl; int i, len; - rl = (struct router_lsa *)STREAM_PNT(s); + rl = (struct router_lsa *)stream_pnt(s); zlog_debug(" Router-LSA"); zlog_debug(" flags %s", @@ -303,7 +303,7 @@ static void ospf_network_lsa_dump(struct stream *s, u_int16_t length) struct network_lsa *nl; int i, cnt; - nl = (struct network_lsa *)STREAM_PNT(s); + nl = (struct network_lsa *)stream_pnt(s); cnt = (ntohs(nl->header.length) - (OSPF_LSA_HEADER_SIZE + 4)) / 4; zlog_debug(" Network-LSA"); @@ -325,7 +325,7 @@ static void ospf_summary_lsa_dump(struct stream *s, u_int16_t length) int size; int i; - sl = (struct summary_lsa *)STREAM_PNT(s); + sl = (struct summary_lsa *)stream_pnt(s); zlog_debug(" Summary-LSA"); zlog_debug(" Network Mask %s", inet_ntoa(sl->mask)); @@ -342,7 +342,7 @@ static void ospf_as_external_lsa_dump(struct stream *s, u_int16_t length) int size; int i; - al = (struct as_external_lsa *)STREAM_PNT(s); + al = (struct as_external_lsa *)stream_pnt(s); zlog_debug(" %s", ospf_lsa_type_msg[al->header.type].str); zlog_debug(" Network Mask %s", inet_ntoa(al->mask)); @@ -366,7 +366,7 @@ static void ospf_lsa_header_list_dump(struct stream *s, u_int16_t length) /* LSA Headers. */ while (length > 0) { - lsa = (struct lsa_header *)STREAM_PNT(s); + lsa = (struct lsa_header *)stream_pnt(s); ospf_lsa_header_dump(lsa); stream_forward_getp(s, OSPF_LSA_HEADER_SIZE); @@ -382,7 +382,7 @@ static void ospf_packet_db_desc_dump(struct stream *s, u_int16_t length) u_int32_t gp; gp = stream_get_getp(s); - dd = (struct ospf_db_desc *)STREAM_PNT(s); + dd = (struct ospf_db_desc *)stream_pnt(s); zlog_debug("Database Description"); zlog_debug(" Interface MTU %d", ntohs(dd->mtu)); @@ -452,7 +452,7 @@ static void ospf_packet_ls_upd_dump(struct stream *s, u_int16_t length) break; } - lsa = (struct lsa_header *)STREAM_PNT(s); + lsa = (struct lsa_header *)stream_pnt(s); lsa_len = ntohs(lsa->length); ospf_lsa_header_dump(lsa); @@ -566,7 +566,7 @@ void ospf_packet_dump(struct stream *s) gp = stream_get_getp(s); /* OSPF Header dump. */ - ospfh = (struct ospf_header *)STREAM_PNT(s); + ospfh = (struct ospf_header *)stream_pnt(s); /* Until detail flag is set, return. */ if (!(term_debug_ospf_packet[ospfh->type - 1] & OSPF_DEBUG_DETAIL)) |