Diff for /embedaddon/bird/proto/ospf/dbdes.c between versions 1.1 and 1.1.1.2

version 1.1, 2017/08/22 12:33:54 version 1.1.1.2, 2021/03/17 19:50:23
Line 121  ospf_prepare_dbdes(struct ospf_proto *p, struct ospf_n Line 121  ospf_prepare_dbdes(struct ospf_proto *p, struct ospf_n
   {    {
     struct ospf_dbdes2_packet *ps = (void *) pkt;      struct ospf_dbdes2_packet *ps = (void *) pkt;
     ps->iface_mtu = htons(iface_mtu);      ps->iface_mtu = htons(iface_mtu);
    ps->options = ifa->oa->options;    ps->options = ifa->oa->options & ~OPT_N;
     ps->imms = 0;       /* Will be set later */      ps->imms = 0;       /* Will be set later */
     ps->ddseq = htonl(n->dds);      ps->ddseq = htonl(n->dds);
     length = sizeof(struct ospf_dbdes2_packet);      length = sizeof(struct ospf_dbdes2_packet);
Line 129  ospf_prepare_dbdes(struct ospf_proto *p, struct ospf_n Line 129  ospf_prepare_dbdes(struct ospf_proto *p, struct ospf_n
   else /* OSPFv3 */    else /* OSPFv3 */
   {    {
     struct ospf_dbdes3_packet *ps = (void *) pkt;      struct ospf_dbdes3_packet *ps = (void *) pkt;
    ps->options = htonl(ifa->oa->options);    ps->options = htonl(ifa->oa->options & ~OPT_N);
     ps->iface_mtu = htons(iface_mtu);      ps->iface_mtu = htons(iface_mtu);
     ps->padding = 0;      ps->padding = 0;
     ps->imms = 0;       /* Will be set later */      ps->imms = 0;       /* Will be set later */
Line 347  ospf_receive_dbdes(struct ospf_packet *pkt, struct osp Line 347  ospf_receive_dbdes(struct ospf_packet *pkt, struct osp
     ospf_neigh_sm(n, INM_2WAYREC);      ospf_neigh_sm(n, INM_2WAYREC);
     if (n->state != NEIGHBOR_EXSTART)      if (n->state != NEIGHBOR_EXSTART)
       return;        return;
       /* fallthrough */
   
   case NEIGHBOR_EXSTART:    case NEIGHBOR_EXSTART:
     if ((ifa->type != OSPF_IT_VLINK) &&      if ((ifa->type != OSPF_IT_VLINK) &&

Removed from v.1.1  
changed lines
  Added in v.1.1.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>