Skip to content

Commit 0e791ba

Browse files
DRiKEDRiKE
committed
Rename trait AfiSafiParse to NlriParse
1 parent 773a9f6 commit 0e791ba

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

‎src/bgp/message/update.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use crate::bgp::types::{
2525
};
2626

2727
use crate::bgp::nlri::afisafi::{
28-
AfiSafiNlri, AfiSafiParse, NlriIter, NlriEnumIter, Nlri, NlriType
28+
AfiSafiNlri, NlriParse, NlriIter, NlriEnumIter, Nlri, NlriType
2929
};
3030

3131
use crate::util::parser::ParseError;
@@ -293,7 +293,7 @@ impl<Octs: Octets> UpdateMessage<Octs> {
293293
where
294294
O: Octets,
295295
Octs: Octets<Range<'a> = O>,
296-
ASP: AfiSafiNlri + AfiSafiParse<'a, O, Octs>
296+
ASP: AfiSafiNlri + NlriParse<'a, O, Octs>
297297
{
298298
if ASP::afi_safi() == AfiSafiType::Ipv4Unicast && !self.withdrawals.is_empty() {
299299
return Ok(Some(NlriIter::<_, _, ASP>::new(
@@ -451,7 +451,7 @@ impl<Octs: Octets> UpdateMessage<Octs> {
451451
where
452452
O: Octets,
453453
Octs: Octets<Range<'a> = O>,
454-
ASP: AfiSafiNlri + AfiSafiParse<'a, O, Octs>
454+
ASP: AfiSafiNlri + NlriParse<'a, O, Octs>
455455
{
456456
// If the requested announcements are of type Ipv4Unicast, and the
457457
// conventional announcements range is non-zero, return that.

‎src/bgp/message/update_builder.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use log::warn;
88
use crate::bgp::aspath::HopPath;
99
use crate::bgp::communities::StandardCommunity;
1010
use crate::bgp::message::{Header, MsgType, UpdateMessage, SessionConfig};
11-
use crate::bgp::nlri::afisafi::{AfiSafiNlri, AfiSafiParse, NlriCompose};
11+
use crate::bgp::nlri::afisafi::{AfiSafiNlri, NlriParse, NlriCompose};
1212
use crate::bgp::path_attributes::{Attribute, PaMap, PathAttributeType};
1313
use crate::bgp::types::{AfiSafiType, NextHop};
1414
use crate::util::parser::ParseError;
@@ -217,7 +217,7 @@ where
217217
_session_config: &SessionConfig
218218
)
219219
where
220-
A: AfiSafiNlri + NlriCompose + AfiSafiParse<'a, O, Octs, Output = A>,
220+
A: AfiSafiNlri + NlriCompose + NlriParse<'a, O, Octs, Output = A>,
221221
Octs: Octets<Range<'a> = O>,
222222
O: Octets,
223223
{
@@ -239,7 +239,7 @@ where
239239
_session_config: &SessionConfig
240240
)
241241
where
242-
A: AfiSafiNlri + NlriCompose + AfiSafiParse<'a, O, Octs, Output = A>,
242+
A: AfiSafiNlri + NlriCompose + NlriParse<'a, O, Octs, Output = A>,
243243
Octs: Octets<Range<'a> = O>,
244244
O: Octets,
245245
{
@@ -770,7 +770,7 @@ impl<A> MpReachNlriBuilder<A> {
770770
_session_config: &SessionConfig
771771
)
772772
where
773-
A: AfiSafiNlri + NlriCompose + AfiSafiParse<'a, O, Octs, Output = A>,
773+
A: AfiSafiNlri + NlriCompose + NlriParse<'a, O, Octs, Output = A>,
774774
Octs: Octets<Range<'a> = O>,
775775
O: Octets,
776776
{
@@ -1136,7 +1136,7 @@ where
11361136
_session_config: &SessionConfig
11371137
)
11381138
where
1139-
A: AfiSafiNlri + NlriCompose + AfiSafiParse<'a, O, Octs, Output = A>,
1139+
A: AfiSafiNlri + NlriCompose + NlriParse<'a, O, Octs, Output = A>,
11401140
Octs: Octets<Range<'a> = O>,
11411141
O: Octets,
11421142
{

‎src/bgp/nlri/afisafi.rs

+20-20
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ macro_rules! addpath {
9494
fn afi_safi() -> AfiSafiType { <[<$nlri Nlri>]$(<$gen>)? as AfiSafi>::afi_safi() }
9595
}
9696

97-
impl<'a, Octs, P> AfiSafiParse<'a, Octs, P> for [<$nlri AddpathNlri>]$(<$gen>)?
97+
impl<'a, Octs, P> NlriParse<'a, Octs, P> for [<$nlri AddpathNlri>]$(<$gen>)?
9898
where
9999
Octs: Octets,
100100
P: 'a + Octets<Range<'a> = Octs>
@@ -539,7 +539,7 @@ pub trait AfiSafiNlri: AfiSafi + IsNlri { // + Clone + Hash + Debug {
539539
//fn nexthop_compatible(&self, nh: &super::nexthop::NextHop) -> bool;
540540
}
541541

542-
pub trait AfiSafiParse<'a, O, P>: Sized + IsNlri
542+
pub trait NlriParse<'a, O, P>: Sized + IsNlri
543543
where P: 'a + Octets<Range<'a> = O>
544544
{
545545
type Output: AfiSafi;
@@ -604,7 +604,7 @@ pub trait Addpath: AfiSafiNlri {
604604

605605
// adding AFI/SAFIs here requires some manual labor:
606606
// - at the least, add a struct for $Afi$SafiNlri , deriving Clone,Debug,Hash
607-
// - impl AfiSafiNlri, AfiSafiParse and Display
607+
// - impl AfiSafiNlri, NlriParse and Display
608608

609609
afisafi! {
610610
1_u16 => Ipv4 [
@@ -677,7 +677,7 @@ impl TryFrom<(Prefix, PathId)> for Ipv4UnicastAddpathNlri {
677677
}
678678

679679

680-
impl<'a, O, P> AfiSafiParse<'a, O, P> for Ipv4UnicastNlri
680+
impl<'a, O, P> NlriParse<'a, O, P> for Ipv4UnicastNlri
681681
where
682682
O: Octets,
683683
P: 'a + Octets<Range<'a> = O>
@@ -744,7 +744,7 @@ impl TryFrom<(Prefix, PathId)> for Ipv4MulticastAddpathNlri {
744744
}
745745
}
746746

747-
impl<'a, O, P> AfiSafiParse<'a, O, P> for Ipv4MulticastNlri
747+
impl<'a, O, P> NlriParse<'a, O, P> for Ipv4MulticastNlri
748748
where
749749
O: Octets,
750750
P: 'a + Octets<Range<'a> = O>
@@ -784,7 +784,7 @@ impl<Octs> AfiSafiNlri for Ipv4MplsUnicastNlri<Octs> {
784784
}
785785
}
786786

787-
impl<'a, O, P> AfiSafiParse<'a, O, P> for Ipv4MplsUnicastNlri<O>
787+
impl<'a, O, P> NlriParse<'a, O, P> for Ipv4MplsUnicastNlri<O>
788788
where
789789
O: Octets,
790790
P: 'a + Octets<Range<'a> = O>
@@ -859,7 +859,7 @@ impl<Octs> AfiSafiNlri for Ipv4MplsVpnUnicastNlri<Octs> {
859859
}
860860
}
861861

862-
impl<'a, O, P> AfiSafiParse<'a, O, P> for Ipv4MplsVpnUnicastNlri<O>
862+
impl<'a, O, P> NlriParse<'a, O, P> for Ipv4MplsVpnUnicastNlri<O>
863863
where
864864
O: Octets,
865865
P: 'a + Octets<Range<'a> = O>
@@ -933,7 +933,7 @@ impl<Octs> AfiSafiNlri for Ipv4RouteTargetNlri<Octs> {
933933
}
934934
}
935935

936-
impl<'a, O, P> AfiSafiParse<'a, O, P> for Ipv4RouteTargetNlri<O>
936+
impl<'a, O, P> NlriParse<'a, O, P> for Ipv4RouteTargetNlri<O>
937937
where
938938
O: Octets,
939939
P: 'a + Octets<Range<'a> = O>
@@ -1005,7 +1005,7 @@ impl<Octs> AfiSafiNlri for Ipv4FlowSpecNlri<Octs> {
10051005
}
10061006
}
10071007

1008-
impl<'a, O, P> AfiSafiParse<'a, O, P> for Ipv4FlowSpecNlri<O>
1008+
impl<'a, O, P> NlriParse<'a, O, P> for Ipv4FlowSpecNlri<O>
10091009
where
10101010
O: Octets,
10111011
P: 'a + Octets<Range<'a> = O>
@@ -1117,7 +1117,7 @@ impl TryFrom<(Prefix, PathId)> for Ipv6UnicastAddpathNlri {
11171117
}
11181118
}
11191119

1120-
impl<'a, O, P> AfiSafiParse<'a, O, P> for Ipv6UnicastNlri
1120+
impl<'a, O, P> NlriParse<'a, O, P> for Ipv6UnicastNlri
11211121
where
11221122
O: Octets,
11231123
P: 'a + Octets<Range<'a> = O>
@@ -1184,7 +1184,7 @@ impl AfiSafiNlri for Ipv6MulticastNlri {
11841184
}
11851185
}
11861186

1187-
impl<'a, O, P> AfiSafiParse<'a, O, P> for Ipv6MulticastNlri
1187+
impl<'a, O, P> NlriParse<'a, O, P> for Ipv6MulticastNlri
11881188
where
11891189
O: Octets,
11901190
P: 'a + Octets<Range<'a> = O>
@@ -1224,7 +1224,7 @@ impl<Octs> AfiSafiNlri for Ipv6MplsUnicastNlri<Octs> {
12241224
}
12251225
}
12261226

1227-
impl<'a, O, P> AfiSafiParse<'a, O, P> for Ipv6MplsUnicastNlri<O>
1227+
impl<'a, O, P> NlriParse<'a, O, P> for Ipv6MplsUnicastNlri<O>
12281228
where
12291229
O: Octets,
12301230
P: 'a + Octets<Range<'a> = O>
@@ -1300,7 +1300,7 @@ impl<Octs> AfiSafiNlri for Ipv6MplsVpnUnicastNlri<Octs> {
13001300
}
13011301
}
13021302

1303-
impl<'a, O, P> AfiSafiParse<'a, O, P> for Ipv6MplsVpnUnicastNlri<O>
1303+
impl<'a, O, P> NlriParse<'a, O, P> for Ipv6MplsVpnUnicastNlri<O>
13041304
where
13051305
O: Octets,
13061306
P: 'a + Octets<Range<'a> = O>
@@ -1375,7 +1375,7 @@ impl<Octs> AfiSafiNlri for Ipv6FlowSpecNlri<Octs> {
13751375
}
13761376
}
13771377

1378-
impl<'a, O, P> AfiSafiParse<'a, O, P> for Ipv6FlowSpecNlri<O>
1378+
impl<'a, O, P> NlriParse<'a, O, P> for Ipv6FlowSpecNlri<O>
13791379
where
13801380
O: Octets,
13811381
P: 'a + Octets<Range<'a> = O>
@@ -1483,7 +1483,7 @@ impl AfiSafiNlri for L2VpnVplsNlri {
14831483
}
14841484
}
14851485

1486-
impl<'a, O, P> AfiSafiParse<'a, O, P> for L2VpnVplsNlri
1486+
impl<'a, O, P> NlriParse<'a, O, P> for L2VpnVplsNlri
14871487
where
14881488
O: Octets,
14891489
P: 'a + Octets<Range<'a> = O>
@@ -1523,7 +1523,7 @@ impl<Octs> AfiSafiNlri for L2VpnEvpnNlri<Octs> {
15231523
}
15241524
}
15251525

1526-
impl<'a, O, P> AfiSafiParse<'a, O, P> for L2VpnEvpnNlri<O>
1526+
impl<'a, O, P> NlriParse<'a, O, P> for L2VpnEvpnNlri<O>
15271527
where
15281528
O: Octets,
15291529
P: 'a + Octets<Range<'a> = O>
@@ -1615,7 +1615,7 @@ impl<'a, O, P, ASP> NlriIter<'a, O, P, ASP>
16151615
where
16161616
O: Octets,
16171617
P: Octets<Range<'a> = O>,
1618-
ASP: AfiSafiParse<'a, O, P>
1618+
ASP: NlriParse<'a, O, P>
16191619
{
16201620
pub const fn new(parser: Parser<'a, P>) -> Self {
16211621
NlriIter {
@@ -1647,7 +1647,7 @@ where
16471647
}
16481648

16491649

1650-
impl<'a, O, P, ASP: AfiSafiParse<'a, O, P>> Iterator for NlriIter<'a, O, P, ASP>
1650+
impl<'a, O, P, ASP: NlriParse<'a, O, P>> Iterator for NlriIter<'a, O, P, ASP>
16511651
where
16521652
P: Octets<Range<'a> = O>
16531653
{
@@ -1731,7 +1731,7 @@ where
17311731
impl<'a, O, P, ASP> From<NlriIter<'a, O, P, ASP>> for NlriEnumIter<'a, P>
17321732
where
17331733
O: Octets,
1734-
ASP: AfiSafiParse<'a, O, P>,
1734+
ASP: NlriParse<'a, O, P>,
17351735
P: Octets<Range<'a> = O>,
17361736
{
17371737
fn from(iter: NlriIter<'a, O, P, ASP>) -> Self {
@@ -1742,7 +1742,7 @@ where
17421742
}
17431743
}
17441744

1745-
impl<'a, O, P, ASP: AfiSafiParse<'a, O, P>> NlriIter<'a, O, P, ASP>
1745+
impl<'a, O, P, ASP: NlriParse<'a, O, P>> NlriIter<'a, O, P, ASP>
17461746
where
17471747
O: Octets,
17481748
P: Octets<Range<'a> = O>

0 commit comments

Comments
 (0)