diff options
| author | Renato Westphal <renato@cvs.openbsd.org> | 2016-06-18 01:29:06 +0000 |
|---|---|---|
| committer | Renato Westphal <renato@cvs.openbsd.org> | 2016-06-18 01:29:06 +0000 |
| commit | 6c1a25cd20ee4f7c28248421d2b6f0109eb8c14a (patch) | |
| tree | 02fce179f45f77989b4552eb4df7dddecb95eae4 | |
| parent | e9b20c9afa8bba88e98619240292213e870b55b2 (diff) | |
Remove TODO comments about loop detection.
LDP loop detection is only necessary for ATM LSRs running in cell mode. We
are never going to implement this "feature".
Also, add two more comments in lde_check_request().
| -rw-r--r-- | usr.sbin/ldpd/labelmapping.c | 6 | ||||
| -rw-r--r-- | usr.sbin/ldpd/lde_lib.c | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/usr.sbin/ldpd/labelmapping.c b/usr.sbin/ldpd/labelmapping.c index 5cb14787ee4..c064a541604 100644 --- a/usr.sbin/ldpd/labelmapping.c +++ b/usr.sbin/ldpd/labelmapping.c @@ -1,4 +1,4 @@ -/* $OpenBSD: labelmapping.c,v 1.50 2016/06/11 02:01:46 renato Exp $ */ +/* $OpenBSD: labelmapping.c,v 1.51 2016/06/18 01:29:05 renato Exp $ */ /* * Copyright (c) 2014, 2015 Renato Westphal <renato@openbsd.org> @@ -266,10 +266,6 @@ recv_labelmessage(struct nbr *nbr, char *buf, uint16_t len, uint16_t type) break; } break; - case TLV_TYPE_HOPCOUNT: - case TLV_TYPE_PATHVECTOR: - /* TODO just ignore for now */ - break; case TLV_TYPE_GENERICLABEL: switch (type) { case MSG_TYPE_LABELWITHDRAW: diff --git a/usr.sbin/ldpd/lde_lib.c b/usr.sbin/ldpd/lde_lib.c index 50ff9cd839f..36fa4a6f022 100644 --- a/usr.sbin/ldpd/lde_lib.c +++ b/usr.sbin/ldpd/lde_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lde_lib.c,v 1.60 2016/06/18 01:25:53 renato Exp $ */ +/* $OpenBSD: lde_lib.c,v 1.61 2016/06/18 01:29:05 renato Exp $ */ /* * Copyright (c) 2013, 2016 Renato Westphal <renato@openbsd.org> @@ -436,8 +436,8 @@ lde_check_mapping(struct map *map, struct lde_nbr *ln) return; /* - * LMp.3 - LMp.8: Loop detection LMp.3 - unecessary for frame-mode - * mpls networks + * LMp.3 - LMp.8: loop detection - unnecessary for frame-mode + * mpls networks. */ /* LMp.9 */ @@ -522,12 +522,13 @@ lde_check_request(struct map *map, struct lde_nbr *ln) struct fec_node *fn; struct fec_nh *fnh; - /* TODO LRq.1: loop detection */ + /* LRq.1: skip loop detection (not necessary) */ /* LRq.2: is there a next hop for fec? */ lde_map2fec(map, ln->id, &fec); fn = (struct fec_node *)fec_find(&ft, &fec); if (fn == NULL || LIST_EMPTY(&fn->nexthops)) { + /* LRq.5: send No Route notification */ lde_send_notification(ln->peerid, S_NO_ROUTE, map->messageid, htons(MSG_TYPE_LABELREQUEST)); return; @@ -541,6 +542,7 @@ lde_check_request(struct map *map, struct lde_nbr *ln) if (!lde_address_find(ln, fnh->af, &fnh->nexthop)) continue; + /* LRq.4: send Loop Detected notification */ lde_send_notification(ln->peerid, S_LOOP_DETECTED, map->messageid, htons(MSG_TYPE_LABELREQUEST)); return; |