diff options
author | paul <paul> | 2005-05-19 02:12:25 +0000 |
---|---|---|
committer | paul <paul> | 2005-05-19 02:12:25 +0000 |
commit | e83e2080cecffa86267c07b46bbb5a9677b37996 (patch) | |
tree | 4523977a4fea76bdf2609ecb656a175aeaa4032f /bgpd/bgp_packet.c | |
parent | 22db9dec63766cdf6dcd3ecb4b48177fb0e48143 (diff) |
2005-05-19 Paul Jakma <paul@dishone.st>
* bgp_network.c: (bgp_accept) use XSTRDUP
* bgpd.c: (peer_delete) XFREE the correct memtype, not free.
(peer_create) use XSTRDUP
* bgp_packet.c: (bgp_stream_dup) deleted, stream_dup should be used
(various) update -> s/bgp_stream_dup/stream_dup
Diffstat (limited to 'bgpd/bgp_packet.c')
-rw-r--r-- | bgpd/bgp_packet.c | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c index 9fa23e52..a5fc7499 100644 --- a/bgpd/bgp_packet.c +++ b/bgpd/bgp_packet.c @@ -99,22 +99,6 @@ bgp_packet_delete (struct peer *peer) stream_free (stream_fifo_pop (peer->obuf)); } -/* Duplicate packet. */ -struct stream * -bgp_packet_dup (struct stream *s) -{ - struct stream *new; - - new = stream_new (stream_get_endp (s)); - - new->endp = s->endp; - new->getp = s->getp; - - memcpy (new->data, s->data, stream_get_endp (s)); - - return new; -} - /* Check file descriptor whether connect is established. */ static void bgp_connect_check (struct peer *peer) @@ -232,7 +216,7 @@ bgp_update_packet (struct peer *peer, afi_t afi, safi_t safi) if (! stream_empty (s)) { bgp_packet_set_size (s); - packet = bgp_packet_dup (s); + packet = stream_dup (s); bgp_packet_add (peer, packet); BGP_WRITE_ON (peer->t_write, bgp_write, peer->fd); stream_reset (s); @@ -279,7 +263,7 @@ bgp_update_packet_eor (struct peer *peer, afi_t afi, safi_t safi) } bgp_packet_set_size (s); - packet = bgp_packet_dup (s); + packet = stream_dup (s); bgp_packet_add (peer, packet); stream_free (s); return packet; @@ -359,7 +343,7 @@ bgp_withdraw_packet (struct peer *peer, afi_t afi, safi_t safi) stream_putw (s, 0); } bgp_packet_set_size (s); - packet = bgp_packet_dup (s); + packet = stream_dup (s); bgp_packet_add (peer, packet); stream_reset (s); return packet; @@ -423,7 +407,7 @@ bgp_default_update_send (struct peer *peer, struct attr *attr, /* Set size. */ bgp_packet_set_size (s); - packet = bgp_packet_dup (s); + packet = stream_dup (s); stream_free (s); /* Dump packet if debug option is set. */ @@ -502,7 +486,7 @@ bgp_default_withdraw_send (struct peer *peer, afi_t afi, safi_t safi) bgp_packet_set_size (s); - packet = bgp_packet_dup (s); + packet = stream_dup (s); stream_free (s); /* Add packet to the peer. */ @@ -1056,7 +1040,7 @@ bgp_route_refresh_send (struct peer *peer, afi_t afi, safi_t safi, } /* Make real packet. */ - packet = bgp_packet_dup (s); + packet = stream_dup (s); stream_free (s); /* Add packet to the peer. */ @@ -1103,7 +1087,7 @@ bgp_capability_send (struct peer *peer, afi_t afi, safi_t safi, length = bgp_packet_set_size (s); /* Make real packet. */ - packet = bgp_packet_dup (s); + packet = stream_dup (s); stream_free (s); /* Add packet to the peer. */ |