lib: add frr-isisd to the native models

[mirror_frr.git] / ldpd / labelmapping.c

diff --git a/ldpd/labelmapping.c b/ldpd/labelmapping.c
index 75acfd7d504f40f936279428e0f1303fc3eceed5..944f93331f002a3fb1ef6c6ae3cfaa4a6b27171f 100644 (file)
--- a/ldpd/labelmapping.c
+++ b/ldpd/labelmapping.c
@@ -26,15 +26,13 @@
 
 #include "mpls.h"
 
-static void     enqueue_pdu(struct nbr *, struct ibuf *, uint16_t);
+static void     enqueue_pdu(struct nbr *, uint16_t, struct ibuf *, uint16_t);
 static int      gen_label_tlv(struct ibuf *, uint32_t);
-static int      tlv_decode_label(struct nbr *, struct ldp_msg *, char *,
-                   uint16_t, uint32_t *);
 static int      gen_reqid_tlv(struct ibuf *, uint32_t);
 static void     log_msg_mapping(int, uint16_t, struct nbr *, struct map *);
 
 static void
-enqueue_pdu(struct nbr *nbr, struct ibuf *buf, uint16_t size)
+enqueue_pdu(struct nbr *nbr, uint16_t type, struct ibuf *buf, uint16_t size)
 {
        struct ldp_hdr          *ldp_hdr;
 
@@ -83,7 +81,7 @@ send_labelmessage(struct nbr *nbr, uint16_t type, struct mapping_head *mh)
 
                /* maximum pdu length exceeded, we need a new ldp pdu */
                if (size + msg_size > nbr->max_pdu_len) {
-                       enqueue_pdu(nbr, buf, size);
+                       enqueue_pdu(nbr, type, buf, size);
                        first = 1;
                        continue;
                }
@@ -110,11 +108,33 @@ send_labelmessage(struct nbr *nbr, uint16_t type, struct mapping_head *mh)
 
                log_msg_mapping(1, type, nbr, &me->map);
 
+               /* no errors - update per neighbor message counters */
+               switch (type) {
+               case MSG_TYPE_LABELMAPPING:
+                       nbr->stats.labelmap_sent++;
+                       break;
+                       case MSG_TYPE_LABELREQUEST:
+                       nbr->stats.labelreq_sent++;
+                       break;
+               case MSG_TYPE_LABELWITHDRAW:
+                       nbr->stats.labelwdraw_sent++;
+                       break;
+               case MSG_TYPE_LABELRELEASE:
+                       nbr->stats.labelrel_sent++;
+                       break;
+               case MSG_TYPE_LABELABORTREQ:
+                       nbr->stats.labelabreq_sent++;
+                       break;
+               default:
+                       break;
+               }
+
                TAILQ_REMOVE(mh, me, entry);
+               assert(me != TAILQ_FIRST(mh));
                free(me);
        }
 
-       enqueue_pdu(nbr, buf, size);
+       enqueue_pdu(nbr, type, buf, size);
 
        nbr_fsm(nbr, NBR_EVT_PDU_SENT);
 }
@@ -128,7 +148,8 @@ recv_labelmessage(struct nbr *nbr, char *buf, uint16_t len, uint16_t type)
        uint32_t                 label = NO_LABEL, reqid = 0;
        uint32_t                 pw_status = 0;
        uint8_t                  flags = 0;
-       int                      feclen, lbllen, tlen;
+       int                      feclen, tlen;
+       uint16_t                 current_tlv = 1;
        struct mapping_entry    *me;
        struct mapping_head      mh;
        struct map               map;
@@ -171,7 +192,7 @@ recv_labelmessage(struct nbr *nbr, char *buf, uint16_t len, uint16_t type)
                    type != MSG_TYPE_LABELRELEASE) {
                        send_notification(nbr->tcp, S_MISS_MSG, msg.id,
                            msg.type);
-                       return (-1);
+                       goto err;
                }
 
                /*
@@ -226,16 +247,6 @@ recv_labelmessage(struct nbr *nbr, char *buf, uint16_t len, uint16_t type)
                feclen -= tlen;
        } while (feclen > 0);
 
-       /* Mandatory Label TLV */
-       if (type == MSG_TYPE_LABELMAPPING) {
-               lbllen = tlv_decode_label(nbr, &msg, buf, len, &label);
-               if (lbllen == -1)
-                       goto err;
-
-               buf += lbllen;
-               len -= lbllen;
-       }
-
        /* Optional Parameters */
        while (len > 0) {
                struct tlv      tlv;
@@ -258,6 +269,17 @@ recv_labelmessage(struct nbr *nbr, char *buf, uint16_t len, uint16_t type)
                buf += TLV_HDR_SIZE;
                len -= TLV_HDR_SIZE;
 
+               /*
+                * For Label Mapping messages the Label TLV is mandatory and
+                * should appear right after the FEC TLV.
+                */
+               if (current_tlv == 1 && type == MSG_TYPE_LABELMAPPING &&
+                   !(tlv_type & TLV_TYPE_GENERICLABEL)) {
+                       send_notification(nbr->tcp, S_MISS_MSG, msg.id,
+                           msg.type);
+                       goto err;
+               }
+
                switch (tlv_type) {
                case TLV_TYPE_LABELREQUEST:
                        switch (type) {
@@ -284,6 +306,7 @@ recv_labelmessage(struct nbr *nbr, char *buf, uint16_t len, uint16_t type)
                        break;
                case TLV_TYPE_GENERICLABEL:
                        switch (type) {
+                       case MSG_TYPE_LABELMAPPING:
                        case MSG_TYPE_LABELWITHDRAW:
                        case MSG_TYPE_LABELRELEASE:
                                if (tlv_len != LABEL_TLV_LEN) {
@@ -294,6 +317,16 @@ recv_labelmessage(struct nbr *nbr, char *buf, uint16_t len, uint16_t type)
 
                                memcpy(&labelbuf, buf, sizeof(labelbuf));
                                label = ntohl(labelbuf);
+                               /* do not accept invalid labels */
+                               if (label > MPLS_LABEL_MAX ||
+                                   (label <= MPLS_LABEL_RESERVED_MAX &&
+                                    label != MPLS_LABEL_IPV4_EXPLICIT_NULL &&
+                                    label != MPLS_LABEL_IPV6_EXPLICIT_NULL &&
+                                    label != MPLS_LABEL_IMPLICIT_NULL)) {
+                                       session_shutdown(nbr, S_BAD_TLV_VAL,
+                                           msg.id, msg.type);
+                                       goto err;
+                               }
                                break;
                        default:
                                /* ignore */
@@ -303,6 +336,7 @@ recv_labelmessage(struct nbr *nbr, char *buf, uint16_t len, uint16_t type)
                case TLV_TYPE_ATMLABEL:
                case TLV_TYPE_FRLABEL:
                        switch (type) {
+                       case MSG_TYPE_LABELMAPPING:
                        case MSG_TYPE_LABELWITHDRAW:
                        case MSG_TYPE_LABELRELEASE:
                                /* unsupported */
@@ -350,6 +384,7 @@ recv_labelmessage(struct nbr *nbr, char *buf, uint16_t len, uint16_t type)
                }
                buf += tlv_len;
                len -= tlv_len;
+               current_tlv++;
        }
 
        /* notify lde about the received message. */
@@ -361,7 +396,7 @@ recv_labelmessage(struct nbr *nbr, char *buf, uint16_t len, uint16_t type)
                case MAP_TYPE_PREFIX:
                        switch (me->map.fec.prefix.af) {
                        case AF_INET:
-                               if (label == MPLS_LABEL_IPV6NULL) {
+                               if (label == MPLS_LABEL_IPV6_EXPLICIT_NULL) {
                                        session_shutdown(nbr, S_BAD_TLV_VAL,
                                            msg.id, msg.type);
                                        goto err;
@@ -370,7 +405,7 @@ recv_labelmessage(struct nbr *nbr, char *buf, uint16_t len, uint16_t type)
                                        goto next;
                                break;
                        case AF_INET6:
-                               if (label == MPLS_LABEL_IPV4NULL) {
+                               if (label == MPLS_LABEL_IPV4_EXPLICIT_NULL) {
                                        session_shutdown(nbr, S_BAD_TLV_VAL,
                                            msg.id, msg.type);
                                        goto err;
@@ -425,6 +460,7 @@ recv_labelmessage(struct nbr *nbr, char *buf, uint16_t len, uint16_t type)
 
  next:
                TAILQ_REMOVE(&mh, me, entry);
+               assert(me != TAILQ_FIRST(&mh));
                free(me);
        }
 
@@ -449,53 +485,6 @@ gen_label_tlv(struct ibuf *buf, uint32_t label)
        return (ibuf_add(buf, &lt, sizeof(lt)));
 }
 
-static int
-tlv_decode_label(struct nbr *nbr, struct ldp_msg *msg, char *buf,
-    uint16_t len, uint32_t *label)
-{
-       struct label_tlv lt;
-
-       if (len < sizeof(lt)) {
-               session_shutdown(nbr, S_BAD_TLV_LEN, msg->id, msg->type);
-               return (-1);
-       }
-       memcpy(&lt, buf, sizeof(lt));
-
-       if (!(ntohs(lt.type) & TLV_TYPE_GENERICLABEL)) {
-               send_notification(nbr->tcp, S_MISS_MSG, msg->id, msg->type);
-               return (-1);
-       }
-
-       switch (htons(lt.type)) {
-       case TLV_TYPE_GENERICLABEL:
-               if (ntohs(lt.length) != sizeof(lt) - TLV_HDR_SIZE) {
-                       session_shutdown(nbr, S_BAD_TLV_LEN, msg->id,
-                           msg->type);
-                       return (-1);
-               }
-
-               *label = ntohl(lt.label);
-               if (*label > MPLS_LABEL_MAX ||
-                   (*label <= MPLS_LABEL_RESERVED_MAX &&
-                    *label != MPLS_LABEL_IPV4NULL &&
-                    *label != MPLS_LABEL_IPV6NULL &&
-                    *label != MPLS_LABEL_IMPLNULL)) {
-                       session_shutdown(nbr, S_BAD_TLV_VAL, msg->id,
-                           msg->type);
-                       return (-1);
-               }
-               break;
-       case TLV_TYPE_ATMLABEL:
-       case TLV_TYPE_FRLABEL:
-       default:
-               /* unsupported */
-               session_shutdown(nbr, S_BAD_TLV_VAL, msg->id, msg->type);
-               return (-1);
-       }
-
-       return (sizeof(lt));
-}
-
 static int
 gen_reqid_tlv(struct ibuf *buf, uint32_t reqid)
 {